11 files changed, 111 insertions, 56 deletions
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index d5128f90f..51f0a0c0a 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90259 2013-05-10 15:53:35Z jelle $
+# $Id: PKGBUILD 91009 2013-05-17 10:26:19Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.30
+pkgver=0.9.31
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('4b0e4aeb0ebac5d5319a97cbd5163deb'
+md5sums=('19abde7fd5a065cadfaee4ed12568d96'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 21ab61b28..0d0e04e21 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182674 2013-04-12 14:26:14Z andyrtr $
+# $Id: PKGBUILD 185761 2013-05-18 14:38:33Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,7 +6,7 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.4
+pkgver=3.13.5
 pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64')
@@ -32,7 +32,7 @@ install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
         cups-1.6-buildfix.diff
         hp-mkuri.patch)
-md5sums=('e5c247161e2fd7685e0520e968393d19'
+md5sums=('f0c406f06f191a120f7d283b69ff10e8'
          'SKIP'
          'ef64578c6cb3ce252dbdcb0f1c2f4a47'
          '0bd7779fdbc4d7a9386df04dce2cb8d4')
@@ -99,7 +99,4 @@ package() {
  chmod 775 "$pkgdir"/var/log/hp{,/tmp}
  # remove rc script
  rm -rf "$pkgdir"/etc/init.d
- 
- # fix broken udev rule - FS#34282
- sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules
 }
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 9ff811c5a..237d617f9 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -30,15 +30,17 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         makefile.patch
         branding.patch
         ${_pkgname}.desktop
+        libre.patch
         Icedove-branding.patch)
 options=(!emptydirs)
 md5sums=('0c68298c17757257da79b6bb39e3fd10'
          'eb2a5e1877d87a16e10388f533c081a6'
          '5cf95ea94f69cdd36604890cfbf7b954'
-         'da090618f0d207d4f603a07b7b36dbe9'
+         '4eecc4fc5aafaf0da651a09eadc90bee'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
          'e785e0c267f4435ae1a9aa0b03bcacfb'
+         '2e36075067ddec9304b00ffe077705c2'
          'ea5f7a06967f561d47d7e5c35b23de6f')
 
 prepare() {
@@ -70,6 +72,9 @@ prepare() {
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
+  # Patch anything that's left
+  patch -Np1 -i "$srcdir/libre.patch"
+
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch
new file mode 100644
index 000000000..a6f23bdcd
--- /dev/null
+++ b/libre/icedove-libre/libre.patch
@@ -0,0 +1,49 @@
+diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js
+--- comm-esr17.orig/mail/app/profile/all-thunderbird.js	2013-05-18 18:46:27.290732014 -0300
++++ comm-esr17/mail/app/profile/all-thunderbird.js	2013-05-18 18:10:57.239376924 -0300
+@@ -160,11 +160,11 @@
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
++pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
++pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
+ 
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+@@ -189,7 +189,7 @@
+ pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
+                                             // Themes every day
+ 
+-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
++pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain");
+ pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
+ pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
+ 
+@@ -390,7 +390,7 @@
+ 
+ pref("spellchecker.dictionary", "");
+ // Dictionary download preference
+-pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
++pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain");
+ 
+ // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
+ // mail application without any user intervention. Possible values are: 
+@@ -747,9 +747,7 @@
+ #endif
+ 
+ // plugin finder service url
+-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.
+-php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=
+-%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
++pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+ 
+ // By default we show an infobar message when pages require plugins the user has
+ // not installed, or are outdated.
diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
index 5284fab54..279bdc158 100644
--- a/libre/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js
@@ -10,18 +10,3 @@ pref("mail.shell.checkDefaultMail", false);
 // Don't disable our bundled extensions in the application directory
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
-// Preferences for the Get Add-ons panel
-pref ("extensions.update.notifyUser", false);
-pref ("extensions.getAddons.showPane", false);
-pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.maxResults", 5);
-pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain");
-pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain");
-pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain");
-pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain");
-
-// Dictionary download preference
-pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain");
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index f84c8e745..97501a647 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -55,10 +55,10 @@ md5sums=('0a7c51bb494463c327af918bae6c4ee4'
          'c17121a4ffd40f463e16d7828445d96e'
          'e1e903ca91997f18b428c54ef604f27d'
          '383e8e2a97a8b13fe56d153adb6878b6'
-         '1c6b47e2123c684c1da1e08bd0a107d9'
+         '98a433139ffcbf6b3018f18dcaacdb4c'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         'e7e915720aaf6883ab4b706fe2195dda'
+         '0c26941504d3f2abed759221e9bb5de1'
          '52e52f840a49eb1d14be1c0065b03a93'
          '85e67561e0e491cd538ce018dfc2d948')
 
@@ -78,7 +78,7 @@ prepare() {
   # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it
   rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
 
-  quilt push -a
+  quilt push -av
 
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 9e4b75e36..0588fa632 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,42 @@
 diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
 --- mozilla-release.orig/browser/app/profile/firefox.js	2013-05-11 16:19:20.000000000 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2013-05-16 21:59:28.314070275 -0300
-@@ -1203,12 +1200,6 @@
++++ mozilla-release/browser/app/profile/firefox.js	2013-05-18 13:47:28.091097903 -0300
+@@ -37,11 +37,11 @@
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+ pref("extensions.getAddons.maxResults", 15);
+-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox");
+-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
++pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
++pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
++pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
+ 
+ // Blocklist preferences
+ pref("extensions.blocklist.enabled", true);
+@@ -64,7 +64,7 @@
+ pref("extensions.autoDisableScopes", 3);
+ 
+ // Dictionary download preference
+-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
++pref("browser.dictionaries.download.url", "https://trisquel.info/browser-plain");
+ 
+ // The minimum delay in seconds for the timer to fire.
+ // default=2 minutes
+@@ -601,7 +601,7 @@
+ pref("accessibility.typeaheadfind.flashBar", 1);
+ 
+ // plugin finder service url
+-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
++pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
+ 
+ // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
+ pref("plugins.hide_infobar_for_missing_plugin", false);
+@@ -1203,12 +1203,6 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 5e17c00d0..bd8bcb148 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -19,19 +19,3 @@ pref("dom.storage.enabled", false);
 
 // Enable gstreamer support
 pref("media.gstreamer.enabled", true);
-
-// Preferences for the Get Add-ons panel
-pref ("extensions.update.notifyUser", false);
-pref ("extensions.getAddons.showPane", false);
-pref ("extensions.getAddons.browseAddons", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.maxResults", 5);
-pref ("extensions.getAddons.recommended.browseURL", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.recommended.url", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.search.browseURL", "http://trisquel.info/browser-plain");
-pref ("extensions.getAddons.search.url", "http://trisquel.info/browser-plain");
-pref ("extensions.getMoreExtensionsURL" , "http://trisquel.info/browser-plain");
-pref ("extensions.getMorePluginsURL" , "http://trisquel.info/browser-plain");
-pref ("extensions.getMoreThemesURL" , "http://trisquel.info/browser-plain");
-
-// Dictionary download preference
-pref("browser.dictionaries.download.url", "http://trisquel.info/browser-plain");
diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD
index 1eb7bd8a7..8990fbae3 100644
--- a/libre/mkbootcd/PKGBUILD
+++ b/libre/mkbootcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 137619 2011-09-10 08:04:29Z pierre $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mkbootcd
 pkgver=2008.09
-pkgrel=2.1
-pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded"
+pkgrel=2.2
+pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
 arch=('any')
 license=('GPL')
 url="https://parabolagnulinux.org/"
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD
index 123300201..1c02bb01b 100644
--- a/libre/mkisolinux/PKGBUILD
+++ b/libre/mkisolinux/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgname=mkisolinux
 pkgver=2013.03
-pkgrel=1.1
-pkgdesc="Advanced, modular isolinux bootcd image creation utility, Parabola rebranded"
+pkgrel=2
+pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
 url="https://parabolagnulinux.org/"
@@ -20,7 +20,7 @@ md5sums=('945d5f5d74f37718c8c9d518bfd5698d'
 package()
 {
   cd "$srcdir/"
-  install -D -m755 mkisolinux "$pkgdir/usr/sbin/mkisolinux"
+  install -D -m755 mkisolinux "$pkgdir/usr/bin/mkisolinux"
   install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf"
   install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg"
   install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg"
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD
index cbdca0960..358e11709 100644
--- a/libre/mkpxelinux/PKGBUILD
+++ b/libre/mkpxelinux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 185735 2013-05-18 06:50:57Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mkpxelinux
 pkgver=2013.03
-pkgrel=1.1
-pkgdesc="Advanced, modular network pxe boot image creation utility, Parabola rebranded"
+pkgrel=2
+pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
 url="https://parabolagnulinux.org/"
@@ -20,7 +20,7 @@ md5sums=('7225e73bfe717f97bd7ab52f5ab157f6'
 package()
 {
   cd "$srcdir/"
-  install -D -m755 mkpxelinux "$pkgdir/usr/sbin/mkpxelinux"
+  install -D -m755 mkpxelinux "$pkgdir/usr/bin/mkpxelinux"
   install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf"
   install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg"
   install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg"