summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime Gauduin2017-05-05 00:29:37 +0200
committerMaxime Gauduin2017-05-05 00:29:37 +0200
commitefc3fda15ba8990b0c63bcd67924cef5ae514fda (patch)
treea5b29573f112c2b631a27549024f1c60b4281d09
parentcba381bebc0b379d4da3f7b773cfe2a8a25718a6 (diff)
downloadaur-efc3fda15ba8990b0c63bcd67924cef5ae514fda.tar.gz
Fix replaces
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e0b6c68c1245..a0a555486d3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon May 1 20:35:36 UTC 2017
+# Thu May 4 22:29:37 UTC 2017
pkgbase = switchboard-plug-network-git
pkgdesc = Network plug for Switchboard
pkgver = r582.16f3beb
@@ -23,7 +23,8 @@ pkgbase = switchboard-plug-network-git
depends = libgranite.so
depends = libswitchboard-2.0.so
provides = switchboard-plug-network
- conflicts = switchboard-plug-network-bzr
+ conflicts = switchboard-plug-network
+ replaces = switchboard-plug-network-bzr
source = switchboard-plug-network::git+https://github.com/elementary/switchboard-plug-networking.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5db5a17c751e..e1037b521223 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ depends=('glib2' 'glibc' 'gtk3' 'libgee' 'libnm-glib' 'nm-connection-editor'
makedepends=('cmake' 'git' 'granite-git' 'switchboard-git' 'vala')
provides=('switchboard-plug-network')
conflicts=('switchboard-plug-network')
-conflicts=('switchboard-plug-network-bzr')
+replaces=('switchboard-plug-network-bzr')
source=('switchboard-plug-network::git+https://github.com/elementary/switchboard-plug-networking.git')
sha256sums=('SKIP')