[Pkg-voip-commits] [ring] 02/03: Remove ring binary: it conflicts with alliance package and isn't really needed

[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 5a97d315d89673bac3d7c9e404d2075e3b807728
Author: aviau <alexandre at alexandreviau.net>
Date:   Sat Apr 23 21:32:23 2016 -0400

    Remove ring binary: it conflicts with alliance package and isn't really needed
---
 debian/changelog  | 6 ++++++
 debian/ring.links | 1 -
 debian/rules      | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ccbf3df..8d26ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ring (20160422.1.3c07c8e~dfsg1-2) unstable; urgency=medium
+
+  * Removed ring binary (conflicts with alliance package)
+
+ -- Alexandre Viau <aviau at debian.org>  Sat, 23 Apr 2016 21:31:24 -0400
+
 ring (20160422.1.3c07c8e~dfsg1-1) unstable; urgency=medium
 
   * Initial release. (Closes: #816707)
diff --git a/debian/ring.links b/debian/ring.links
deleted file mode 100644
index 4becbd4..0000000
--- a/debian/ring.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/man/man8/gnome-ring.8.gz usr/share/man/man8/ring.8.gz
diff --git a/debian/rules b/debian/rules
index 6e490d5..7cd0414 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,6 +147,9 @@ 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
+
 tmpdir:= $(shell mktemp -d)
 workdir:= $(shell pwd)
 PKD := $(abspath $(dir $(MAKEFILE_LIST)))

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