Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/file-roller/PKGBUILD

6 files changed, 27 insertions, 26 deletions

diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index 9277ff8ac..f92efb2de 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.04
-pkgrel=4
+pkgver=11.05
+pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
-depends=('gtk2' 'gimp-ufraw' 'perl-exiftool' 'xdg-utils')
+depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils')
 optdepends=('mashup: for printing from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('4b90ca45375d7502a98f6ce556a1d9b7')
+md5sums=('8c970b43716ddcf6ee7d5cd15ca37d44')
 replaces=('fotox')
 
 build() {
@@ -17,13 +17,14 @@ build() {
   make PREFIX=/usr \
     CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \
     LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" 
-  sed -i 's#/local##' desktop
-  sed -i 's+^# ++' desktop
+  sed -i '8,9d' data/desktop
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  install -Dm644 desktop \
+  install -Dm644 data/desktop \
     $pkgdir/usr/share/applications/$pkgname.desktop 
-  make DESTDIR=$pkgdir PREFIX=/usr install
+  make MENUFILE1=$pkgdir/usr/share/applications/$pkgname.desktop \
+    DESTDIR=$pkgdir PREFIX=/usr install
+rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop 
 }
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index 8519e1843..e5cc4ef04 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=ifuse
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
 url='http://libimobiledevice.org/'
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 5b42a4cd7..c971d788c 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 40353 2011-02-23 08:02:01Z ebelanger $
+# $Id: PKGBUILD 45984 2011-05-01 11:42:17Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
-pkgver=2.0.1
-pkgrel=3
+pkgver=2.0.2
+pkgrel=1
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
-depends=('dcraw' 'exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libtiff' 'openexr' 'qt')
+depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt')
 replaces=('qtpfsgui')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-v${pkgver}.tar.gz)
-md5sums=('3d94bb4c40c7cbff2ebe8f3c15b46596')
-sha1sums=('4777912d8f70b02ff2586ea8c31a196ee265c81e')
+options=('!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz)
+sha256sums=('8a13aff0041fd7f7542af0b6b11e412c01f022d509458c4a701f8ca84bade993')
 
 build() {
-  cd "${srcdir}/luminance-v${pkgver}"
+  cd ${srcdir}/LuminanceHDR-${pkgver}
 
   if [ ${CARCH} = i686 ]; then
     sed -i 's/ -msse2//' project.pro
@@ -31,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/luminance-v${pkgver}"
+  cd ${srcdir}/LuminanceHDR-${pkgver}
 
-  make INSTALL_ROOT="${pkgdir}" install
+  make INSTALL_ROOT=${pkgdir} install
 }
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index fe01ee552..bf0fe1e4c 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,6 +1,5 @@
-2010-XX-XX Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.0.2
-	* dcraw dependency added for RAW support
+2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* luminancehdr 2.0.2-1
 
 2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* exiv2 0.20 rebuild
diff --git a/community/luminancehdr/luminancehdr.install b/community/luminancehdr/luminancehdr.install
index 1e4c274b3..279762804 100644
--- a/community/luminancehdr/luminancehdr.install
+++ b/community/luminancehdr/luminancehdr.install
@@ -1,5 +1,6 @@
 post_install() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD
index 219a84170..b0384e132 100644
--- a/community/warsow/PKGBUILD
+++ b/community/warsow/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45971 2011-04-30 23:33:26Z svenstaro $
+# $Id: PKGBUILD 45996 2011-05-01 17:37:53Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 # Contributor: Babets
@@ -6,7 +6,7 @@
 
 pkgname=warsow
 pkgver=0.62
-pkgrel=1
+pkgrel=2
 pkgdesc="a free online multiplayer competitive FPS based on the Qfusion engine"
 url="http://www.warsow.net/"
 license=('GPL')
@@ -24,8 +24,8 @@ md5sums=('f9bf60c80820237f7097c4e50a9582cd'
          '649568447e938efded07e77cdfb3accb')
 
 build() {
-  #unset CFLAGS
-	#unset CXXFLAGS
+  unset CFLAGS
+	unset CXXFLAGS
 
   # Extract Game Source Code
   unzip -o warsow_${pkgver}_sdk.zip -d $srcdir/warsow-src