diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-03-12 01:55:34 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-03-12 01:55:34 -0300 |
| commit | 5f15439ca7eacc49da1aee5619fdb2a0b152ee1e (patch) | |
| tree | 90750972a0690237cf6af90a42b26ddc46e3d8af | |
| parent | 6700d50623903ce22f3243ed969a7d461d5fc919 (diff) | |
{iceweasel,icecat}-{adblock-plus,noscript}: drop conflicts
| -rw-r--r-- | libre/icecat-adblock-plus/PKGBUILD | 3 | ||||
| -rw-r--r-- | libre/icecat-noscript/PKGBUILD | 1 | ||||
| -rw-r--r-- | libre/iceweasel-adblock-plus/PKGBUILD | 3 | ||||
| -rw-r--r-- | libre/iceweasel-noscript/PKGBUILD | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 1f80dfd7c..1b444d1e6 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -6,13 +6,12 @@ _pkgname=firefox-adblock-plus pkgname=icecat-adblock-plus pkgver=2.2.3 _addons_file=192004 -pkgrel=2 +pkgrel=2.1 pkgdesc="plugin for icecat which block ads and banners" arch=('any') url="http://adblockplus.org/" license=('GPL') depends=("icecat") -conflicts=$_pkgname provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 2f78dd128..31a2a765d 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -11,7 +11,6 @@ arch=('any') url="http://noscript.net/" license=('GPL2') depends=() -conflicts=$_pkgname provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index 338e059e8..58f72b6da 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -6,13 +6,12 @@ _pkgname=firefox-adblock-plus pkgname=iceweasel-adblock-plus pkgver=2.2.3 _addons_file=192004 -pkgrel=2 +pkgrel=2.1 pkgdesc="plugin for iceweasel which block ads and banners" arch=('any') url="http://adblockplus.org/" license=('GPL') depends=("iceweasel-libre") -conflicts=$_pkgname provides=$_pkgname=$pkgver makedepends=('unzip') noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index d02d90c3b..d57f2fa00 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -11,7 +11,6 @@ arch=('any') url="http://noscript.net/" license=('GPL2') depends=() -conflicts=$_pkgname provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) |