10 files changed, 64 insertions, 69 deletions
diff --git a/celt/PKGBUILD b/celt/PKGBUILD
index b003294..456bd46 100644
--- a/celt/PKGBUILD
+++ b/celt/PKGBUILD
@@ -1,9 +1,9 @@
-# Contributor: Lauri Niskanen <ape@ape3000.com>
+# Maintainer: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Ray Rashif <schivmeister@gmail.com>
 
 pkgname=celt
-pkgver=0.7.0
-pkgrel=2
+pkgver=0.7.1
+pkgrel=1
 pkgdesc="Low-latency audio communication codec"
 arch=(i686 x86_64)
 url="http://www.celt-codec.org"
@@ -11,7 +11,7 @@ license=('BSD')
 depends=('libogg')
 options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('0bb72abec367f4ef12551f79dda11b23')
+md5sums=('c7f6b8346e132b1a48dae0eff77ea9f0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -20,8 +20,8 @@ build() {
   make || return 1
   make DESTDIR="$pkgdir" install
 
-  ln -s $pkgdir/usr/lib/libcelt.so.0.0.0 $pkgdir/usr/lib/libcelt.so.0.7
-  ln -s $pkgdir/usr/lib/libcelt.so.0.0.0 $pkgdir/usr/lib/libcelt.so.0.7.0
+  ln -s libcelt0.so.0.0.0 $pkgdir/usr/lib/libcelt.so.0.7
+  ln -s libcelt0.so.0.0.0 $pkgdir/usr/lib/libcelt.so.0.7.1
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/BSD"
 }
diff --git a/celt/mumble11x.desktop b/celt/mumble11x.desktop
new file mode 100644
index 0000000..5dba0d0
--- /dev/null
+++ b/celt/mumble11x.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Mumble (1.1.X compatible)
+GenericName=Voice Chat
+Comment=Voice chat program (compatible with Mumble 1.1.X)
+Exec=mumble11x
+Icon=mumble
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=Network;Chat;Qt;
+Version=1.2.1
diff --git a/firefox-nightly/PKGBUILD b/firefox-nightly/PKGBUILD
index 009bc84..0a7dd7b 100644
--- a/firefox-nightly/PKGBUILD
+++ b/firefox-nightly/PKGBUILD
@@ -7,7 +7,7 @@ license=('MPL' 'GPL' 'LGPL')
 pkgname=firefox-nightly
 pkgdesc='Standalone web browser from mozilla.org, nightly build.'
 url='http://www.mozilla.org/projects/firefox'
-pkgver=3.7a2pre
+pkgver=3.7a4pre
 pkgrel=$(date +%Y_%m_%d_%T)
 
 source=( 'firefox-nightly.desktop' 'firefox-nightly-safe.desktop' )
diff --git a/gadmin-samba/PKGBUILD b/gadmin-samba/PKGBUILD
index 7f19861..87b93ad 100644
--- a/gadmin-samba/PKGBUILD
+++ b/gadmin-samba/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Marcin Kaczorek <kaczus@karek.pl>
 
 pkgname=gadmin-samba
-pkgver=0.2.8
+pkgver=0.2.9
 pkgrel=1
 pkgdesc="An easy to use GTK+ frontend for the SAMBA file and print server"
 url="http://gadmintools.flippedweb.com/index.php?option=com_content&task=view&id=16&Itemid=30"
@@ -25,7 +25,7 @@ build() {
 
   install -D -m644 desktop/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
 }
