iceweasel-libre-1:25.0.deb1-1: updating version

3 files changed, 29 insertions, 28 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 0ed8d24ee..120310a8a 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -12,10 +12,10 @@
 
 _pgo=true
 
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=24.0
-_debrel=deb2
+_debver=25.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -23,7 +23,7 @@ _pkgname=iceweasel
 pkgname=iceweasel-libre
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -42,7 +42,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'gstreamer0.10-good-plugins: webm and mp4 demuxing'
             'gstreamer0.10-ugly-plugins: h.264 decoding'
             'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
 conflicts=('firefox')
@@ -58,15 +58,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         replace-urls.txt
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('8f24807d67599516850a4bdca2b2fbd6'
-         '1f4f1347e05b15f5af137787d614ecdf'
+md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
+         '4f4cde44b6e83cf78ff5d6e757d1913c'
          '350feec44d359c31679dbec3de6685df'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
          '5e01a51ec4f3dd72ff2525edfe6cd371'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '121fefaa040936c3b96298da0c49f450'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
+         'cfd8c2fb5e49ea3a7d5a52eda09d13e4'
+         'b0c23b67c247008b50fe9e7cf1e576ad'
          '6e335a517c68488941340ee1c23f97b0'
          'f1594fa3567e5b70202c3432d7c00202')
 
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
index fc13e32fb..278dd1a74 100644
--- a/libre/iceweasel-libre/replace-urls.txt
+++ b/libre/iceweasel-libre/replace-urls.txt
@@ -2,24 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               http://directory.fsf.org/wiki/GNU_IceCat"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               http://directory.fsf.org/wiki/GNU_IceCat
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/GNU_IceCat
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  http://directory.fsf.org/wiki/GNU_IceCat.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://directory.fsf.org/wiki/GNU_IceCat
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/GNU_IceCat"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/GNU_IceCat
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 91414dbbd..2eb202a56 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -8,17 +8,18 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
+// Disable Social API
+pref("social.remote-install.enabled", false);
+
 // Make sure that safebrowsing is disabled
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 
-pref("keyword.URL", "");
-pref("app.update.enabled", false);
-pref("app.update.auto", false);
+// Disable localstorage for privacy reasons.
 pref("dom.storage.enabled", false);
 
-// Disable Social API
-pref("social.remote-install.enabled", false);
-
 // Disable missing nonfree flash notification
 pref("plugins.notifyMissingFlash", false);
+
+// Enable Adwaita skin
+pref("general.skins.selectedSkin", "Adwaita");