diff options
| -rwxr-xr-x | libre/icedove-libre/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/icedove-libre/branding.patch | 19 | ||||
| -rwxr-xr-x | libre/icedove-libre/channel-prefs.js | 9 |
3 files changed, 23 insertions, 14 deletions
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index f4f6c5c76..9eefb9c88 100755 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=2 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') @@ -26,17 +26,17 @@ install=$_pkgname.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig - channel-prefs.js vendor.js makefile.patch + branding.patch ${_pkgname}.desktop) options=(!emptydirs) md5sums=('a3724f40d28014acf593528bb8a048f0' '53d62a4841d7989d1f6d1b04929394b4' 'd6d58d3104a44624e0a3d227cdf1c211' - '476ec205162340fb0679f522c9d31c3b' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' + '126b1446212396c33220936c01d9592d' 'e785e0c267f4435ae1a9aa0b03bcacfb') build() { @@ -59,6 +59,7 @@ build() { quilt push -av patch -Np1 -i "$srcdir/makefile.patch" # small fix + patch -Np1 -i "$srcdir/branding.patch" # fixing branding cp "${srcdir}/mozconfig" .mozconfig make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -70,8 +71,6 @@ package() { make -j1 -f client.mk DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" - # Recommend free addons - install -Dm644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/channel-prefs.js" for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch new file mode 100644 index 000000000..d84b8075a --- /dev/null +++ b/libre/icedove-libre/branding.patch @@ -0,0 +1,19 @@ +diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd +--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200 ++++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200 +@@ -1,4 +1,4 @@ + <!ENTITY brandShortName "Icedove"> +-<!ENTITY brandFullName "Icedove Mail/News"> +-<!ENTITY vendorShortName "Icedove"> ++<!ENTITY brandFullName "Icedove"> ++<!ENTITY vendorShortName "Mozilla"> + <!ENTITY trademarkInfo.part1 " "> +diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties +--- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200 ++++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200 +@@ -1,3 +1,3 @@ + brandShortName=Icedove +-brandFullName=Icedove Mail/News +-vendorShortName=Icedove ++brandFullName=Icedove ++vendorShortName=Mozilla diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js deleted file mode 100755 index 13b1ba388..000000000 --- a/libre/icedove-libre/channel-prefs.js +++ /dev/null @@ -1,9 +0,0 @@ -//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js" -pref("app.update.channel", "default"); - -//Recommend free addons -pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); |