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

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

4 files changed, 8 insertions, 28 deletions

diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index e89ad91c5..55dbf6837 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $
+# $Id: PKGBUILD 52439 2011-07-25 17:38:27Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=3.1m6
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
 license=('GPL')
-depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils')
+depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
-source=(rawtherapee.desktop rawtherapee.png)
-md5sums=('83f14b57b27f066705b0aec7ad56c53d'
-         '4e54e74684971a2f04d9396b9051570e')
+source=()
+md5sums=()
 
 _root="https://rawtherapee.googlecode.com/hg/"
 _repo="rawtherapee"
-#_branch="branch_3.0"
-#_changeset="71045bfba97e" # changeset $pkgver
 
 build() {
   cd "$srcdir"
@@ -30,10 +27,10 @@ build() {
   if [ -d $_repo ] ; then
     cd $_repo
     hg pull
-    hg up "Dev-$pkgver"
+    hg up "$pkgver"
     msg "The local files are updated."
   else
-    hg clone -u "Dev-$pkgver" $_root $_repo
+    hg clone -u "$pkgver" $_root $_repo
   fi
 
   msg "Mercurial checkout done or server timeout"
@@ -54,11 +51,4 @@ build() {
 package() {
   cd "$srcdir/$_repo-build"
   make DESTDIR="$pkgdir/" install
-
-  # remove unneded rtstart script
-  # see http://code.google.com/p/rawtherapee/issues/detail?id=184
-  rm "$pkgdir"/usr/bin/rtstart
-
-  install -D -m644 "$srcdir"/rawtherapee.desktop "$pkgdir"/usr/share/applications/rawtherapee.desktop
-  install -D -m644 "$srcdir"/rawtherapee.png "$pkgdir"/usr/share/pixmaps/rawtherapee.png
 }
diff --git a/community/rawtherapee/rawtherapee.desktop b/community/rawtherapee/rawtherapee.desktop
deleted file mode 100644
index 3395712a8..000000000
--- a/community/rawtherapee/rawtherapee.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=RawTherapee
-GenericName=RAW image editor
-Exec=rt
-Icon=rawtherapee
-Terminal=false
-Categories=Graphics;
-StartupNotify=true
-MimeType=image/jpeg;image/jpg;image/tiff;image/png;image/x-canon-cr2;image/x-canon-crw;image/x-nikon-nef;image/x-fuji-raf;image/x-pentax-pef;image/x-adobe-dng;image/x-sony-arw;image/x-sony-sr2;image/x-minolta-mrw;image/x-panasonic-raw;image/x-olympus-orf;image/x-kodak-kdc;
diff --git a/community/rawtherapee/rawtherapee.install b/community/rawtherapee/rawtherapee.install
index 6162b34dd..385eec8f4 100644
--- a/community/rawtherapee/rawtherapee.install
+++ b/community/rawtherapee/rawtherapee.install
@@ -2,6 +2,7 @@ post_install() {
   echo "update desktop mime database..."
   update-desktop-database -q
   update-mime-database usr/share/mime 1>&2 > /dev/null
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/rawtherapee/rawtherapee.png b/community/rawtherapee/rawtherapee.png
deleted file mode 100644
index 694f4e5da..000000000
--- a/community/rawtherapee/rawtherapee.png
+++ /dev/null