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

3 files changed, 46 insertions, 37 deletions

diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
index 8df68e2b6..6a07966b2 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id$
-# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor:JZsolt Varadi (karmaxxl) 
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,13 +8,13 @@
 _pkgname=gnormalize
 pkgname=gnormalize-libre
 pkgver=0.63
-pkgrel=4
-pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)"
-arch=(any)
-url="http://gnormalize.sourceforge.net/"
+pkgrel=5
+pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation'
+arch=('any')
+url='http://gnormalize.sourceforge.net/'
 license=('GPL')
-depends=(perl cddb_get desktop-file-utils gtk2-perl hicolor-icon-theme)
-makedepends=('xz')
+depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme')
+makedepends=('xz' 'gendesk')
 optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
             'lame: MP3 encoding'
             'mpg321: MP3 playing'
@@ -29,26 +30,33 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=gnormalize.install
-source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz
-        gnormalize.desktop)
-md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884')
+source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz")
+sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6')
 
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize"
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  gendesk -n --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --mimetypes \
+  'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg'
   lzma -qd gnormalize.1.lzma
-  install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1"
-  install -d "${pkgdir}/usr/share/gnormalize/animations"
-  install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/"
-  install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README"
-  install -Dm644 icons/gnormalize.png  \
-    "${pkgdir}/usr/share/pixmaps/gnormalize.png"
+} 
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 "$_pkgname.1" "$pkgdir/usr/share/man/man1/$_pkgname.1"
+  install -d "$pkgdir/usr/share/$_pkgname/animations"
+  install -m644 animations/*.gif "$pkgdir/usr/share/$_pkgname/animations/"
+  install -Dm644 README "$pkgdir/usr/share/doc/$_pkgname/README"
+  install -Dm644 "icons/$_pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$_pkgname.png"
   for i in 16 32 48 ; do
-    install -Dm644 icons/gnormalize-${i}.png \
-      "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/gnormalize.png"
+    install -Dm644 "icons/gnormalize-$i.png" \
+      "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$_pkgname.png"
   done
-  install -Dm644 "${srcdir}/gnormalize.desktop" \
-    "${pkgdir}/usr/share/applications/gnormalize.desktop"
+  install -Dm644 "$_pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/lsb-release-libre/PKGBUILD b/libre/lsb-release/PKGBUILD
index 51ec79bea..adf9c4774 100644
--- a/libre/lsb-release-libre/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -1,35 +1,36 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# Parabola contributor: André Silva <andre.paulista@adinet.com.uy>
-# $Id: PKGBUILD 22635 2010-07-25 20:05:28Z svenstaro $
+# $Id: PKGBUILD 79819 2012-11-13 13:12:30Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Malte Rabenseifner <malte@zearan.de>
 # Contributor: John Gerritse <reaphsharc@gmail.com>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva emulatorman@lavabit.com>
 
-_pkgname=lsb-release
-pkgname=lsb-release-libre
+pkgname=lsb-release
 pkgver=1.4
-pkgrel=12
-pkgdesc="LSB version query program with Parabola name"
+pkgrel=13
+pkgdesc="LSB version query program (Parabola rebranded)"
 arch=('any')
 url="http://www.linuxbase.org/"
 license=('GPL2')
-provides=('lsb-release')
-conflicts=('lsb-release')
-replaces=('lsb-release')
+depends=('bash')
+provides=('lsb-release-libre')
+conflicts=('lsb-release-libre')
+replaces=('lsb-release-libre')
 install=lsb-release.install
-source=(http://downloads.sourceforge.net/lsb/$_pkgname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz)
 md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   install -dm755 "$pkgdir/etc"
+  echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release"
   echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release"
   echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
   echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release"
diff --git a/libre/lsb-release-libre/lsb-release.install b/libre/lsb-release/lsb-release.install
index 62d404892..62d404892 100644
--- a/libre/lsb-release-libre/lsb-release.install
+++ b/libre/lsb-release/lsb-release.install