Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/audit/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/dia/PKGBUILD
	community/gedit-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/gitg/PKGBUILD
	community/gmic/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnome-screensaver/PKGBUILD
	community/gtranslator/PKGBUILD
	community/metacity/PKGBUILD
	community/zeitgeist-datahub/PKGBUILD
	core/glib2/PKGBUILD
	core/perl/PKGBUILD
	extra/anjuta-extras/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/brltty/PKGBUILD
	extra/cheese/PKGBUILD
	extra/clutter/PKGBUILD
	extra/cogl/PKGBUILD
	extra/devhelp/PKGBUILD
	extra/empathy/PKGBUILD
	extra/eog/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution/PKGBUILD
	extra/fontconfig/PKGBUILD
	extra/gcr/PKGBUILD
	extra/gdl/PKGBUILD
	extra/gedit/PKGBUILD
	extra/gjs/PKGBUILD
	extra/glade/PKGBUILD
	extra/glib-networking/PKGBUILD
	extra/gnome-calculator/PKGBUILD
	extra/gnome-contacts/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-documents/PKGBUILD
	extra/gnome-font-viewer/PKGBUILD
	extra/gnome-games/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-screenshot/PKGBUILD
	extra/gnome-session/PKGBUILD
	extra/gnome-terminal/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/grilo-plugins/PKGBUILD
	extra/gssdp/PKGBUILD
	extra/gthumb/PKGBUILD
	extra/gtkmm3/PKGBUILD
	extra/gtksourceview3/PKGBUILD
	extra/gucharmap/PKGBUILD
	extra/gupnp-av/PKGBUILD
	extra/gupnp-dlna/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/gupnp/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/js/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgee/PKGBUILD
	extra/libgweather/PKGBUILD
	extra/liboauth/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/libsocialweb/PKGBUILD
	extra/libsoup/PKGBUILD
	extra/mash/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/mutter/PKGBUILD
	extra/mysql/PKGBUILD
	extra/nautilus-sendto/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/network-manager-applet/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/p11-kit/PKGBUILD
	extra/pango/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/rest/PKGBUILD
	extra/rhythmbox/PKGBUILD
	extra/rygel/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vala/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vte3/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/yelp/PKGBUILD
	extra/zeitgeist/PKGBUILD
	libre/rp-pppoe-libre/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

1 files changed, 3 insertions, 3 deletions

diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 6a4701482..83f73824c 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88609 2013-04-20 16:45:02Z heftig $
+# $Id: PKGBUILD 88866 2013-04-24 14:09:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
@@ -6,14 +6,14 @@
 pkgname=darktable
 pkgver=1.2
 _pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64' 'mips64el')
 url=http://darktable.sf.net/
 license=('GPL3')
 depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib'
 	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt'
-	 'libsoup')
+	 'libsoup' 'gtk-engines')
 makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 optdepends=('librsvg')
 install=darktable.install