summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-02-26 00:19:51 -0300
committerDaniel Bermond2017-02-26 00:19:51 -0300
commit5f02eaf4fe843f363fa0ea82cca1d46b35af6870 (patch)
tree7b21095cd62d0c286ee67da4894a559464d922b2
parentaae7f95b0a8f9b380d765480012bea58674e3f9b (diff)
downloadaur-5f02eaf4fe843f363fa0ea82cca1d46b35af6870.tar.gz
conflicts: fixed (missing space)
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c20cd3fdc36d..f5be5e8f9e38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Feb 26 03:12:04 UTC 2017
+# Sun Feb 26 03:19:01 UTC 2017
pkgbase = pythonqt-svn
pkgdesc = A dynamic Python binding for the Qt framework (SVN version)
pkgver = 3.1.r445
- pkgrel = 1
+ pkgrel = 2
url = http://pythonqt.sourceforge.net/
arch = i686
arch = x86_64
@@ -15,7 +15,8 @@ pkgbase = pythonqt-svn
depends = qt5-svg
depends = qt5-multimedia
provides = pythonqt
- conflicts = pythonqtqt5-python27-git
+ conflicts = pythonqt
+ conflicts = qt5-python27-git
source = pythonqt-svn::svn://svn.code.sf.net/p/pythonqt/code/trunk
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bd8dbd3194df..c7626e3dcb52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=pythonqt-svn
pkgver=3.1.r445
-pkgrel=1
+pkgrel=2
pkgdesc='A dynamic Python binding for the Qt framework (SVN version)'
arch=('i686' 'x86_64')
url='http://pythonqt.sourceforge.net/'
@@ -11,7 +11,7 @@ license=('LGPL2.1')
depends=('python' 'qt5-webkit' 'qt5-svg' 'qt5-multimedia')
makedepends=('subversion' 'qt5-tools')
provides=('pythonqt')
-conflicts=('pythonqt''qt5-python27-git')
+conflicts=('pythonqt' 'qt5-python27-git')
source=("$pkgname"::'svn://svn.code.sf.net/p/pythonqt/code/trunk')
sha256sums=('SKIP')