summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-03 02:47:35 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2014-09-03 02:47:35 -0300
commited13e3ece76b694d2e03ea2f8dfe194e3b2e68db (patch)
tree07a2c281bcc359bf91ac3b2b3bf967031e3456b0
parentdaa81ad158c86a249c422cf3951b22f2d7ab9cfb (diff)
parent4ae5aae85842d364d28b0ae2ac0ad40bec3a778a (diff)
downloadabslibre-ed13e3ece76b694d2e03ea2f8dfe194e3b2e68db.tar.gz
abslibre-ed13e3ece76b694d2e03ea2f8dfe194e3b2e68db.tar.bz2
abslibre-ed13e3ece76b694d2e03ea2f8dfe194e3b2e68db.zip
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
-rw-r--r--libre/kipi-plugins/PKGBUILD (renamed from libre/kipi-plugins-libre/PKGBUILD)10
-rw-r--r--libre/kipi-plugins/kipi-plugins.install (renamed from libre/kipi-plugins-libre/kipi-plugins.install)0
-rw-r--r--nonprism/kipi-plugins/PKGBUILD (renamed from nonprism/kipi-plugins-libre-nonprism/PKGBUILD)10
-rw-r--r--nonprism/kipi-plugins/kipi-plugins.install (renamed from nonprism/kipi-plugins-libre-nonprism/kipi-plugins.install)0
4 files changed, 8 insertions, 12 deletions
diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins/PKGBUILD
index b8888df6a..6716c3de9 100644
--- a/libre/kipi-plugins-libre/PKGBUILD
+++ b/libre/kipi-plugins/PKGBUILD
@@ -6,17 +6,15 @@
# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=digikam
-_pkgname=kipi-plugins
-pkgname=kipi-plugins-libre
+pkgname=kipi-plugins
pkgver=4.2.0
-pkgrel=2
+pkgrel=2.parabola1
pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.digikam.org/"
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${pkgname}-libre")
+conflicts=("${pkgname}-libre")
makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
diff --git a/libre/kipi-plugins-libre/kipi-plugins.install b/libre/kipi-plugins/kipi-plugins.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/libre/kipi-plugins-libre/kipi-plugins.install
+++ b/libre/kipi-plugins/kipi-plugins.install
diff --git a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD
index 8b4599f9e..235271ed0 100644
--- a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD
+++ b/nonprism/kipi-plugins/PKGBUILD
@@ -6,17 +6,15 @@
# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=digikam
-_pkgname=kipi-plugins
-pkgname=kipi-plugins-libre-nonprism
+pkgname=kipi-plugins
pkgver=4.2.0
-pkgrel=2
+pkgrel=2.parabola1.nonprism1
pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.digikam.org/"
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism")
+conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism")
makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen')
diff --git a/nonprism/kipi-plugins-libre-nonprism/kipi-plugins.install b/nonprism/kipi-plugins/kipi-plugins.install
index 81ce5c4b0..81ce5c4b0 100644
--- a/nonprism/kipi-plugins-libre-nonprism/kipi-plugins.install
+++ b/nonprism/kipi-plugins/kipi-plugins.install