diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-02-03 14:09:45 -0300 |
| commit | 308f6ff034c928c0c4fc2ce168df7192ca2b1209 (patch) | |
| tree | 49603bf604b0d3b3e4e0f1d71d0a52380933aa36 /libre/doublecmd-libre | |
| parent | 99d72f453ab00a43e11f6903bf34d6cd27962a4f (diff) | |
| parent | 964755f48fefde84fce71781d0744e2158f60814 (diff) | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to 'libre/doublecmd-libre')
| -rw-r--r-- | libre/doublecmd-libre/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index c08273344..797bbdfc2 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') + conflicts=('doublecmd-libre-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre') replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre') - provides=("doublecmd-gtk2=${pkgver}") + 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-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') + conflicts=('doublecmd-libre-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre') replaces=('doublecmd-qt' 'doublecmd-qt-libre') - provides=("doublecmd-qt=${pkgver}") + 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" |