summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Jonglez2016-04-24 23:18:43 +0200
committerBaptiste Jonglez2016-04-24 23:18:43 +0200
commit6cd4877790bd9ff10b70186f103b5be75484ded0 (patch)
tree148f1dad464b9e1e55102b939711f2eb9c214830
parentbdc3de9dba0ad818df4fe6d05e0f3d5702d3767e (diff)
downloadaur-6cd4877790bd9ff10b70186f103b5be75484ded0.tar.gz
ring: -git packages don't provide the non-git package anymore
This was confusing, as it allowed to mix -git and non-git Ring packages (which almost certainly won't work, since the APIs evolve quite often).
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 3 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f385e8d262be..6c3b57aba105 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Apr 15 21:35:51 UTC 2016
+# Sun Apr 24 21:18:51 UTC 2016
pkgbase = ring-daemon-git
pkgdesc = A secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user (formerly known as SFLphone)
- pkgver = 20160415
+ pkgver = 20160422
pkgrel = 1
url = http://ring.cx
arch = i686
@@ -31,7 +31,6 @@ pkgbase = ring-daemon-git
depends = opus
depends = libupnp
depends = libsrtp
- provides = ring-daemon
conflicts = ring-daemon
source = git+https://gerrit-ring.savoirfairelinux.com/ring-daemon
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7c9d8f7721a3..a80d853d6a6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
pkgname=ring-daemon-git
-pkgver=20160415
+pkgver=20160422
pkgrel=1
pkgdesc="A secure and distributed voice, video and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user (formerly known as SFLphone)"
arch=("i686" "x86_64")
@@ -11,7 +11,6 @@ depends=('opendht-git' 'yaml-cpp' 'alsa-lib' 'libpulse' 'jack' 'jsoncpp'
'libsamplerate' 'libsndfile' 'dbus-c++' 'ffmpeg' 'udev' 'gnutls'
'expat' 'gsm' 'speex' 'speexdsp' 'opus' 'libupnp' 'libsrtp')
makedepends=('git' 'boost' 'msgpack-c')
-provides=('ring-daemon')
conflicts=('ring-daemon')
source=("git+https://gerrit-ring.savoirfairelinux.com/ring-daemon")
md5sums=('SKIP')