[SCM] MediaTomb packaging branch, master, updated. debian/0.12.0.svn2018-3-12-gbbd5165

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1a185ba75b85deeb8a06cd63d45b8396c3be7966
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Aug 5 23:13:47 2009 -0400

    Update packaging to take advantage of new features in debhelper 7.

diff --git a/debian/mediatomb-common.override b/debian/mediatomb-common.lintian-overrides
similarity index 100%
rename from debian/mediatomb-common.override
rename to debian/mediatomb-common.lintian-overrides
diff --git a/debian/mediatomb-common.manpages b/debian/mediatomb-common.manpages
new file mode 100644
index 0000000..0bafb4a
--- /dev/null
+++ b/debian/mediatomb-common.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/mediatomb.1
diff --git a/debian/mediatomb.install b/debian/mediatomb.install
index 7f6c806..d5a5227 100644
--- a/debian/mediatomb.install
+++ b/debian/mediatomb.install
@@ -1,3 +1,2 @@
-artwork/mediatomb.xpm usr/share/pixmaps
-debian/mediatomb.desktop usr/share/applications
-debian/mediatomb.override usr/share/lintian/overrides
+usr/share/pixmaps/mediatomb.xpm
+usr/share/applications/mediatomb.desktop
diff --git a/debian/mediatomb.links b/debian/mediatomb.links
new file mode 100644
index 0000000..4166aa8
--- /dev/null
+++ b/debian/mediatomb.links
@@ -0,0 +1 @@
+/usr/share/mediatomb/web/icons/mt-icon120.png usr/share/pixmaps/mediatomb.png
diff --git a/debian/mediatomb.override b/debian/mediatomb.lintian-overrides
similarity index 100%
rename from debian/mediatomb.override
rename to debian/mediatomb.lintian-overrides
diff --git a/debian/rules b/debian/rules
index c243038..a6591a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,99 +76,36 @@ MEDIATOMB_CONFIG_OPTIONS ?= $(confflags) \
 
 $(info DEB_BUILD_OPTIONS = $(DEB_BUILD_OPTIONS))
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
+%:
+	dh --with quilt $@
 
-configure: patch configure-stamp
-configure-stamp:
-	dh_testdir
+override_dh_auto_configure:
 	chmod a+x configure configure_aux/*
 	./configure $(MEDIATOMB_CONFIG_OPTIONS)
-	touch configure-stamp
 
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) clean distclean
-	dh_clean
-	[ ! -f build-stamp ] || rm build-stamp
-	[ ! -f configure-stamp ] || rm configure-stamp
-
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	[ ! -f patch-stamp ] || rm patch-stamp
-	[ ! -d .pc ] || rm -rf .pc
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+override_dh_auto_install:
+	dh_auto_install
 	install -m 0755 -d $(CURDIR)/debian/tmp/var/lib/mediatomb
 	install -D -m 0644 debian/config.xml.dist \
 		$(CURDIR)/debian/tmp/etc/mediatomb/config.xml
+	install -D -m 0644 artwork/mediatomb.xpm \
+		$(CURDIR)/debian/tmp/usr/share/pixmaps/mediatomb.xpm
+	install -D -m 0644 debian/mediatomb.desktop \
+		$(CURDIR)/debian/tmp/usr/share/applications/mediatomb.desktop
+
+override_dh_install:
+	dh_install --sourcedir=debian/tmp
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install -pmediatomb-daemon --sourcedir=debian/tmp
-	dh_install -pmediatomb
-	mv debian/mediatomb/usr/share/lintian/overrides/mediatomb.override \
-		debian/mediatomb/usr/share/lintian/overrides/mediatomb
-	dh_installchangelogs -i ChangeLog
-	dh_installdocs -i
-	dh_installinit -i --name=mediatomb \
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog
+
+override_dh_installinit:
+	dh_installinit --name=mediatomb \
 		--update-rcd-params='defaults 98 02'
-	dh_installlogrotate -i --name=mediatomb
-	dh_link -pmediatomb /usr/share/mediatomb/web/icons/mt-icon120.png \
-		usr/share/pixmaps/mediatomb.png
-	dh_installmenu -i
-	dh_desktop -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install -a --sourcedir=debian/tmp
-	install -D -m 0644 debian/mediatomb-common.override \
-		$(CURDIR)/debian/mediatomb-common/usr/share/lintian/overrides/mediatomb-common
-	dh_installchangelogs -a ChangeLog
-	dh_installdocs -a
-	dh_installman -pmediatomb-common debian/tmp/usr/share/man/man1/mediatomb.1
-	dh_installexamples -a
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	dh_strip -a
-endif
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+override_dh_installlogrotate:
+	dh_installlogrotate --name=mediatomb
 
 get-orig-source:
 # Use external script
 	$(dir $_)mediatomb-get-orig-source
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install

-- 
MediaTomb packaging