[PATCH] Switch to short-form dh

[Alessandro Ghedini]

---
 debian/control              |    2 +-
 debian/docs                 |    1 +
 debian/milkytracker.desktop |    2 +-
 debian/milkytracker.install |    3 ++
 debian/rules                |   73 +++++-------------------------------------
 5 files changed, 15 insertions(+), 66 deletions(-)
 create mode 100644 debian/milkytracker.install

diff --git a/debian/control b/debian/control
index 13d3d97..6c1bb1f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Gürkan Sengün <gurkan at phys.ethz.ch>,
  Alessandro Ghedini <al3xbio at gmail.com>
-Build-Depends: debhelper (>= 7), 
+Build-Depends: debhelper (>= 7.0.50~), 
  autotools-dev,
  libsdl1.2-dev,
  libjack-dev,
diff --git a/debian/docs b/debian/docs
index 0cd58f2..c8feffa 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,4 @@
 docs/MilkyTracker.html
 docs/FAQ.html
 docs/readme_unix
+docs/ChangeLog.html
diff --git a/debian/milkytracker.desktop b/debian/milkytracker.desktop
index bdf1b8f..917f81d 100644
--- a/debian/milkytracker.desktop
+++ b/debian/milkytracker.desktop
@@ -6,7 +6,7 @@ Terminal=false
 TryExec=milkytracker
 Exec=milkytracker %f
 Type=Application
-Icon=milkytracker.png
+Icon=/usr/share/pixmaps/milkytracker/carton.png
 Categories=GNOME;AudioVideo;Audio;Video;
 MimeType=audio/x-xm
 X-Desktop-File-Install-Version=0.10
diff --git a/debian/milkytracker.install b/debian/milkytracker.install
new file mode 100644
index 0000000..17b75fe
--- /dev/null
+++ b/debian/milkytracker.install
@@ -0,0 +1,3 @@
+debian/milkytracker.desktop 		usr/share/applications
+resources/pictures/carton.png		usr/share/pixmaps/milkytracker
+debian/milkyplay/milkyplay			usr/bin
diff --git a/debian/rules b/debian/rules
index 0bdb142..ae7d3dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,75 +1,20 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_OPTIONS
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@
 
-config.status: configure
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -lzzip"
+override_dh_auto_configure:
+	dh_auto_configure -- LDFLAGS="-Wl,-z,defs -lzzip"
 
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	$(MAKE) -C debian/milkyplay
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+override_dh_clean:
 	$(MAKE) -C debian/milkyplay clean
-	rm -f config.sub config.guess
 	dh_clean
 	rm -rf src/compression/zziplib/generic/.deps/
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	$(MAKE) -C debian/milkyplay DESTDIR=$(CURDIR)/debian/milkytracker install
-	$(MAKE) DESTDIR=$(CURDIR)/debian/milkytracker install
-	dh_install resources/pictures/carton.png usr/share/icons/
-	mv $(CURDIR)/debian/milkytracker/usr/share/icons/carton.png $(CURDIR)/debian/milkytracker/usr/share/icons/milkytracker.png
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs docs/ChangeLog.html
-	dh_installdocs
-	dh_installmenu
-	dh_install debian/*.desktop usr/share/applications/
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C debian/milkyplay
 
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 DEB_DFSG_VERSION=$(DEB_UPSTREAM_VERSION)+dfsg
-- 
1.7.2.3


--TB36FDmn/VVEgNH/--