Dependency tuning.

2 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c6d879933910..7994acf7b4ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Wed Jan 27 05:23:55 UTC 2016
 pkgbase = laditools
 	pkgdesc = Utilities to improve integration and workflow with JACK and LASH.
 	pkgver = 1.0.1
@@ -8,14 +10,14 @@ pkgbase = laditools
 	license = GPL3
 	makedepends = git
 	makedepends = python2-distutils-extra
+	depends = glade
 	depends = jack
-	depends = python2
 	depends = pygtk
-	depends = python2-yaml
-	depends = glade
+	depends = python2
 	depends = python2-enum
+	depends = python2-yaml
 	provides = laditools
-	conflicts = laditools
+	conflicts = laditools-git
 	source = http://repo.or.cz/w/laditools.git/snapshot/2b3f5356ac5a79bcb5184498e49f3d6ea3943f14.tar.gz
 	sha512sums = 3cc54e2251b244c64f9f28560cf6a03343139b1ea3e227004cd54310517ac4e4ddccae088de93fab91f934d403d084dee25c2d31b5818b4349268feafdb084b0
 
diff --git a/PKGBUILD b/PKGBUILD
index 310cfa32b35b..ca0956fb6988 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@ pkgdesc="Utilities to improve integration and workflow with JACK and LASH."
 arch=('any')
 url="https://launchpad.net/laditools"
 license=('GPL3')
-depends=('jack' 'python2' 'pygtk' 'python2-yaml' 'glade' 'python2-enum')
+depends=('glade' 'jack' 'pygtk' 'python2' 'python2-enum' 'python2-yaml')
 makedepends=('git' 'python2-distutils-extra')
-provides=('laditools')
-conflicts=('laditools')
+provides=("${pkgname%-*}")
+conflicts=("${pkgname%-*}-git")
 install=${pkgname}.install
 source=("http://repo.or.cz/w/laditools.git/snapshot/2b3f5356ac5a79bcb5184498e49f3d6ea3943f14.tar.gz")
 sha512sums=('3cc54e2251b244c64f9f28560cf6a03343139b1ea3e227004cd54310517ac4e4ddccae088de93fab91f934d403d084dee25c2d31b5818b4349268feafdb084b0')