Upstream: 0.3.8

19 files changed, 50 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65cc5ab8a269..7294cbccabff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mime-archpkg
 	pkgdesc = mime type for archlinux packages
-	pkgver = 0.3.7
+	pkgver = 0.3.8
 	pkgrel = 1
 	url = http://www.archlinux.org
 	install = mime-archpkg.install
@@ -9,7 +9,6 @@ pkgbase = mime-archpkg
 	depends = shared-mime-info
 	depends = gtk-update-icon-cache
 	depends = librsvg
-	depends = imagemagick
 	source = mime-archpkg.xml
 	source = mime-archpkg.sh
 	source = hicolor.svgz
@@ -24,27 +23,29 @@ pkgbase = mime-archpkg
 	source = breeze.svgz
 	source = FaenzaFlattr2-Zephyr.svgz
 	source = elementary.svgz
+	source = Paper.svgz
 	source = install.hook
 	source = update.hook
 	source = remove.hook
 	source = hook-script.sh
 	sha256sums = e3fc45b1121fa845a245c115704715ec0b6a17860a507202cc5e1b02d01c797b
-	sha256sums = 2a26f7e7a2cfdfe4fbe380c12f17ea4170b452ece12e954f63d85024af5a5815
-	sha256sums = fc9b1f43e5993e994707285d89e0da28be48b69046f4cac68578a8d0beef4653
-	sha256sums = a59eb69c6fcdf7e8017c2596384cff0635dee46e3db5949370de766273451a85
-	sha256sums = 0a4951fd15afb85229ee17629686f914b5e5ed0583846dde2350e0c247007975
-	sha256sums = 1249231b458fad9901e8958e1bcaa119a79bbab0303ff7eaa27ad52c4ae5a77c
-	sha256sums = 4b9d0454dc82bf6475b70aaee1733236ef78afe821467a60080ddeaf3c13d9c2
-	sha256sums = 2e475b3ce9bcf96510e83748eaa45b918eded89278f232570b5eb558c5fbb4fa
-	sha256sums = 7739338376904d9d93e5aa7a678b7da8314cb3022e4bc6938af6353cd4e9e300
-	sha256sums = 52c6986309a98e0c85ad717c867d9d9a4772ce36c3d5d5ad94dda6fb23b5c749
-	sha256sums = a26a86877f36d7ba61851659871ce6461a86b3004d3270b465931a611b64e0ef
-	sha256sums = 8af276bc4afecede207a6742a5ef9320155650364339af183f9d47e1614c30a7
-	sha256sums = 3f0177c13377ad94745ec0f0324ab5fb58eeccac4e4b56695ac0f2113fb4d5bb
-	sha256sums = a99c2b48796d6f8299867034242c69fbddef4c380df0b68a678ee2727c841f29
-	sha256sums = b0377905a4228bde2544c35cc23350dbd3b9c7849d441fa53e25819c414d2e4a
-	sha256sums = 641d017a42be2c2c0659934770d8f3638ffb88c2a0941798be82cf52f4a628e8
-	sha256sums = 622ee32d6ddbcb46671dcc46c7b31f4b7d9d4083e416af0100ab4bcc9829bd06
+	sha256sums = c9448f3702fc8a33245f6881d9699882bf8e52c47dc7006ddf847859d5bf54e2
+	sha256sums = 86dd413e049c84cd422f9fa64e48c0354b1d40b5db3057cc73c20b4efaed377a
+	sha256sums = 1068084050e82f914e71b6e15d90bb5b6a99ba9b1b4585bbe069ab2f93ebe4a2
+	sha256sums = c13b464f6d0b71e7c455de1e280e8189286cd565d82294a4db2d1e8641457201
+	sha256sums = c8c25594c5726705c68218c3ee21f483298b129bccb4f14aeab4fa9b7630d080
+	sha256sums = fe2edcdc32e4aa914f76921037a9b883a303aba7b0db97a225d2a0838273b751
+	sha256sums = 1e0f7848e49184b23a2089bc09226ec04d9ae5655a289b0413fa5bf15bbeb04d
+	sha256sums = c191aeae5971dba6c025872929edc0409940897a126ca3053205ce186a5fcc2c
+	sha256sums = 783f8fb9c9e107a0e9c9a1e88ef6d611fc79d2e1f2ee83077dc2e862a23f0456
+	sha256sums = 849022b77e70527c36efc0e02a1326581814af00c2a84997a1af0a9f623ba970
+	sha256sums = 44c2d8246890da621e17541560601a5db5425d41e4c3f0c9cb807e13833d8040
+	sha256sums = 47561c547893ea4630ecabb84d14a0fd8e7c3e6d8e0cd4bd5e041c47bca9e739
+	sha256sums = 191cfd7ee153d88fb0525bb60e40c2d02b3bd720f325f6bc3c27f2d0f8fbd9fb
+	sha256sums = cf123397456c7d2bc018f07797cd397701c9fd5c3dddc474b851ce442e260f4f
+	sha256sums = fa24289460397891c692d4a13c27b76065075b27153685ce9adf2890f41936db
+	sha256sums = 6d2ee985ad7ae820d3b9d4d6016c56749ccbbe2aa2649f08794d5efeca32f05a
+	sha256sums = d0c45afb226e1dd956972990c312ccffcda4f284c720d2463c0c09b06d23a509
 	sha256sums = f374e455f0e4bfd5327d9a9ae32410f0698c916199ac46631d53b4d8f58cbcb7
 
 pkgname = mime-archpkg
