[Pkg-cgit-commits] [pkg-cgit] 12/18: Revise debian/rules

[Peter Colberg]

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

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

commit 4f4bf0f869e0e2a6ffefda8762f67b6d33a00463
Author: Peter Colberg <peter at colberg.org>
Date:   Fri Jun 10 10:29:27 2016 -0400

    Revise debian/rules
---
 debian/cgit.manpages |  1 -
 debian/rules         | 19 +++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/debian/cgit.manpages b/debian/cgit.manpages
deleted file mode 100644
index c28066c..0000000
--- a/debian/cgit.manpages
+++ /dev/null
@@ -1 +0,0 @@
-cgitrc.5
diff --git a/debian/rules b/debian/rules
index 35785ea..c32bde1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,32 +12,23 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall
 # package maintainers to append LDFLAGS
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-
-b := $(shell pwd)/debian/cgit/
-
-# main packaging script based on dh7 syntax
 %:
 	dh $@ --with apache2 
 
 override_dh_auto_clean:
-	dh_auto_clean
-	make cleanall
-	-rm tests/test-results/*.counts
-	-rm -rf .depend
-	-rm cgitrc.5 
+	dh_auto_clean -- cleanall
+	rm -rf .depend tests/test-results
 
 override_dh_auto_build:
 	dh_auto_build -- V=1
-	a2x -f manpage cgitrc.5.txt
 
 override_dh_auto_install:
-	dh_auto_install
-	mv $b/usr/share/cgit/cgit.cgi $b/usr/lib/cgit
+	dh_auto_install -- install-man
+	mv debian/cgit/usr/share/cgit/cgit.cgi debian/cgit/usr/lib/cgit
 
 override_dh_auto_test:
-	chmod +x tests/*.sh
 	dh_auto_test -- V=1
 
 override_dh_fixperms:
 	dh_fixperms
-	chown www-data:www-data $b/var/cache/cgit
+	chown www-data:www-data debian/cgit/var/cache/cgit

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