summaryrefslogtreecommitdiff
path: root/mozilla-testing
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-12-30 03:35:44 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-12-30 03:35:44 -0500
commitfeb321bb10e2073a279fdf781f106f1475a05f03 (patch)
tree5be827cf1e1a3a6a224d27386d61fc4000b50af6 /mozilla-testing
parent0fa76acd2cfbd10330a48eaf9d2a7cd0ecba3be3 (diff)
downloadabslibre-feb321bb10e2073a279fdf781f106f1475a05f03.tar.gz
abslibre-feb321bb10e2073a279fdf781f106f1475a05f03.tar.bz2
abslibre-feb321bb10e2073a279fdf781f106f1475a05f03.zip
Rename iceweasel to iceweasel-libre
Diffstat (limited to 'mozilla-testing')
-rw-r--r--mozilla-testing/iceweasel-libre/PKGBUILD (renamed from mozilla-testing/iceweasel/PKGBUILD)7
-rw-r--r--mozilla-testing/iceweasel-libre/iceweasel.install (renamed from mozilla-testing/iceweasel/iceweasel.install)0
-rw-r--r--mozilla-testing/iceweasel-libre/libre.patch (renamed from mozilla-testing/iceweasel/libre.patch)0
-rw-r--r--mozilla-testing/iceweasel-libre/mozconfig (renamed from mozilla-testing/iceweasel/mozconfig)0
-rw-r--r--mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch (renamed from mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch)0
-rw-r--r--mozilla-testing/iceweasel-libre/region.properties (renamed from mozilla-testing/iceweasel/region.properties)0
-rw-r--r--mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch (renamed from mozilla-testing/iceweasel/xulrunner-copy-stub.patch)0
7 files changed, 6 insertions, 1 deletions
diff --git a/mozilla-testing/iceweasel/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index e7f9d4d84..23db67d96 100644
--- a/mozilla-testing/iceweasel/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -9,7 +9,7 @@ _debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
-pkgname=iceweasel
+pkgname=iceweasel-libre
_pkgver=9.0
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -61,6 +61,11 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
xulrunner-copy-stub.patch
region.properties)
+if [ "$_pkgname" != "$pkgname" ]; then
+ provides+=("$_pkgname")
+ conflicts+=("$_pkgname")
+fi
+
dpkg-source() {
# This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
export QUILT_PATCHES=debian/patches
diff --git a/mozilla-testing/iceweasel/iceweasel.install b/mozilla-testing/iceweasel-libre/iceweasel.install
index 376600ec2..376600ec2 100644
--- a/mozilla-testing/iceweasel/iceweasel.install
+++ b/mozilla-testing/iceweasel-libre/iceweasel.install
diff --git a/mozilla-testing/iceweasel/libre.patch b/mozilla-testing/iceweasel-libre/libre.patch
index e29e22a67..e29e22a67 100644
--- a/mozilla-testing/iceweasel/libre.patch
+++ b/mozilla-testing/iceweasel-libre/libre.patch
diff --git a/mozilla-testing/iceweasel/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
index 8344f6967..8344f6967 100644
--- a/mozilla-testing/iceweasel/mozconfig
+++ b/mozilla-testing/iceweasel-libre/mozconfig
diff --git a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch
index f0f7325a5..f0f7325a5 100644
--- a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch
+++ b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch
diff --git a/mozilla-testing/iceweasel/region.properties b/mozilla-testing/iceweasel-libre/region.properties
index 2e980987e..2e980987e 100644
--- a/mozilla-testing/iceweasel/region.properties
+++ b/mozilla-testing/iceweasel-libre/region.properties
diff --git a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch
index e3b8e9376..e3b8e9376 100644
--- a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch
+++ b/mozilla-testing/iceweasel-libre/xulrunner-copy-stub.patch