ice{ape,dove,weasel}-{l10n,libre}: change format version

6 files changed, 25 insertions, 19 deletions

diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index c9f22703d..faf607a78 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,10 +22,11 @@ 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."
+pkgdesc="Language packs for Debian Iceape"
 arch=('any')
 url="http://packages.debian.org/sid/iceape"
 license=('MPL' 'GPL')
@@ -34,7 +35,7 @@ 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..806a63889 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -4,15 +4,16 @@
 # 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
-pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
+pkgrel=1
+pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
@@ -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
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index f1446b23b..fea6ac761 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)
 
@@ -12,7 +13,7 @@ pkgname=($(for lang in ${_langpacks[@]}
         done))
 
 pkgrel=1
-pkgdesc="Language packs for Debian Icedove."
+pkgdesc="Language packs for Debian Icedove"
 arch=('any')
 url="http://packages.debian.org/sid/icedove"
 license=('MPL' 'GPL')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index d0820b8e5..25b2ae64c 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -4,15 +4,16 @@
 # 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."
+pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 url="http://packages.debian.org/sid/${_pkgname}"
@@ -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..fe10826ef 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,10 +22,11 @@ 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
 
-pkgdesc="Language packs for Debian Iceweasel."
+pkgdesc="Language packs for Debian Iceweasel"
 arch=('any')
 url="http://packages.debian.org/experimental/iceweasel"
 license=('MPL' 'GPL')
@@ -34,7 +35,7 @@ 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..1af415e78 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -15,16 +15,17 @@ _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
 
-pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
+pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox"
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
 depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
@@ -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