Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

4 files changed, 16 insertions, 15 deletions

diff --git a/nonprism/choqok/PKGBUILD b/nonprism/choqok/PKGBUILD
index fe43c768b..d4403c3c4 100644
--- a/nonprism/choqok/PKGBUILD
+++ b/nonprism/choqok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119696 2014-09-28 15:42:16Z fyan $
+# $Id: PKGBUILD 126479 2015-01-24 09:42:46Z andrea $
 # Maintainer (Arch): Peter Richard Lewis <plewis@aur.archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Emanuele Rossi <newdna1510@yahoo.it>
@@ -6,8 +6,8 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgname=choqok
-pkgver=1.4
-pkgrel=2.nonprism1
+pkgver=1.5
+pkgrel=1.nonprism1
 pkgdesc="A status.net client for KDE, without Twitter support"
 url='http://choqok.gnufolks.org/'
 license=('GPL')
@@ -15,23 +15,24 @@ arch=('i686' 'x86_64' 'mips64el')
 conflicts=(${pkgname}-nonprism)
 replaces=(${pkgname}-nonprism)
 depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdebase-konqueror: proxy support')
+makedepends=('cmake' 'automoc4' 'telepathy-qt')
+optdepends=('kdebase-konqueror: proxy support'
+            'telepathy-qt: IMstatus plugin')
 install="${pkgname}.install"
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('2efe34ed903b448a21d9233d8033dbdb')
+md5sums=('f2efdd76199f8276e8ac2f76dc600596')
 
 prepare() {
   mkdir build
 
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # remove twitter service and keep only twitterapi (choqok software) for status.net and open collaboration services
+  # remove twitter service and keep only twitterapi (choqok software) for status.net and libre collaboration services
   sed -i '\|add_subdirectory(twitter)|d' microblogs/CMakeLists.txt
   sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicamicroblog.cpp
   sed -i 's|twitter[.]com|status.net|' microblogs/laconica/laconicasearch.cpp
 
-  # remove uploaders plugin (with only nonprivacy services)
+  # remove uploaders plugin (with nonprivacy services only)
   sed -i '\|add_subdirectory(uploaders)|d' plugins/CMakeLists.txt
   sed -i 's|Comment||' plugins/searchaction/choqok_searchaction.desktop
 
diff --git a/nonprism/duplicity/PKGBUILD b/nonprism/duplicity/PKGBUILD
index 31220cb30..5da804b78 100644
--- a/nonprism/duplicity/PKGBUILD
+++ b/nonprism/duplicity/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 125883 2015-01-13 21:43:27Z lfleischer $
+# $Id: PKGBUILD 126742 2015-01-29 10:04:01Z lfleischer $
 # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>
 # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com>
@@ -6,7 +6,7 @@
 
 pkgname=duplicity
 pkgver=0.7.01
-pkgrel=1.nonprism1
+pkgrel=2.nonprism1
 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-boto, python2-dropbox and python2-gdata recommendation'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/duplicity/'
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 4a921ecd4..c69a94769 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -4,7 +4,7 @@
 # We're getting this from Debian Sid
 _debname=icedove
 _debver=31.4.0
-_debrel=deb1
+_debrel=deb2
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -31,7 +31,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         ${pkgname}.desktop)
 options=(!emptydirs)
 sha256sums=('7b47a053fe1f10097350d4a599a80b91eed1dc21dfcda1618b229f97493cb93c'
-            '6217e7ef89d6c9c9caa616280051345e6ef09645d1ffe4006e13c940bb8b5a1b'
+            'ff0db7a63f3e0648131ca59e4e3c6ff911e795030a49bcf1edb8585a01b33437'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
             'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec'
             '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD
index 518633273..87aed3f52 100644
--- a/nonprism/kipi-plugins/PKGBUILD
+++ b/nonprism/kipi-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 228005 2014-12-24 13:30:15Z jgc $
+# $Id: PKGBUILD 229642 2015-01-22 14:42:12Z ronald $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -8,7 +8,7 @@
 pkgbase=digikam
 pkgname=kipi-plugins
 pkgver=4.5.0
-pkgrel=4.parabola1.nonprism1
+pkgrel=5.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')
@@ -18,7 +18,7 @@ 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' 
-	     'libbaloo4' 'libpgf' 'libusb-compat')
+	     'libbaloo4' 'libpgf' 'libusb-compat' 'libkface')
 depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' 'libkexiv2')
 optdepends=('libkgeomap: Geolocalize tool'
             'libmediawiki: MediaWiki Export plugin'