[Pkg-privacy-commits] [tor-monitor] 01/02: autogenerate manpage, simplify d/rules

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch master
in repository tor-monitor.

commit 88c32c7bc71123d44f57f3aae8d8c64b96e12e02
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Thu Aug 27 14:09:32 2015 +0000

    autogenerate manpage, simplify d/rules
---
 debian/control      |  7 +++++--
 debian/rules        | 10 +++++++---
 debian/tormonitor.1 | 25 -------------------------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index ab1c573..ebd37b8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,10 @@ Section: utils
 Priority: optional
 Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
 Uploaders: Sascha Steinbiss <sascha at steinbiss.name>
-Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, python3-distutils-extra, faketime
+Build-Depends: debhelper (>= 9), dh-python, python3-all,
+               python3-setuptools, python3-distutils-extra,
+               faketime, help2man, python3-stem, python3-gi, python3-pycountry,
+               gir1.2-gtk-3.0, gir1.2-glib-2.0
 X-Python3-Version: >= 3.4.2
 Standards-Version: 3.9.6
 Homepage: http://git-tails.immerda.ch/alan/tor-monitor
@@ -12,7 +15,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-privacy/packages/tor-monitor.git
 
 Package: tor-monitor
 Architecture: all
-Depends: ${misc:Depends}, python3, python3-stem, python3-gi, python3-pycountry, gir1.2-gtk-3.0,  gir1.2-glib-2.0
+Depends: ${misc:Depends}, python3, python3-stem, python3-gi, python3-pycountry, gir1.2-gtk-3.0, gir1.2-glib-2.0
 Description: GTK+ application to display Tor circuits and streams
  Tor-monitor is a GTK+ application to display Tor circuits and streams. It
  allows the user to inspect the circuits the locally running Tor daemon has
diff --git a/debian/rules b/debian/rules
index 918ebb7..03e63f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,14 @@ endif
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_install:
-	$(FAKETIME) python3 setup.py install --root=debian/tor-monitor --install-layout=deb --install-lib=/usr/share/tor-monitor --install-scripts=/usr/share/tor-monitor
+	$(FAKETIME) python3 setup.py install --root=debian/tor-monitor --install-layout=deb
 
-override_dh_auto_build:
+override_dh_installman:
+	help2man -S 'Tails project' -n 'display Tor circuits and streams' \
+          -N $(CURDIR)/tormonitor | sed 's/.Errno/tormonitor/g' | sed 's/.ERRNO/TORMONITOR/g '> debian/tormonitor.1
+	dh_installman
 
 override_dh_auto_clean:
+	rm -f debian/tormonitor.1
 	rm -f po/tormonitor.pot
-	rm -rf build
\ No newline at end of file
+	rm -rf build
diff --git a/debian/tormonitor.1 b/debian/tormonitor.1
deleted file mode 100644
index 7d28f50..0000000
--- a/debian/tormonitor.1
+++ /dev/null
@@ -1,25 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
-.TH TORMONITOR "1" "August 2015" "" "User Commands"
-.SH NAME
-tormonitor \- display Tor circuts and streams
-.SH DESCRIPTION
-.SS "Usage:"
-.IP
-tormonitor [OPTION...]
-.SS "Help Options:"
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show help options
-.TP
-\fB\-\-help\-all\fR
-Show all help options
-.TP
-\fB\-\-help\-gtk\fR
-Show GTK+ Options
-.TP
-\fB\-\-help\-gapplication\fR
-Show GApplication options
-.SS "Application Options:"
-.TP
-\fB\-\-display\fR=\fI\,DISPLAY\/\fR
-X display to use

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tor-monitor.git