Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 15 insertions, 15 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index b39705eed..a552a79aa 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=blender
 epoch=9
 _pkgver=2.68
-pkgrel=1
+pkgrel=2
 _jpgver=1.5
 _pyver=3.3
 
@@ -62,7 +62,7 @@ makedepends=(
   mesa
   subversion
 )
-provides=($_pkgname=$epoch:$_pkgver)
+provides=$_pkgname
 conflicts=$_pkgname
 replaces=$_pkgname
 install=$_pkgname.install
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 652d6a6ba..1b030ecd5 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94003 2013-07-13 08:59:42Z jelle $
+# $Id: PKGBUILD 94300 2013-07-19 10:21:35Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.39
+pkgver=0.9.40
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('7ac795465e8e28da415141f1ad15dd2d'
+md5sums=('f63b0e5697c5e997ecaaeaa82a14cd60'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 prepare(){
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