-md5sums=('28b92f17f69ca589bd3a2b6674f428b6'
+md5sums=('9902f6aff533367e5f62caa9fc383d9b'
          '23582cbe1716d3683b96987547fa7724')
-sha1sums=('b6d4a5e958210ffe2c4e9f6d473a6854ab5eef14'
+sha1sums=('0c4f1c2f6ca0dd71579d661c07ef3abaafc9dc76'
           'a2c7b7d0e5d8080a8adb11d41466253cbc63be43')
diff --git a/lsb-release/PKGBUILD b/lsb-release/PKGBUILD
index f754db2..825ea57 100644
--- a/lsb-release/PKGBUILD
+++ b/lsb-release/PKGBUILD
@@ -1,29 +1,25 @@
-# This is an example PKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
+# Maintainer: Malte Rabenseifner <malte@zearan.de>
 # Contributor: John Gerritse <reaphsharc@gmail.com>
+
 pkgname=lsb-release
 pkgver=1.4
-pkgrel=7
+pkgrel=8
 pkgdesc="LSB version query program."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.linuxbase.org/"
 license=('GPL2')
-groups=
-provides=
-depends=('bash')
-makedepends=('perl')
+install=lsb-release.install
 source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz)
 md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
 
 build() {
-  cd "$startdir/src/$pkgname-$pkgver"
-  mkdir $startdir/pkg/etc/
-  echo DISTRIB_ID="arch" > "$startdir/pkg/etc/lsb-release"
+  cd "$srcdir/$pkgname-$pkgver"
+
   make || return 1
-  #  make DESTDIR="$startdir/pkg" install - doesn't work, doeing it manually
-  install -D -m 644 lsb_release.1.gz $startdir/pkg/usr/share/man/man1/lsb_release.1.gz
-  install -D -m 755 lsb_release $startdir/pkg/usr/bin/lsb_release
+
+  install -dm755 "$pkgdir/etc" || return 1
+  echo "DISTRIB_DESCRIPTION=\"Arch Linux - A simple, lightweight linux distribution.\"" > "$pkgdir/etc/lsb-release" || return 1
+
+  install -Dm 644 lsb_release.1.gz "$pkgdir/usr/share/man/man1/lsb_release.1.gz" || return 1
+  install -Dm 755 lsb_release "$pkgdir/usr/bin/lsb_release" || return 1
 }
diff --git a/lsb-release/lsb-release.install b/lsb-release/lsb-release.install
new file mode 100644
index 0000000..a5ed0bd
--- /dev/null
+++ b/lsb-release/lsb-release.install
@@ -0,0 +1,7 @@
+post_install() {
+  echo "Arch Linux release" >> /etc/arch-release
+}
+
+pre_remove() {
+  sed -e "/Arch Linux release/d" -i /etc/arch-release
+}
diff --git a/lsb-release/mumble11x.desktop b/lsb-release/mumble11x.desktop
new file mode 100644
index 0000000..5dba0d0
--- /dev/null
+++ b/lsb-release/mumble11x.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Mumble (1.1.X compatible)
+GenericName=Voice Chat
+Comment=Voice chat program (compatible with Mumble 1.1.X)
+Exec=mumble11x
+Icon=mumble
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=Network;Chat;Qt;
+Version=1.2.1
diff --git a/mumble/PKGBUILD b/mumble/PKGBUILD
index 5c669ac..8798ded 100644
--- a/mumble/PKGBUILD
+++ b/mumble/PKGBUILD
@@ -6,21 +6,22 @@
 # to the depends and delete "no-g15" in the configure line below
 
 pkgname=mumble
-pkgver=1.2.0
-pkgrel=1
+pkgver=1.2.2
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('GPL')
-depends=('qt>=4.4.0' 'speex>=1.2rc1' 'celt=>0.7.0' 'lsb-release' 'avahi' 'libsndfile' 'protobuf')
-makedepends=('boost')
+depends=('qt>=4.4.0' 'speex>=1.2rc1' 'celt>=0.7.0' 'lsb-release' 'avahi' 'libsndfile' 'protobuf')
+makedepends=('boost' 'libxi' 'mesa')
 optdepends=('pulseaudio: for using mumble with pulseaudio')
 conflicts=('mumble-client')
 options=('!libtool') 
+install=mumble.install
 url="http://mumble.sourceforge.net/"
 source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz" \
-	mumble11x.desktop)
-md5sums=('25872328c8bbc8282ad7ebdeacc0e8b6'
-         'b85a15a46a8d0e9a28e87ff6678bb36a')
+	mumble11x.desktop )
+md5sums=('de30ee85170e183b66568b53b04c5727'
+         '70dcaa8ad2ecf68c6ba52ea03d112bcd')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/mumble/mumble.install b/mumble/mumble.install
index 7c28ef5..8eea713 100644
--- a/mumble/mumble.install
+++ b/mumble/mumble.install
@@ -1,42 +1,11 @@
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
 post_install() {
-  echo ' -> Mumble will generate an anonymous usage report'
-  echo ' -> 10 minutes after launch. You can deactivate this'
-  echo ' -> feature: Menu "Configure" > Settings > User'
-  echo ' -> Interface > "Expert Config" > Network > "Submit'
-  echo ' -> anonymous statistics"'
-  echo ''
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
+gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  echo ' -> Mumble will generate an anonymous usage report'
-  echo ' -> 10 minutes after launch. You can deactivate this'
-  echo ' -> feature: Menu "Configure" > Settings > User'
-  echo ' -> Interface > "Expert Config" > Network > "Submit'
-  echo ' -> anonymous statistics"'
-  echo ''
+post_install
 }
 
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
 post_remove() {
-  /bin/true
+post_install
 }
-
-op=$1
-shift
-$op $*
diff --git a/mumble/mumble11x.desktop b/mumble/mumble11x.desktop
index 1305f7c..5dba0d0 100644
--- a/mumble/mumble11x.desktop
+++ b/mumble/mumble11x.desktop
@@ -8,4 +8,4 @@ Terminal=false
 Type=Application
 StartupNotify=false
 Categories=Network;Chat;Qt;
-Version=1.0
+Version=1.2.1