summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-01-16 23:49:11 -0200
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-01-16 23:49:11 -0200
commitd41e0e5a566d7a119d980325fa15ee8b1623801b (patch)
treec7bdaa132c7c775e0c73a8116f15230d999573cf
parent77bf09cd5bf0bd8ee3c3145166a6ba062ad8bd09 (diff)
parentc067e5fe44fcaa9b67425652664ce94e8293cf37 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/icecat-l10n/PKGBUILD6
-rw-r--r--libre/iceweasel-l10n/PKGBUILD8
-rw-r--r--libre/iceweasel-l10n/PKGBUILD.in6
3 files changed, 10 insertions, 10 deletions
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index acdd3130d..eb03b6bfc 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -157,9 +157,9 @@ for lang in ${_langpacks[@]}
do
eval "
package_icecat-l10n-$(echo $lang | tr A-Z a-z) () {
- replaces=(icedove-l10n-$(echo $lang | tr A-Z a-z))
- conflicts=(icedove-l10n-$(echo $lang | tr A-Z a-z))
- provides=(icedove-l10n-$(echo $lang | tr A-Z a-z))
+ replaces=(icecat-l10n-$(echo $lang | tr A-Z a-z))
+ conflicts=(icecat-l10n-$(echo $lang | tr A-Z a-z))
+ provides=(icecat-l10n-$(echo $lang | tr A-Z a-z))
install -Dm644 $srcdir/$lang.xpi \"\${pkgdir}\"'${_path}langpack-${lang}@firefox.mozilla.org.xpi'
}
"
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 7d75aa3ac..4254c08d4 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=($(for lang in ${_langpacks[@]}
done))
_pkgver=18.0
pkgver=$_debver.$_debrel
-pkgrel=3
+pkgrel=4
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
@@ -63,9 +63,9 @@ for lang in ${_langpacks[@]}
do
eval "
package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
- replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
- conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
- provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+ replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
+ conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
+ provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\"
}
"
diff --git a/libre/iceweasel-l10n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in
index 7dd82c7cc..16017fa61 100644
--- a/libre/iceweasel-l10n/PKGBUILD.in
+++ b/libre/iceweasel-l10n/PKGBUILD.in
@@ -70,9 +70,9 @@ for lang in ${_langpacks[@]}
do
eval "
package_iceweasel-l10n-$(echo $lang | tr A-Z a-z) () {
- replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z))
- conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z))
- provides=(icedove-i18n-$(echo $lang | tr A-Z a-z))
+ replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
+ conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
+ provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z))
install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
}
"