From c114cce38c84b80b99a63e50ee72c3355ad074cf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 00:56:46 -0200 Subject: doublecmd-libre: fix replaces, conflicts and provides --- libre/doublecmd-libre/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libre/doublecmd-libre/PKGBUILD') diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index c08273344..7090abe6d 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=doublecmd-libre pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt') pkgver=0.5.8 _helpver=0.5.5 -pkgrel=1 +pkgrel=1.1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') @@ -48,9 +48,9 @@ build() { package_doublecmd-libre-gtk2() { pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation" depends=('gtk2') - conflicts=('doublecmd-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') - replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') - provides=("doublecmd-gtk2=${pkgver}") + conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2-libre' 'doublecmd-gtk2') + replaces=('doublecmd-gtk2-libre' 'doublecmd-gtk2') + provides=('doublecmd-gtk2-libre' "doublecmd-gtk2=${pkgver}") cd "$srcdir/$_pkgbase-gtk" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" @@ -63,9 +63,9 @@ package_doublecmd-libre-gtk2() { package_doublecmd-libre-qt() { pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation" depends=('qt4pas') - conflicts=('doublecmd-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') - replaces=('doublecmd-qt' 'doublecmd-qt-libre') - provides=("doublecmd-qt=${pkgver}") + conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt-libre' 'doublecmd-qt') + replaces=('doublecmd-qt-libre' 'doublecmd-qt') + provides=('doublecmd-qt-libre' "doublecmd-qt=${pkgver}") cd "$srcdir/$_pkgbase-qt" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" -- cgit v1.2.3 From 1d9352ee0c2007e7be377bffc91063c1b2b6eb10 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Jan 2014 02:23:03 -0200 Subject: doublecmd-libre: ordering on replaces, conflicts and provides --- libre/doublecmd-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre/doublecmd-libre/PKGBUILD') diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 7090abe6d..797bbdfc2 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -48,9 +48,9 @@ build() { package_doublecmd-libre-gtk2() { pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation" depends=('gtk2') - conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2-libre' 'doublecmd-gtk2') - replaces=('doublecmd-gtk2-libre' 'doublecmd-gtk2') - provides=('doublecmd-gtk2-libre' "doublecmd-gtk2=${pkgver}") + conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') + replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') + provides=("doublecmd-gtk2=${pkgver}" 'doublecmd-gtk2-libre') cd "$srcdir/$_pkgbase-gtk" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" @@ -63,9 +63,9 @@ package_doublecmd-libre-gtk2() { package_doublecmd-libre-qt() { pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation" depends=('qt4pas') - conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt-libre' 'doublecmd-qt') - replaces=('doublecmd-qt-libre' 'doublecmd-qt') - provides=('doublecmd-qt-libre' "doublecmd-qt=${pkgver}") + conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') + replaces=('doublecmd-qt' 'doublecmd-qt-libre') + provides=("doublecmd-qt=${pkgver}" 'doublecmd-qt-libre') cd "$srcdir/$_pkgbase-qt" sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" -- cgit v1.2.3