Merge branch 'master' of ssh://gparabola/srv/git/abslibre

1 files changed, 86 insertions, 63 deletions

diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 208e176ba..fd24630fe 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,7 +2,8 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
-pkgver=17.0.2.1
+_pkgver=17.0.4
+pkgver=17.0.4.1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -10,18 +11,19 @@ pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
 
-pkgrel=2
+pkgrel=1
 pkgdesc="Language packs for Debian Icedove."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/source/experimental/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$pkgver")
-_url=http://repo.parabolagnulinux.org/other/$pkgbase/releases/$pkgver
+makedepends=('unzip' 'zip')
+_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
 
-source=()
+source=('brand.dtd' 'brand.properties')
 for lang in ${_langpacks[@]}
 do
-    source+=("langpack-$lang@icedove.mozilla.org.xpi::$_url/$lang.xpi")
+    source+=("icedove-l10n-$_pkgver-$lang.xpi::$_url/$lang.xpi")
 done
 
 # Don't extract anything
@@ -29,70 +31,91 @@ noextract=(${source[@]##*/})
 
 _path="/usr/lib/icedove/extensions/"
 
+build() {
+  cd $srcdir
+
+  for i in ${_langpacks[@]}
+  do
+    cd $srcdir
+    unzip -q icedove-l10n-$_pkgver-$i.xpi -d $i
+    rm icedove-l10n-$_pkgver-$i.xpi
+    install -Dm644 $srcdir/brand.dtd $i/chrome/$i/locale/$i/branding
+    install -Dm644 $srcdir/brand.properties $i/chrome/$i/locale/$i/branding
+    sed -i -e 's/thunderbird/icedove/' $i/install.rdf
+    cd $i
+    zip -q -r langpack-$i@icedove.mozilla.org.xpi .
+    mv langpack-$i@icedove.mozilla.org.xpi $srcdir 
+  done
+
+  cd $srcdir
+}
+
 for lang in ${_langpacks[@]}
 do
     eval "
 package_icedove-l10n-$(echo $lang | tr A-Z a-z)() {
-  replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
-  conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
-  provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+  replaces=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
+  conflicts=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
+  provides=(thunderbird-i18n-$(echo $lang | tr A-Z a-z) icedove-i18n-$(echo $lang | tr A-Z a-z))
   install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\"
 }
 "
 done
 
-md5sums=('2586db5adf22dd42ae272d9fdc1b230e'
-         '20c25addb6e2cb3ffec146c1aca81848'
-         'b067b93b7f8adaf83fb8ea72d58b6581'
-         'ec62aaa9fff666c7071869cf45d2d113'
-         '12b0e70965d7317a31d7d7b35195ee67'
-         'ff10849757b8157b73707ccfe572edf4'
-         '89c7ea5ca764a2a4e4fbb9a720b8bd97'
-         'bf5cf9401ac5b10fa65a1e37a69b134d'
-         'fc97d1b7c0a209351d00e48075715986'
-         '9439304cb4c13fbebb24872904df98f9'
-         'cc6f97d63af3686e08a8624930c7784b'
-         '35a840226d1b8b3a0484f6327bd43b64'
-         '26bf1309ee516fd183eb6afdaf3d703f'
-         '9885394265e334d5026430c70d83669e'
-         'd39ac07026e6fea2b6e8cf9420cdae3c'
-         'c3154fd92db6387052b67154eee2c6cb'
-         '5cd99e7414eebcc92724752d569ae18f'
-         '48517d7a3295cab360e102945c4724f0'
-         '27dfcf129c0e1e752149f1065e7683e2'
-         '0f24e9851e14537f2d245ff7e0aae9e1'
-         '839ffc54ae6593ec4d170957750bd2f2'
-         '1a16c57b85ab9805bb7bc9afe8438efb'
-         '1481869608ec96bdd2867ff3d507010b'
-         '4e9633d016998af326fb0d759e4c03ce'
-         'bcf6664cf8667f5425bad0c4e261f5f8'
-         'a625dd60dffacfff6adab1a764f57721'
-         '5c7b974dfc964abc0625ac770c558f08'
-         '4c40f6e2da31675609b8fd6473f255a3'
-         'd57c319232421f43638b1af551704464'
-         '155143f28edcb18cc39b1ad2b36e4945'
-         'f54217af7efb23324012d1bb3510a17d'
-         'd55d65f2c2b813da2a005beb751d3a8d'
-         '23b699906a9ddae4589b2bf69bc40d66'
-         'b5c87362efedd884a5dbecff2f5c5dad'
-         'bec280e6279fb279143a99e348ce610f'
-         'd2eed0961cf3f684b20b4eb0a1d89189'
-         'ef85215d35b1e76e0058b98a9885e09d'
-         '821d982f3c859b90615cefc321854fee'
-         '03d7b26f8a60a1172b7dad3b45870b0f'
-         '78b1830da6f93d87a491704c03bca2f3'
-         'da602151f86db7d701b1806ad0972734'
-         '2db261b975a9c1199ef707c96a3ee677'
-         'b04a05cb6e66c2cdf9893954fd8dae49'
-         'c3d3969d4f590dfad0def596d1f5521f'
-         '4892a9c3e0554815448d604de3857b37'
-         'b6250637b5beacec9ae6223b9878a53a'
-         '987f9765fd6ee3d080533c071dff6492'
-         '07e375fb25b3bd39ada11b6e18e7a836'
-         '204ad4b577b3b23c664a442766e88cc1'
-         '40b03dd5114095fbd15c943e7da3abfc'
-         'e14c994576b6824ff36b3e0e2bba6157'
-         '4d1674a0f9d106c5a05c422742802add'
-         '0c13d6c651ae5cca046d976df7576119'
-         'fd6da709c6937c419d2962275e3efdf1'
-         '8fc2d9cb6724cd6fa010c5870d4d3122')
+md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
+         'f3719964e893c1002b7a923e8f95f923'
+         '206f1ef0917d6c072edef7e5d77a9ec6'
+         'dfcdea2b4ae57a3fa98a60fd1d90beff'
+         '25271fbc262c9379b7b9c04798d9a57e'
+         'cef8ef756ae9bd611d8c92435ce3d550'
+         'aee21b8e9835361d7fad9cabc26176ec'
+         '9cc55cfc826cfebdb52d471d4683e2ad'
+         'efb76f4fc5b66e6936a3a64ebb6a11b9'
+         '365ca3b65ec2ca0f6aba405172f909fc'
+         '02e296fa634c03dc1b8d71dd7c2e445f'
+         'e300d530881628b012e4071c5b1ac1e7'
+         '5bd79ebfb86e8939d480b49abd484370'
+         '09acd6af201f415d169b8019c0bb3929'
+         '9205fbc01cee7caf8578cd845596542a'
+         '7fd2672aa378a5c6b3d4d33eb71dff9d'
+         '8babeccaefc144d7798fb22446a72395'
+         '834b93522fb7875bc6fc3551d90a9b75'
+         'd690f9d0e0f3317ab500e711692c5684'
+         'bfe0b4a94a02e0ca8da411b58c17a5a1'
+         '4156b699bb0dbbf073893cbef96db478'
+         '1f8527f158f5bcacfde1e9b259769c14'
+         'c7fb6f52652ffeb7b7c09f27c73ee32b'
+         '6b57787b83b27a80c175b197d9a0fd8f'
+         '9a30b1017efa98e4c392a367341e7d5b'
+         '6e5d20da97211e9f72cc537327783f4d'
+         '0d0cd95f0e1765c1f56a39609533efa3'
+         '34773b8acd0e23d99918969a3a86159e'
+         'bc1b94e53e3f6d5e716ceb7d4979e278'
+         'bf577e83fc52e94164426d7a9dcc10b0'
+         '4328456c0a54334e020b643c37328eec'
+         '7232b4d0faf2f10f7fd6c7e05ef84d7a'
+         '11ada83816bcdea125dff74022acd715'
+         '0d6100971791dbac333cb24f8fa81c7b'
+         '685315fce2d77b64f58133d5d405200f'
+         'e5f15fc603190c6bb0a0cdfe6bf5e863'
+         'f2d4a099467f09b49f1bed06812d60d6'
+         '88b0177d8342a6aae79c1cba74e6c041'
+         'e19d3f90b9d41f9e7749875a1e2c037b'
+         '8e956438b49d548431728758206a101e'
+         '6597b2bbf2c9bf8af88d4b707400df24'
+         '794a9831d1f3c43156ec3f85f155f1e2'
+         '9b8e8f1fcc2bf891c1273b9470f95af5'
+         '7b423d358869c35dde53015f800e0dbd'
+         'a8258e8427d4961a509dc980f9a56986'
+         'f7be2a19d5046c5ec537b3248d0107b0'
+         '2d892a7f25a10d4607b76e2ce65743e5'
+         '6f2391fdfc198177f65c407ac3d10ce2'
+         '7e53185c09b5672f08573e3e96150ad1'
+         'fa4528be1f856b9f612af643ff2d1675'
+         '983b51b70b7e57a8bf3b956adc309f88'
+         'efc16a35ab9cff05473ff3e5f2cbf7ee'
+         'f9456837c567d422ac2e69fd72598089'
+         '9dcbf6fc85bfc768d784cb3bd764c103'
+         '302d409e53f598e830d8b180f108586e'
+         '5e21d7621b87a639c41c5fc6245203df'
+         '317e9a8bc1ca22a1f89d6898cca19500')