diff --git a/Faenza.svgz b/Faenza.svgz
index 86f214b50b75..6895409cc2b7 100644
--- a/Faenza.svgz
+++ b/Faenza.svgz
diff --git a/FaenzaFlattr2-Zephyr.svgz b/FaenzaFlattr2-Zephyr.svgz
index 31db91fce2c2..115bbd716f61 100644
--- a/FaenzaFlattr2-Zephyr.svgz
+++ b/FaenzaFlattr2-Zephyr.svgz
diff --git a/Faience.svgz b/Faience.svgz
index dc13240698b0..0a0cc8cf1a27 100644
--- a/Faience.svgz
+++ b/Faience.svgz
diff --git a/NITRUX.svgz b/NITRUX.svgz
index 6f7d8e76e4a6..ad73933897d3 100644
--- a/NITRUX.svgz
+++ b/NITRUX.svgz
diff --git a/Numix.svgz b/Numix.svgz
index c11027453c42..70fa52570e7f 100644
--- a/Numix.svgz
+++ b/Numix.svgz
diff --git a/PKGBUILD b/PKGBUILD
index 66c0cf1089eb..676c73b2cd4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,34 @@
 # Contributor: grimi <grimi at poczta dot fm>
 
 pkgname=mime-archpkg
-pkgver=0.3.7
+pkgver=0.3.8
 pkgrel=1
 pkgdesc="mime type for archlinux packages"
 arch=('any')
 url="http://www.archlinux.org"
 license=('GPL')
-depends=('shared-mime-info' 'gtk-update-icon-cache' 'librsvg' 'imagemagick')
+depends=('shared-mime-info' 'gtk-update-icon-cache' 'librsvg')
 install=${pkgname}.install
