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

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 10 insertions, 10 deletions

diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index a311ba26b..9c51e7fbf 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,12 +1,12 @@
 # vim:set ft=sh:
-# $Id: PKGBUILD 93493 2013-07-04 12:38:15Z idevolder $
+# $Id: PKGBUILD 94327 2013-07-20 16:50:58Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
 _pkgbase=doublecmd
 pkgbase=doublecmd-libre
-pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre')
-pkgver=0.5.5
+pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
+pkgver=0.5.6
 _helpver=0.5.5
 pkgrel=1
 url="http://doublecmd.sourceforge.net/"
@@ -24,7 +24,7 @@ source=(
 	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
 	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
 )
-sha256sums=('253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434'
+sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5'
             '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
 
 build() {
@@ -47,11 +47,11 @@ build() {
 	./build.sh beta qt
 }
 
-package_doublecmd-gtk2-libre() {
+package_doublecmd-libre-gtk2() {
 	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
 	depends=('gtk2')
-	conflicts=('doublecmd-gtk2')
-	replaces=('doublecmd-gtk2')
+	conflicts=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
+	replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
 	provides=("doublecmd-gtk2=${pkgver}")
 	cd "$srcdir/$_pkgbase-gtk"
 	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
@@ -62,11 +62,11 @@ package_doublecmd-gtk2-libre() {
 	cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
 }
 
-package_doublecmd-qt-libre() {
+package_doublecmd-libre-qt() {
 	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
 	depends=('qt4pas')
-	conflicts=('doublecmd-qt')
-	replaces=('doublecmd-qt')
+	conflicts=('doublecmd-qt' 'doublecmd-qt-libre')
+	replaces=('doublecmd-qt' 'doublecmd-qt-libre')
 	provides=("doublecmd-qt=${pkgver}")
 	cd "$srcdir/$_pkgbase-qt"
 	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh