remove libre suffix on bitlbee and openshot nonprism packages

6 files changed, 8 insertions, 8 deletions

diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-nonprism/PKGBUILD
index 533aa2cb7..8ea7706a7 100644
--- a/nonprism/bitlbee-libre-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-nonprism/PKGBUILD
@@ -9,7 +9,7 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 _pkgname=bitlbee
-pkgname=bitlbee-libre-nonprism
+pkgname=bitlbee-nonprism
 pkgver=3.2.2
 pkgrel=1
 pkgdesc='Brings XMPP to IRC, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
@@ -19,9 +19,9 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr')
 optdepends=('libotr: for OTR encryption support')
-provides=($_pkgname=$pkgver)
-conflicts=($_pkgname)
-replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
+provides=(${_pkgname}=$pkgver)
+conflicts=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-coherence" "${_pkgname}-libre-nonprism" "${_pkgname}-parabola")
+replaces=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-coherence" "${_pkgname}-libre-nonprism" "${_pkgname}-parabola")
 source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz"
         'bitlbee.tmpfiles')
 sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c'
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-nonprism/bitlbee.install
index c8a8f93a1..c8a8f93a1 100644
--- a/nonprism/bitlbee-libre-nonprism/bitlbee.install
+++ b/nonprism/bitlbee-nonprism/bitlbee.install
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
index da72a0a79..da72a0a79 100644
--- a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
+++ b/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
diff --git a/nonprism/openshot-libre-nonprism/PKGBUILD b/nonprism/openshot-nonprism/PKGBUILD
index 396e469e6..171cbc10d 100644
--- a/nonprism/openshot-libre-nonprism/PKGBUILD
+++ b/nonprism/openshot-nonprism/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=openshot
-pkgname=openshot-libre-nonprism
+pkgname=openshot-nonprism
 pkgver=1.4.3
 pkgrel=3
 pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support"
@@ -15,9 +15,9 @@ depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
 	 'pyxdg' 'pygtk' 'python2-httplib2' 'python2-pillow')
 optdepends=('dvgrab: for IEEE digital sources'
 	    'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-parabola")
+conflicts=("${_pkgname}" "${_pkgname}-libre" "${_pkgname}-parabola")
+provides=(${_pkgname}=${pkgver})
 install=openshot.install
 source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz
         nonprism.patch)
diff --git a/nonprism/openshot-libre-nonprism/nonprism.patch b/nonprism/openshot-nonprism/nonprism.patch
index 0028f7013..0028f7013 100644
--- a/nonprism/openshot-libre-nonprism/nonprism.patch
+++ b/nonprism/openshot-nonprism/nonprism.patch
diff --git a/nonprism/openshot-libre-nonprism/openshot.install b/nonprism/openshot-nonprism/openshot.install
index 046df0051..046df0051 100644
--- a/nonprism/openshot-libre-nonprism/openshot.install
+++ b/nonprism/openshot-nonprism/openshot.install