-source=(${pkgname}.{xml,sh} {hicolor,gnome,Tango,oxygen,nuoveXT2,Faenza,Faience,NITRUX,Numix,breeze,FaenzaFlattr2-Zephyr,elementary}.svgz
+source=(${pkgname}.{xml,sh} {hicolor,gnome,Tango,oxygen,nuoveXT2,Faenza,Faience,NITRUX,Numix,breeze,FaenzaFlattr2-Zephyr,elementary,Paper}.svgz
         {install,update,remove}.hook hook-script.sh)
 sha256sums=('e3fc45b1121fa845a245c115704715ec0b6a17860a507202cc5e1b02d01c797b'
-            '2a26f7e7a2cfdfe4fbe380c12f17ea4170b452ece12e954f63d85024af5a5815'
-            'fc9b1f43e5993e994707285d89e0da28be48b69046f4cac68578a8d0beef4653'
-            'a59eb69c6fcdf7e8017c2596384cff0635dee46e3db5949370de766273451a85'
-            '0a4951fd15afb85229ee17629686f914b5e5ed0583846dde2350e0c247007975'
-            '1249231b458fad9901e8958e1bcaa119a79bbab0303ff7eaa27ad52c4ae5a77c'
-            '4b9d0454dc82bf6475b70aaee1733236ef78afe821467a60080ddeaf3c13d9c2'
-            '2e475b3ce9bcf96510e83748eaa45b918eded89278f232570b5eb558c5fbb4fa'
-            '7739338376904d9d93e5aa7a678b7da8314cb3022e4bc6938af6353cd4e9e300'
-            '52c6986309a98e0c85ad717c867d9d9a4772ce36c3d5d5ad94dda6fb23b5c749'
-            'a26a86877f36d7ba61851659871ce6461a86b3004d3270b465931a611b64e0ef'
-            '8af276bc4afecede207a6742a5ef9320155650364339af183f9d47e1614c30a7'
-            '3f0177c13377ad94745ec0f0324ab5fb58eeccac4e4b56695ac0f2113fb4d5bb'
-            'a99c2b48796d6f8299867034242c69fbddef4c380df0b68a678ee2727c841f29'
-            'b0377905a4228bde2544c35cc23350dbd3b9c7849d441fa53e25819c414d2e4a'
-            '641d017a42be2c2c0659934770d8f3638ffb88c2a0941798be82cf52f4a628e8'
-            '622ee32d6ddbcb46671dcc46c7b31f4b7d9d4083e416af0100ab4bcc9829bd06'
+            'c9448f3702fc8a33245f6881d9699882bf8e52c47dc7006ddf847859d5bf54e2'
+            '86dd413e049c84cd422f9fa64e48c0354b1d40b5db3057cc73c20b4efaed377a'
+            '1068084050e82f914e71b6e15d90bb5b6a99ba9b1b4585bbe069ab2f93ebe4a2'
+            'c13b464f6d0b71e7c455de1e280e8189286cd565d82294a4db2d1e8641457201'
+            'c8c25594c5726705c68218c3ee21f483298b129bccb4f14aeab4fa9b7630d080'
+            'fe2edcdc32e4aa914f76921037a9b883a303aba7b0db97a225d2a0838273b751'
+            '1e0f7848e49184b23a2089bc09226ec04d9ae5655a289b0413fa5bf15bbeb04d'
+            'c191aeae5971dba6c025872929edc0409940897a126ca3053205ce186a5fcc2c'
+            '783f8fb9c9e107a0e9c9a1e88ef6d611fc79d2e1f2ee83077dc2e862a23f0456'
+            '849022b77e70527c36efc0e02a1326581814af00c2a84997a1af0a9f623ba970'
+            '44c2d8246890da621e17541560601a5db5425d41e4c3f0c9cb807e13833d8040'
+            '47561c547893ea4630ecabb84d14a0fd8e7c3e6d8e0cd4bd5e041c47bca9e739'
+            '191cfd7ee153d88fb0525bb60e40c2d02b3bd720f325f6bc3c27f2d0f8fbd9fb'
+            'cf123397456c7d2bc018f07797cd397701c9fd5c3dddc474b851ce442e260f4f'
+            'fa24289460397891c692d4a13c27b76065075b27153685ce9adf2890f41936db'
+            '6d2ee985ad7ae820d3b9d4d6016c56749ccbbe2aa2649f08794d5efeca32f05a'
+            'd0c45afb226e1dd956972990c312ccffcda4f284c720d2463c0c09b06d23a509'
             'f374e455f0e4bfd5327d9a9ae32410f0698c916199ac46631d53b4d8f58cbcb7')
 
 
diff --git a/Paper.svgz b/Paper.svgz
new file mode 100644
index 000000000000..1d4693e643b2
--- /dev/null
+++ b/Paper.svgz
diff --git a/Tango.svgz b/Tango.svgz
index 6030862bf8fb..b52f8ab60a53 100644
--- a/Tango.svgz
+++ b/Tango.svgz
diff --git a/breeze.svgz b/breeze.svgz
index 64164888f0be..b6a56fd7d994 100644
--- a/breeze.svgz
+++ b/breeze.svgz
diff --git a/elementary.svgz b/elementary.svgz
index 05817cb009db..518c68a970a1 100644
--- a/elementary.svgz
+++ b/elementary.svgz
diff --git a/gnome.svgz b/gnome.svgz
index d1b44a7a18e0..cda9d4e196c7 100644
--- a/gnome.svgz
+++ b/gnome.svgz
diff --git a/hicolor.svgz b/hicolor.svgz
index 8bb26732e733..5399e52ddf31 100644
--- a/hicolor.svgz
+++ b/hicolor.svgz
diff --git a/install.hook b/install.hook
index 6e58d0b0cb46..c3fcacf266c9 100644
--- a/install.hook
+++ b/install.hook
@@ -1,8 +1,7 @@
 [Trigger]
 Type = File
 Operation = Install
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
+Target = usr/share/icons/*/index.theme
 
 [Action]
 Description = Adding archpkg mimetypes icons...
diff --git a/mime-archpkg.sh b/mime-archpkg.sh
index 2b670b0e6111..b859b3073471 100644
--- a/mime-archpkg.sh
+++ b/mime-archpkg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # author: grimi
 # name: mime-archpkg
-# require: grep, sed, convert (imagemagick), rsvg-convert (librsvg), gtk-update-icon-cache
+# require: grep, sed, rsvg-convert (librsvg), gtk-update-icon-cache, !convert (imagemagick)
 
 declare MODE="usage"
 declare MYDIR="/usr/share/mime-archpkg"
@@ -57,12 +57,15 @@ add() {
                      else
                         suf=png
                      fi
-                     convert -resize ${size}x${size} -background none "$file" /tmp/archpkg.$suf
-                     install -m644 /tmp/archpkg.$suf "$theme/$elem/$NAME.$suf"
+                     # convert -resize ${size}x${size} -background none "$file" /tmp/$NAME.$suf
+                     rsvg-convert -o /tmp/$NAME.$suf -f $suf -w $size -h $size "$file"
+                     install -m644 /tmp/$NAME.$suf "$theme/$elem/$NAME.$suf"
+                     rm -f /tmp/$NAME.$suf
                   fi
                elif [[ -d $theme/$elem ]]; then
-                  rsvg-convert -o /tmp/archpkg.svg -f svg "$file"
-                  install -m644 /tmp/archpkg.svg "$theme/$elem/$NAME.svg"
+                  rsvg-convert -o /tmp/$NAME.svg -f svg "$file"
+                  install -m644 /tmp/$NAME.svg "$theme/$elem/$NAME.svg"
+                  rm -f /tmp/$NAME.svg
                fi
             done
             if [[ -f $theme/icon-theme.cache ]]; then
diff --git a/nuoveXT2.svgz b/nuoveXT2.svgz
index 387ec9e3e016..ae02f94ef3a3 100644
--- a/nuoveXT2.svgz
+++ b/nuoveXT2.svgz
diff --git a/oxygen.svgz b/oxygen.svgz
index 7112b323b279..64f1915884cc 100644
--- a/oxygen.svgz
+++ b/oxygen.svgz
diff --git a/remove.hook b/remove.hook
index 560e3b0c7a31..bd5301221a21 100644
--- a/remove.hook
+++ b/remove.hook
@@ -1,7 +1,7 @@
 [Trigger]
 Type = File
 Operation = Remove
-Target = usr/share/icons/*/
+Target = usr/share/icons/*/index.theme
 
 [Action]
 Description = Removing archpkg mimetypes icons...
diff --git a/update.hook b/update.hook
index cd5bfebe2149..19dbf1761681 100644
--- a/update.hook
+++ b/update.hook
@@ -1,7 +1,7 @@
 [Trigger]
 Type = File
 Operation = Upgrade
-Target = usr/share/icons/*/*/
+Target = usr/share/icons/*/index.theme
 
 [Action]
 Description = Updating archpkg mimetypes icons...