diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-31 10:53:52 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-31 10:53:52 +0100 |
| commit | 5330206481631dda2c1e585b758c58f90ab807ee (patch) | |
| tree | 963af2f017ae97a614bb4a1620dba3c8fccc4a1b /extra/digikam | |
| parent | de041df147ce2040490c5606f95dcacdd0ceb04c (diff) | |
| parent | 902eddd7e029eda6fc1c668b31e696c6ca3edbc7 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/xorg-server/PKGBUILD
multilib-staging/lib32-pango/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
staging/digikam/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/digikam')
| -rw-r--r-- | extra/digikam/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 6a8eeda1d..f055624c6 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147938 2012-01-28 11:06:05Z andrea $ +# $Id: PKGBUILD 147965 2012-01-29 09:32:13Z ronald $ # 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=3 +pkgrel=4 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') |