summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWojciech Ochmański2018-06-07 13:29:51 +0200
committerWojciech Ochmański2018-06-07 13:29:51 +0200
commit4863232b749c8ca0df85fd17a77745627a5a80bf (patch)
tree19d05e0ac7e22531776a968ece6db7ce1bce0ba0
parentc487e7fd24a4e8bb7e112b092570b0bb34df7535 (diff)
downloadaur-4863232b749c8ca0df85fd17a77745627a5a80bf.tar.gz
update conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 241c7e07db3f..7316c1e7b4c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Jun 7 11:15:05 UTC 2018
+# Thu Jun 7 11:29:30 UTC 2018
pkgbase = cloud-print-connector-git
pkgdesc = Share printers from your Windows, Linux, FreeBSD or OS X computer with ChromeOS and Android devices, using the Cloud Print Connector
pkgver = v1.16.r1.ga780351
@@ -19,7 +19,7 @@ pkgbase = cloud-print-connector-git
depends = net-snmp
optdepends = gcp-cups-connector-systemd
provides = cloud-print-connector
- conflicts = cloud-print-connector
+ conflicts = gcp-cups-connector
replaces = gcp-cups-connector
source = git+https://github.com/google/cloud-print-connector.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ef11eca76137..5228ba2c7f6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ depends=('cups' 'net-snmp')
makedepends=('go' 'net-snmp' 'avahi' 'git' 'bzr')
optdepends=('gcp-cups-connector-systemd')
provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+conflicts=('gcp-cups-connector')
replaces=('gcp-cups-connector')
source=('git+https://github.com/google/cloud-print-connector.git')
md5sums=('SKIP')