diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
tree | aa810cc98c17cf30cad06226c22f8256c056430e /community/apper/PKGBUILD | |
parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
Diffstat (limited to 'community/apper/PKGBUILD')
-rw-r--r-- | community/apper/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD index e4751816e..361d3e90c 100644 --- a/community/apper/PKGBUILD +++ b/community/apper/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74244 2012-07-23 06:20:32Z idevolder $ +# $Id: PKGBUILD 75748 2012-08-30 17:50:49Z idevolder $ # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Zom <zom@eevul.org> @@ -6,7 +6,7 @@ pkgname=apper _pkgmainver=0.7 pkgver=0.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="KDE tools for PackageKit" arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Apper?content=84745" @@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17') makedepends=('cmake' 'automoc4' 'chrpath') install="$pkgname.install" provides=('kpackagekit') -conflicts=('kpackagekit') +conflicts=('kpackagekit' 'gnome-packagekit') replaces=('kpackagekit') source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f') |