diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
| commit | e8a18157bce8e0b0cbde5bd52aaf5ae0940297d3 (patch) | |
| tree | 89fc1343a6302c7ee5d72774fde0f5b67d0b1927 /extra/digikam | |
| parent | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (diff) | |
| parent | 39711f3264d3b9de2ff6392649274d6333932457 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
staging/digikam/PKGBUILD
testing/curl/PKGBUILD
Diffstat (limited to 'extra/digikam')
| -rw-r--r-- | extra/digikam/PKGBUILD | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index d92937e2c..6a8eeda1d 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146190 2012-01-05 20:00:07Z ronald $ +# $Id: PKGBUILD 147938 2012-01-28 11:06:05Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') pkgver=2.5.0 -pkgrel=1 +pkgrel=3 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -55,7 +55,6 @@ package_digikam() { # these are in oxygen-icons rm -rf ${pkgdir}/usr/share/icons - } package_libkface() { @@ -76,7 +75,7 @@ package_libkgeomap() { package_libkvkontakte() { pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network" - depends=('kdelibs') + depends=('kdelibs' 'qjson') cd "${srcdir}"/build/extra/libkvkontakte make DESTDIR="${pkgdir}" install |