[Pkg-voip-commits] [twinkle] 04/06: Install upstream man page

[Peter Colberg]

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

pc-guest pushed a commit to branch master
in repository twinkle.

commit af5ba15457269efbf0519ec655ed1a34e34426b9
Author: Peter Colberg <peter at colberg.org>
Date:   Sun Jun 26 18:16:48 2016 -0400

    Install upstream man page
---
 debian/control          | 1 -
 debian/rules            | 4 ----
 debian/twinkle.install  | 1 +
 debian/twinkle.manpages | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index d258f5a..1f26aeb 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: bison,
                cmake,
                debhelper (>= 9),
                flex,
-               help2man,
                libasound2-dev [linux-any],
                libccrtp-dev,
                libcommoncpp2-dev (>= 1.4.2),
diff --git a/debian/rules b/debian/rules
index dbf20e8..1ad6aad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,10 +28,6 @@ override_dh_clean:
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_FLAGS)
 
-override_dh_installman:
-	help2man debian/twinkle/usr/bin/twinkle -N -n 'Voice over Internet Protocol (VoIP) SIP Phone' -o debian/twinkle.1
-	dh_installman
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
diff --git a/debian/twinkle.install b/debian/twinkle.install
index 14ec98f..f770874 100644
--- a/debian/twinkle.install
+++ b/debian/twinkle.install
@@ -2,6 +2,7 @@ sip.protocol usr/share/services
 usr/bin/twinkle
 usr/share/applications/twinkle.desktop
 usr/share/icons/hicolor/*/apps/twinkle.*
+usr/share/man/man1/twinkle.1
 usr/share/pixmaps/twinkle.png
 usr/share/twinkle/lang/twinkle_*.qm
 usr/share/twinkle/providers.csv
diff --git a/debian/twinkle.manpages b/debian/twinkle.manpages
deleted file mode 100644
index 0e7e7b5..0000000
--- a/debian/twinkle.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/twinkle.1

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