summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-03-13 16:36:26 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-03-13 16:36:26 -0300
commit8b71e5a83412f0c2f45329fe89bb786b6971b7f3 (patch)
tree3812881858051d380478c554dc186fdd0da4bdbe
parent2ba692d3c7b9c572ff0f0eefc8e78c63995203d6 (diff)
parent142c794d4d452388c27355da3b47c02bf49846ac (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/icecat-adblock-plus/PKGBUILD3
-rw-r--r--libre/icecat-noscript/PKGBUILD3
-rw-r--r--libre/iceweasel-adblock-plus/PKGBUILD3
-rw-r--r--libre/iceweasel-noscript/PKGBUILD3
-rw-r--r--pcr/trisquel-themes/PKGBUILD8
5 files changed, 8 insertions, 12 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..5dc6bfa81 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -5,13 +5,12 @@
_pkgname=firefox-noscript
pkgname=icecat-noscript
pkgver=2.6.5.8
-pkgrel=1
+pkgrel=1.1
pkgdesc="plugin for icecat which disables script"
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..3b9bd0ce1 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -5,13 +5,12 @@
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
pkgver=2.6.5.8
-pkgrel=1
+pkgrel=1.1
pkgdesc="plugin for iceweasel which disables script"
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/pcr/trisquel-themes/PKGBUILD b/pcr/trisquel-themes/PKGBUILD
index f65f5c92b..69aad1870 100644
--- a/pcr/trisquel-themes/PKGBUILD
+++ b/pcr/trisquel-themes/PKGBUILD
@@ -2,8 +2,8 @@
pkgname=trisquel-themes
pkgver=6.0
-_miniver="5.99-2"
-pkgrel=1
+_miniver="5.99-3"
+pkgrel=2
pkgdesc="Themes from Trisquel, including GTK2, Metacity, XFWM and Openbox themes"
arch=('any')
url=http://trisquel.info
@@ -12,6 +12,8 @@ depends=()
optdepends=('gtk-engine-equinox: for Trisquel GTK2 theme')
source=(http://archive.trisquel.info/trisquel/pool/main/t/trisquel-gtk-theme/trisquel-gtk-theme_${pkgver}.tar.gz
http://archive.trisquel.info/trisquel/pool/main/t/trisquel-mini-data/trisquel-mini-data_${_miniver}.tar.gz)
+md5sums=('8d81a535adade0e52a0c584c07f87a2a'
+ 'e448057b6e2d933916511c2c3d3585e1')
build() {
:
@@ -25,5 +27,3 @@ package() {
${pkgdir}/usr/share/themes/
done
}
-md5sums=('8d81a535adade0e52a0c584c07f87a2a'
- 'dd222c321374692f57e21c47aa70d402')