summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dewender2015-10-06 19:16:12 +0200
committerJohannes Dewender2015-10-06 19:16:12 +0200
commitb4193e9f97591da6772c827a8ebf2b1556814f04 (patch)
tree74c2828224ebaf72783c097ee8d62e93d9940cc5
parentf096bf488b7605d2d3d3f8a3678e9cbf6895f2a7 (diff)
downloadaur-b4193e9f97591da6772c827a8ebf2b1556814f04.tar.gz
add cnijfilter-common conflict
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d57b2a53cb13..9de52590ce90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = cnijfilter-mx920series
depends = popt
optdepends = gtk2: Canon maintenance GUI support
provides = cnijfilter-common=3.90
+ conflicts = cnijfilter-common
source = http://gdlp01.c-wss.com/gds/0/0100005170/01/cnijfilter-mx920series-3.90-1-deb.tar.gz
md5sums = 76e30668391521abf749c21d8a46f5fe
diff --git a/PKGBUILD b/PKGBUILD
index 898fae2af456..ba450325127b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ license=('custom')
depends=('popt')
optdepends=('gtk2: Canon maintenance GUI support')
provides=("cnijfilter-common=$pkgver")
+conflicts=("cnijfilter-common")
source=(http://gdlp01.c-wss.com/gds/0/0100005170/01/cnijfilter-mx920series-$pkgver-1-deb.tar.gz)
md5sums=('76e30668391521abf749c21d8a46f5fe')