[Pkg-voip-commits] [ring] 12/12: d/rules: remove ring -> ring.cx.

[Alexandre Viau]

This is an automated email from the git hooks/post-receive script.

aviau pushed a commit to branch master
in repository ring.

commit 418e7f5d6e013bc81a7e3ed0906bb7aa664e3f53
Author: aviau <alexandre at alexandreviau.net>
Date:   Thu Jun 30 22:56:03 2016 +0200

    d/rules: remove ring -> ring.cx.
---
 debian/changelog | 1 +
 debian/rules     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86fe019..75dbbaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ring (20160630.2.b3d131f~dfsg1-1) unstable; urgency=medium
   * d/copyright: reflect changes in msgpack.
   * Add patch to use Debian's GnuTLS.
   * Don't parallelize contrib build.
+  * d/rules: remove ring -> ring.cx.
 
  -- Alexandre Viau <aviau at debian.org>  Thu, 30 Jun 2016 19:09:51 +0200
 
diff --git a/debian/rules b/debian/rules
index 319e95a..deb9737 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,8 +148,8 @@ override_dh_auto_install:
 	##########################
 	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/ring install
 
-	# Remove ring binary: it conflicts with alliance package and isn't really needed.
-	rm $(CURDIR)/debian/ring/usr/bin/ring
+	# Remove ring binary: it is not needed for now
+	rm $(CURDIR)/debian/ring/usr/bin/ring.cx
 
 tmpdir:= $(shell mktemp -d)
 workdir:= $(shell pwd)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/ring.git