[Debconf-video-commits] r457 - package/trunk/debian

[Ben Hutchings]

Author: benh
Date: 2009-07-13 01:53:51 +0000 (Mon, 13 Jul 2009)
New Revision: 457

Modified:
   package/trunk/debian/rules
Log:
Use dh_installdirs and dh_install as far as possible


Modified: package/trunk/debian/rules
===================================================================
--- package/trunk/debian/rules	2009-07-13 01:34:42 UTC (rev 456)
+++ package/trunk/debian/rules	2009-07-13 01:53:51 UTC (rev 457)
@@ -14,23 +14,31 @@
 	dh_testroot
 	dh_clean -k
 	# debconf-video-common: common configuration file
-	mkdir -p -m 755 debian/debconf-video-common/etc/default
-	install -m 664 -g video conf/default debian/debconf-video-common/etc/default/debconf-video
-	mkdir -p debian/debconf-video-common/usr/share/doc/debconf-video-common/
-	cp -a conf debian/debconf-video-common/usr/share/doc/debconf-video-common/
+	dh_installdirs -pdebconf-video-common \
+	    etc/default usr/share/doc/debconf-video-common
+	install -m 664 -g video \
+	    conf/default debian/debconf-video-common/etc/default/debconf-video
+	dh_install -pdebconf-video-common \
+	    conf usr/share/doc/debconf-video-common/
 	# debconf-video-switch: scripts for the switch machines
-	mkdir -p -m 755 debian/debconf-video-switch/usr/bin
-	install src/dc-record-stream src/dc-start-sink src/dc-start-source debian/debconf-video-switch/usr/bin/
+	dh_installdirs -pdebconf-video-switch usr/bin
+	dh_install -pdebconf-video-switch --sourcedir=src \
+	    dc-record-stream dc-start-sink dc-start-source usr/bin/
 	# debconf-video-encode: meta-packge only
 	mkdir -p -m 755 debian/debconf-video-encode
 	# debconf-video-store: scripts for the storage server
-	mkdir -p -m 755 debian/debconf-video-store/usr/bin debian/debconf-video-store/usr/share/debconf-video-store debian/debconf-video-store/usr/share/debconf-video-store/debconfvideo
-	install src/dc-import-recordings src/dc-do-transcoding src/dc-publish debian/debconf-video-store/usr/bin/
-	install -m 644 src/shellconfig.py debian/debconf-video-store/usr/share/debconf-video-store/
-	install -m 644 src/debconfvideo/*.py debian/debconf-video-store/usr/share/debconf-video-store/debconfvideo/
+	dh_installdirs -pdebconf-video-store \
+	    usr/bin usr/share/debconf-video-store/debconfvideo
+	dh_install -pdebconf-video-store --sourcedir=src \
+	    dc-import-recordings dc-do-transcoding dc-publish usr/bin/
+	dh_install -pdebconf-video-store --sourcedir=src \
+	    shellconfig.py usr/share/debconf-video-store/
+	dh_install -pdebconf-video-store --sourcedir=src/debconfvideo \
+	    '*.py' usr/share/debconf-video-store/debconfvideo/
 	# debconf-video-capture: scripts for the capture machines
-	mkdir -p -m 755 debian/debconf-video-capture/usr/bin
-	install src/dc-tally-light debian/debconf-video-capture/usr/bin/
+	dh_installdirs -pdebconf-video-capture usr/bin
+	dh_install -pdebconf-video-capture --sourcedir=src \
+	    dc-tally-light usr/bin/
 
 binary-indep: install
 	dh_testdir -i