Sat Aug 24 01:47:21 PDT 2013

7 files changed, 31 insertions, 21 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 03be621ec..1eb17b175 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96243 2013-08-22 15:33:49Z andrea $
+# $Id: PKGBUILD 96275 2013-08-23 10:26:11Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,8 +9,8 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.44
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
@@ -20,7 +20,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
          'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
          'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' 
-         'python2-netifaces' 'python2-cssselect')
+         'python2-netifaces' 'python2-cssselect' 'python2-apsw')
 makedepends=('python2-pycountry' 'qt4-private-headers')
 optdepends=('ipython2: to use calibre-debug')
 replaces=$_pkgname
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('5598d6717ce568a32ea2a4a1c173016b'
+md5sums=('5f3d0c3630a7289ef1f36d68153ea7a3'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index c9f22703d..5e088da07 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -12,7 +12,7 @@
 
 _debname=iceape
 _debver=2.7.12
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -22,19 +22,20 @@ pkgbase=iceape-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
+epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
 
 pkgdesc="Language packs for Debian Iceape."
 arch=('any')
 url="http://packages.debian.org/sid/iceape"
 license=('MPL' 'GPL')
-depends=("iceape-libre>=$pkgver")
+depends=("iceape-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 source=('region.properties')
 for lang in ${_langpacks[@]}
 do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
 done
 
 _path="/usr/lib/iceape/extensions"
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 22ad1541b..efacd73ce 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -4,14 +4,15 @@
 # We're getting this from Debian Sid
 _debname=iceape
 _debver=2.7.12
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=${_debname}
 pkgname=${_debname}-libre
+epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=8
+pkgrel=1
 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -23,7 +24,7 @@ provides=('seamonkey')
 install=$_pkgname.install
 url="http://packages.debian.org/sid/${_pkgname}"
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
         ${_pkgname}.desktop
         ${_pkgname}-2.0-lang.patch
@@ -98,6 +99,8 @@ prepare() {
 }
 
 build() {
+  export DEBIAN_BUILD="comm-release"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
@@ -113,6 +116,8 @@ build() {
 }
 
 package() {
+  export DEBIAN_BUILD="comm-release"
+
   cd "${srcdir}/${DEBIAN_BUILD}"
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index f1446b23b..bbd3e1213 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,9 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
+epoch=1
 _pkgver=17.0.8
-pkgver=17.0.8.1
+pkgver=17.0.8.deb1
 
 _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)
 
@@ -16,7 +17,7 @@ pkgdesc="Language packs for Debian Icedove."
 arch=('any')
 url="http://packages.debian.org/sid/icedove"
 license=('MPL' 'GPL')
-depends=("icedove-libre>=$pkgver")
+depends=("icedove-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 _url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
 
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index d0820b8e5..246f228bc 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -4,12 +4,13 @@
 # We're getting this from Debian Sid
 _debname=icedove
 _debver=17.0.8
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=${_debname}
 pkgname=${_debname}-libre
+epoch=1
 pkgver=${_debver}.${_debrel}
 pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
@@ -24,7 +25,7 @@ conflicts=('thunderbird')
 provides=('thunderbird')
 install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
         replace-urls.txt
         vendor.js
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index fae6951dd..d0878ef89 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -12,7 +12,7 @@
 
 _debname=iceweasel
 _debver=23.0.1
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -22,6 +22,7 @@ pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
+epoch=1
 pkgver=$_debver.$_debrel
 pkgrel=1
 
@@ -29,12 +30,12 @@ pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
 url="http://packages.debian.org/experimental/iceweasel"
 license=('MPL' 'GPL')
-depends=("iceweasel-libre>=$pkgver")
+depends=("iceweasel-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
 source=('region.properties')
 for lang in ${_langpacks[@]}
 do
-    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+    source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
 done
 
 _path="/usr/lib/iceweasel/browser/extensions/"
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6172155ef..32e502bcb 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -15,12 +15,13 @@ _pgo=true
 # We're getting this from Debian Experimental
 _debname=iceweasel
 _debver=23.0.1
-_debrel=1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=iceweasel
 pkgname=iceweasel-libre
+epoch=1
 pkgver=$_debver.$_debrel
 pkgrel=1
 
@@ -43,7 +44,7 @@ replaces=('firefox')
 conflicts=('firefox')
 provides=('firefox')
 source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
-        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+        "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
         mozconfig
         mozconfig.pgo
         libre.patch