Mon Nov 26 01:48:57 PST 2012

3 files changed, 106 insertions, 62 deletions

diff --git a/libre/icedove-i18n/PKGBUILD b/libre/icedove-i18n/PKGBUILD
index 7d0aa1d8b..d7dbbb211 100644
--- a/libre/icedove-i18n/PKGBUILD
+++ b/libre/icedove-i18n/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-i18n
-pkgver=16.0.2.1
+pkgver=17.0.1
 pkgname=('icedove-i18n-ar'
          'icedove-i18n-ast'
          'icedove-i18n-be'
@@ -473,58 +473,58 @@ package_icedove-i18n-zh-tw() {
   cd ${srcdir}
   install -Dm644 icedove-i18n-$pkgver-zh-TW.xpi "${pkgdir}/$_path/langpack-zh-TW@icedove.mozilla.org.xpi"
 }
-md5sums=('9c4a59c7da66e2354164c3a5bc7af21d'
-         '1cc30ebb50c2ff783b07060fe14b4260'
-         'bd2a994f1b0aa8d71b7f432f582e08b5'
-         '1b7d5f199b714e5d235cdadc89882c82'
-         'a5945807be0c8e205cf0f4be41d1f301'
-         'ec323d1ea8372afa236ed82d1f38bf62'
-         '04985b1bb7a7255970de1c9a0d6b6c37'
-         '143d16162ded3cf1ed99731e0ccd4cbc'
-         'ec04abda3d2eafd5cccad44b843d2191'
-         'a1273c8ba22f38f0304d44f52095541d'
-         '06ff7794da97ef3cad3ccfde2a229db3'
-         'bb873b67b1e65eccf186622c1315e14b'
-         '87ea24ef462fed8a3f6e74e25b210607'
-         'c7363deffa336c8470884ca7500ff583'
-         '64d7b4490bbe3cdb25cc8633d46761d4'
-         '1bc28fd43fbe54185e0f34161e2bb856'
-         'f90cedcac1daa1a7be9abc9a960bbde0'
-         '326a063d3b5d0aff735a145dcbb51e01'
-         '86ff061d2346b75b85e59374328d20f8'
-         '83969caa207fa30dd016fee6bd2aa543'
-         '68d50a5c356d62514bfa99b04776ed7c'
-         'f5ffaa9dc1da2412faf78a4920d19278'
-         'a76518ba680a2fc263de99099e0e1c53'
-         'e88f3c95cf4e51035429307f4f6a4eb5'
-         'c2573d6f463cdd69f6b37612f9ae997a'
-         '8b17220cd897ea744978752b2ef11ab0'
-         '4ee8b3d2e4fd7bf3353a910d76cbbaf8'
-         'f87d295343ecf5b1e21abe430b157c42'
-         '74ce04669c8acf87a8b8878fb2653dc4'
-         '5ffc16a8c701c8c2c133775a815d1e67'
-         '6d6c1a7e31bf6301ee690509881a4395'
-         '41c970fd7ef2224a63de7d562ce71b39'
-         'a4243831934d31aad648221190fe2b42'
-         '6c1c023d67a35e4ed3a792bb365f360e'
-         '0045f4bceaaddd57fa6c0b895a34feff'
-         '18b359d881127defff20e549bb0c5b80'
-         'a295fbd180dfe3e009218aa2775ce332'
-         '6beaeaf5bf67321fdef0ee6de968edaa'
-         '92b29bc95a476d9cb75c5df075f353b9'
-         'fa757024edb1f1f794f77ecee8c07706'
-         '8f21adb897625a2a27a040a8e88bed3f'
-         '26b5ab6bb93b454702179c48c9da2e5b'
-         'f319345cdc962919830792644c66165d'
-         '7f32885e485beab6822eb9ec0025bae7'
-         'edf019e6332d099d67b68f1f90da680c'
-         'e21836a77f143457ac7912ee0e6386dc'
-         '24adc86b3fb496f3d27944a5027d5fa9'
-         '7192e7c7d80cc8eb85e1f57defa0496c'
-         'f449ced45bb084ce0adda6df89b1ee31'
-         '25e3ce79fc2c1e2164ce04821e683a29'
-         '615138d3ed86797a168a0d5784f0c6fe'
-         '7c83196da5ee2d01444450cca620c29d'
-         '265f8447eee6e6b41ab8fdcf1a1dc154'
-         '9889d38b50a7e2d095582ebf75cab9e2'
-         '12b882986056bca65fdfc90806daf87b')
+md5sums=('15ededc2d92b095297c32682b1ea5556'
+         '21b066c8006bd37843873a0950b4dd17'
+         'c531b388e48a2b964091cdabdc6ea843'
+         '02dd4a828cd62d3704b329cc0269c754'
+         'aa058920d2e9e590a5f43371ec0c758a'
+         'd2f6d97e73956b929812efc26cbb8a00'
+         '422ba52f874f376d97a74c79047bb07e'
+         'ebc329dbdfd9533f237731f4ab13c0c7'
+         '372f5b371ef045fd9b1d87d0f5a02f1b'
+         'f4833810e478a319360b144d1e4e5dd0'
+         'dcd04ada6fc38908cd1a0b4c640d49b6'
+         'f5805071746aaac4c977dc6104d81524'
+         '55fb0a3581661c71e8a8b4fdaa5f92c6'
+         'f4f24e1b0a53d0dca2b8bef384173682'
+         '3beb64fc06de87f5b70f2ba08ab3359e'
+         '62d4a011ccdfdf4f24063caec6e881b2'
+         '230373349ab450147ff19f4afebde2ea'
+         'c7eff1f39bf536a4da476d77a3e0a450'
+         '06a7c3143b493c96628e93a58f25550c'
+         '5017bdacb7ee1430fa73b9b7ca657497'
+         'c7aa6657da6f2cd9dc90c323c6676bf9'
+         'ee9a365773d95e7c31de8089aef0d847'
+         'feebccca9f6eec21b81e26e1804b0140'
+         '65339aa37592def5a0fa6e5aaf416de5'
+         '64980f1186f4045574babcde77f11529'
+         '20f25644314ad2801db9156531ea290c'
+         'fd7c8318ab9d946a49ef2873de0d8e0a'
+         'd6612e0b47375fdb34341ed8386a621f'
+         '89295ed1c51be054d571609209641fa1'
+         'b35e49dc04bf9134262ae7db57b0311b'
+         '15487ee85959928fa0b85fe99e3c7a82'
+         'ed555ce92aa37545b4f62ea4bdca9187'
+         '5d83088d4bcd042acfecbb0a85215548'
+         '1f1a513aac9b1d3cbc6dce3e948c33ca'
+         '1b955a8dd7690991d06ced05fc2f1fae'
+         '1785e4bb27d71cc0226eab506f81669a'
+         'fd9a007c75b8738f3b2e167087655526'
+         '6578b879762db29b40e1723ba59043d6'
+         'afe8fff2c2707724d2ef5536180a0907'
+         'b8befd7b5e781403c3c0797633f0f92b'
+         '2097f7218575732e448662b3d1d1a351'
+         '82c29288a115668f25d01d0e7175419f'
+         '8398d4a711dd73302b790a2b99d9e78f'
+         '1ed5155cd7f3be98b25d94a126d043bb'
+         '899f04c2629e648be0f32f1ec04b9b56'
+         '4af5b8985fdb1858c0c25b8452ca72fc'
+         '43189f0ad649e00cedc608c6197a6426'
+         'aeed4c0b7e536c0b4f9b36a5dc3d1d63'
+         'a8bbc0c2acf8defcf9c200cacd243536'
+         '9c35cfcbf9d66aa42abfaae4aa4a6937'
+         'b19268362d73d7e3f66ff7f7f21ab6bd'
+         'c45de9ad905bbdda655227e77b09a1ba'
+         '430bb7d6dc4037666fb452e5c2c03c83'
+         '6280326bb1fb7c2ddd5c3b5a5360651b'
+         '571688d2bce6597ae76a7ead8929420c')
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch
new file mode 100644
index 000000000..751305147
--- /dev/null
+++ b/libre/icedove-libre/Icedove-branding.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Sat, 24 Nov 2012 11:36:16 +0100
+Subject: Icedove branding
+
+---
+ mail/app/application.ini |    2 +-
+ mail/confvars.sh         |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mail/app/application.ini b/mail/app/application.ini
+index 8380eb7..12902c2 100644
+--- a/mail/app/application.ini
++++ b/mail/app/application.ini
+@@ -4,7 +4,7 @@
+ 
+ #filter substitution
+ [App]
+-Name=Thunderbird
++Name=Icedove
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+diff --git a/mail/confvars.sh b/mail/confvars.sh
+index 5c34d70..395bb87 100755
+--- a/mail/confvars.sh
++++ b/mail/confvars.sh
+@@ -3,8 +3,8 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-MOZ_APP_BASENAME=Thunderbird
+-MOZ_APP_NAME=thunderbird
++MOZ_APP_BASENAME=Icedove
++MOZ_APP_NAME=icedove
+ MOZ_UPDATER=1
+ MOZ_THUNDERBIRD=1
+ MOZ_CHROME_FILE_FORMAT=omni
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6ec577f58..d61b756f5 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=16.0.2
+_debver=17.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -30,16 +30,18 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         vendor.js
         makefile.patch
         branding.patch
-        ${_pkgname}.desktop)
+        ${_pkgname}.desktop
+        Icedove-branding.patch)
 options=(!emptydirs)
-md5sums=('a3724f40d28014acf593528bb8a048f0'
-         '53d62a4841d7989d1f6d1b04929394b4'
+md5sums=('f011e0308a0758df772638836fb03709'
+         '8534a19b46ce21d80fce16b50f1f37bd'
          'd6d58d3104a44624e0a3d227cdf1c211'
          '476ec205162340fb0679f522c9d31c3b'
          '4eecc4fc5aafaf0da651a09eadc90bee'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
-         'e785e0c267f4435ae1a9aa0b03bcacfb')
+         'e785e0c267f4435ae1a9aa0b03bcacfb'
+         'ea5f7a06967f561d47d7e5c35b23de6f')
 
 build() {
   export QUILT_PATCHES=debian/patches
@@ -58,10 +60,15 @@ build() {
   for i in 48x48 64x64; do
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
   done
+
+  # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh
+  rm -v debian/patches/debian-hacks/Icedove-branding.patch || true
+
   quilt push -av
 
   patch -Np1 -i "${srcdir}/makefile.patch" # small fix
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
+  patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
   cp "${srcdir}/mozconfig" .mozconfig
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"