Rename packages

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c2a19eaa02e..14e7f62fbffe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Dec 11 20:45:38 UTC 2016
+# Sun Dec 11 21:02:14 UTC 2016
 pkgbase = tsmuxer-ng-bin
 	pkgdesc = Transport Stream muxer. New Generation (3D capable)
 	pkgver = 2.6.11
@@ -17,25 +17,18 @@ pkgbase = tsmuxer-ng-bin
 	sha256sums = aed84b10da52849c14acb6bfb8b806c9675e4c8bcf781590712bbedc332b443f
 	sha256sums = 5d1a6b9e88a82d40a0159d95bb596a7dc4502d7164364098e4cc3ddef72632c0
 
-pkgname = tsmuxer-cli-ng-bin
+pkgname = tsmuxer-ng-cli-bin
 	pkgdesc = Transport Stream muxer. New Generation (3D capable). CLI
 	provides = tsmuxer-cli
-	provides = tsmuxer-cli-bin
+	provides = tsmuxer-ng-cli
 	conflicts = tsmuxer
 	conflicts = tsmuxer-cli
+	conflicts = tsmuxer-cli-ng
+	conflicts = tsmuxer-ng-cli
 	depends_i686 = gcc-libs
 	depends_i686 = freetype2
 	depends_x86_64 = lib32-gcc-libs
 	depends_x86_64 = lib32-freetype2
 
-pkgname = tsmuxer-gui-ng-bin
-	pkgdesc = Transport Stream muxer. New Generation (3D capable). GUI
-	provides = tsmuxer-gui-bin
-	provides = tsmuxer-gui
-	conflicts = tsmuxer
-	conflicts = tsmuxer-gui
-	depends_i686 = gcc-libs
-	depends_i686 = qt4
-	depends_x86_64 = lib32-gcc-libs
-	depends_x86_64 = lib32-qt4
+pkgname = tsmuxer-ng-gui-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index cc50df249862..248730a551cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgbase=tsmuxer-ng-bin
-pkgname=('tsmuxer-cli-ng-bin'
-         'tsmuxer-gui-ng-bin'
+pkgname=('tsmuxer-ng-cli-bin'
+         'tsmuxer-ng-gui-bin'
          )
 pkgver=2.6.11
 pkgrel=1
@@ -21,7 +21,7 @@ sha256sums=('815a383aebc67e59b6e541b927ce14480efed9d103fe99e74ced9ea381f61764'
             )
 options=('!strip')
 
-package_tsmuxer-cli-ng-bin() {
+package_tsmuxer-ng-cli-bin() {
   pkgdesc="Transport Stream muxer. New Generation (3D capable). CLI"
   depends_i686=('gcc-libs'
                 'freetype2'
@@ -30,10 +30,12 @@ package_tsmuxer-cli-ng-bin() {
                   'lib32-freetype2'
                   )
   provides=('tsmuxer-cli'
-            'tsmuxer-cli-bin'
+            'tsmuxer-ng-cli'
             )
   conflicts=('tsmuxer'
              'tsmuxer-cli'
+             'tsmuxer-cli-ng'
+             'tsmuxer-ng-cli'
              )
 
   install -Dm755 tsMuxeR "${pkgdir}/usr/bin/tsmuxer"
@@ -48,11 +50,13 @@ package_tsmuxer-gui-ng-bin() {
   depends_x86_64=('lib32-gcc-libs'
                   'lib32-qt4'
                   )
-  provides=('tsmuxer-gui-bin' 
-            'tsmuxer-gui'
+  provides=('tsmuxer-gui'
+            'tsmuxer-ng-gui'
             )
-  conflicts=('tsmuxer' 
+  conflicts=('tsmuxer'
              'tsmuxer-gui'
+             'tsmuxer-gui-ng'
+             'tsmuxer-ng-gui'
              )
 
   install -Dm755 tsMuxerGUI "${pkgdir}/usr/bin/tsmuxergui"