[Pkg-opt-media-team] [SCM] dvdisaster packaging branch, master, updated. debian/0.79.2-1-19-g1af1a99

[TANIGUCHI Takaki]

The following commit has been merged in the master branch:
commit cc2d9f8e3ab28cc068fb29e55944ab7e753b8457
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue Mar 6 11:37:22 2012 +0900

    debian/rules: Rewrite in dh7 style

diff --git a/debian/dvdisaster.install b/debian/dvdisaster.install
index 99e201c..a79b820 100644
--- a/debian/dvdisaster.install
+++ b/debian/dvdisaster.install
@@ -1,3 +1,3 @@
-/usr/bin
-/usr/share/locale
-/usr/share/man
+usr/bin
+usr/share/locale
+usr/share/man
diff --git a/debian/rules b/debian/rules
index fb6eda2..ffbf953 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,46 +1,21 @@
 #!/usr/bin/make -f
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+%:
+	dh $@
 
-	[ ! -f configure.log ] || $(MAKE) distclean
+#override_dh_autoclean:
+#	dh_autoclean
+#	find documentation -name "*.png" | xargs rm -f
 
-	find documentation -name "*.png" | xargs rm -f
 
-	dh_clean
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	./configure \
-		--prefix=/usr \
-		--bindir=\$${prefix}/bin \
-		--docdir=\$${prefix}share/doc \
-		--docsubdir=dvdisaster-doc/html \
+override_dh_auto_configure:
+	dh_auto_configure -- \
 		--localedir=\$${prefix}/share/locale \
-		--mandir=\$${prefix}/share/man
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
+		--docdir=\$${prefix}share/doc \
+		--docsubdir=dvdisaster-doc/html 
 
-	$(MAKE) \
-		BUILDROOT=$(CURDIR)/debian/tmp \
-		install
+override_dh_auto_install:
+	dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp 
 
 	# Installing desktop file
 	install -D -m 0644 contrib/dvdisaster.desktop debian/dvdisaster/usr/share/applications/dvdisaster.desktop
@@ -57,36 +32,3 @@ install: build
 	rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/CHANGELOG
 	rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/COPYING
 
-binary: binary-arch binary-indep
-
-binary-arch: install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a CHANGELOG
-	dh_installdocs -a
-	dh_installexamples
-	dh_install -a --sourcedir=debian/tmp
-	dh_installmenu -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary-indep: install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i CHANGELOG
-	dh_installdocs -i
-	dh_install -i --sourcedir=debian/tmp
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-.PHONY: clean build install binary binary-arch binary-indep

-- 
dvdisaster packaging