Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

7 files changed, 50 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index e28a2ea64..74817ef36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pkg/
 *.tar*
 *.tgz
 *.zip
+*.orig
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index ec959542e..7d75aa3ac 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=1
+pkgrel=3
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
diff --git a/libre/iceweasel-l10n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in
index 05477caef..7dd82c7cc 100644
--- a/libre/iceweasel-l10n/PKGBUILD.in
+++ b/libre/iceweasel-l10n/PKGBUILD.in
@@ -16,7 +16,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _langpacks=@LANGPACKS@
 
-pkgbase=iceweasel-i18n
+pkgbase=iceweasel-l10n
 pkgname=($(for lang in ${_langpacks[@]}
         do echo $pkgbase-$lang | tr A-Z a-z
         done))
@@ -36,6 +36,8 @@ noextract=($(for lang in ${_langpacks[@]}
         do echo $lang.xpi
         done))
 
+_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+        
 dpkg-source() {
   # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
   cd "${_debname}-${_debver}"
@@ -46,16 +48,31 @@ dpkg-source() {
 build() {
   cd "${srcdir}"
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+
+cd $srcdir$_path
+
+for i in ${_langpacks[@]}
+do
+    unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i
+    rm langpack-$i@iceweasel.mozilla.org.xpi
+    install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+    zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i
+done
+
+cd $srcdir  
 }
 
-_path="/usr/lib/iceweasel-${_pkgver}/extensions"
+
 
 # CUT HERE <-- Separates package_*() functions from everything else.
 
 for lang in ${_langpacks[@]}
 do
     eval "
-package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () {
+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))
   install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi'
 }
 "
diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD
index ea43adfab..4962068fb 100644
--- a/social/libowfat/PKGBUILD
+++ b/social/libowfat/PKGBUILD
@@ -4,8 +4,8 @@
 # 	henning mueller <henning@orgizm.net>
 
 pkgname=libowfat
-pkgver=0.28
-pkgrel=4
+pkgver=0.29
+pkgrel=1
 pkgdesc='GPL reimplementation of libdjb'
 arch=(i686 x86_64)
 url=http://www.fefe.de/libowfat/
diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD
index f328607e7..2826a21ef 100644
--- a/social/opentracker/PKGBUILD
+++ b/social/opentracker/PKGBUILD
@@ -1,8 +1,9 @@
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=opentracker
-pkgver=20111020
-pkgrel=1
+pkgver=20120911
+pkgrel=2
 pkgdesc='An open and free bittorrent tracker (open mode)'
 arch=('i686' 'x86_64')
 url='http://erdgeist.org/arts/software/opentracker/'
@@ -10,13 +11,12 @@ license=('custom:Beer' 'GPL')
 makedepends=('libowfat' 'cvs')
 depends=('bash' 'zlib')
 backup=('etc/opentracker/config')
-install=${pkgname}.install
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz"
-        'opentracker.rc.d'
-        'license.txt')
-md5sums=('1dbace4895b4e1d290790f8ebacb2a2f'
-         '390bde9d010e79ab1309c02dcf9972e8'
-         '865211941e882c0aff5d36a22ac9efaa')
+source=('opentracker.rc'
+'opentracker.service'
+'license.txt')
+md5sums=('390bde9d010e79ab1309c02dcf9972e8'
+'3c638b71d5ecb65fb7964796975b2078'
+'865211941e882c0aff5d36a22ac9efaa')
 
 _cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot'
 _cvsmod='opentracker'
@@ -42,7 +42,6 @@ build() {
 	cd "${srcdir}/${_cvsmod}"
 	msg 'Starting make...'
 
-
 	sed	-e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \
 		-e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \
 		-i opentracker.conf.sample
@@ -58,7 +57,14 @@ package(){
 	cd "${srcdir}/${_cvsmod}"
 
 	install -D -m 755 opentracker $pkgdir/usr/bin/opentracker
-	install -D -m 755 $srcdir/opentracker.rc.d $pkgdir/etc/rc.d/opentracker
 	install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config
 	install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt
+
+  # create /etc/rc.d/opentracker
+  mkdir -p "$pkgdir/etc/rc.d/"
+  install -m 755 "$srcdir/opentracker.rc" "$pkgdir/etc/rc.d/opentracker"
+
+  # Create opentracker service
+  mkdir -p "$pkgdir/usr/lib/systemd/system/"
+  install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/"
 }
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 18e249a47..96f7015b9 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Based on haskell-pandoc
 
-# Run `makepkg -srp SRCBUILD` if you want to update the source tarball
+# Run `makepkg -sp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
 pkgver=1.9.4.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -15,9 +15,6 @@ options=(strip !makeflags !distcc)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('912abc4574aea3c5203eff1b02ceafa9'
-         '7ac798d62f253535a2e194af5aa1c3c3'
-         'e632f8c06be8284e17329a5d1c459e3b')
 
 # PKGBUILD functions
 build() {
@@ -72,3 +69,9 @@ package() {
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
+md5sums=('5ccbf0a74bb8594e42f7c2448952680e'
+         '233ef5ec5bb7bc91c8cd9dbe09841558'
+         'e0f60926ed8bf5e8f592bb3aa649093b')
+md5sums=('5ccbf0a74bb8594e42f7c2448952680e'
+         '233ef5ec5bb7bc91c8cd9dbe09841558'
+         'e0f60926ed8bf5e8f592bb3aa649093b')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index ebe1a0552..615a291f6 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -5,7 +5,7 @@ pkgname=pandoc
 pkgver=1.9.4.5
 # 0.3.6 fails with embed_data_files
 _citeproc=0.3.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')