r12394 - packages/trunk/yabause/debian

[Evgeni Golov]

Author: evgeni
Date: 2011-05-17 08:00:59 +0000 (Tue, 17 May 2011)
New Revision: 12394

Modified:
   packages/trunk/yabause/debian/changelog
   packages/trunk/yabause/debian/rules
Log:
Switch to dh7 "tiny" rules

Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2011-05-17 06:20:48 UTC (rev 12393)
+++ packages/trunk/yabause/debian/changelog	2011-05-17 08:00:59 UTC (rev 12394)
@@ -1,3 +1,9 @@
+yabause (0.9.10-3) UNRELEASED; urgency=low
+
+  * Switch to dh7 "tiny" rules.
+
+ -- Evgeni Golov <evgeni at debian.org>  Tue, 17 May 2011 09:59:58 +0200
+
 yabause (0.9.10-2) unstable; urgency=low
 
   * debian/control:

Modified: packages/trunk/yabause/debian/rules
===================================================================
--- packages/trunk/yabause/debian/rules	2011-05-17 06:20:48 UTC (rev 12393)
+++ packages/trunk/yabause/debian/rules	2011-05-17 08:00:59 UTC (rev 12394)
@@ -1,76 +1,33 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+FLAVOURS=gtk qt
 
-# 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)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-	CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-	CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+export LDFLAGS
 
-configure-flags=$(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
+%:
+	dh $@ --with autoreconf
 
-config-common:
-	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
-	dh_autoreconf
-	touch $@
+override_dh_auto_configure: $(foreach f,$(FLAVOURS),$(patsubst %,dh_auto_configure_%,$(f)))
 
-build-%/config-stamp: config-common
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && \
-		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \
-		$(CURDIR)/configure $(configure-flags) --with-port=$* \
-		--program-suffix=-$*
+dh_auto_configure_%:
+	dh_auto_configure --builddirectory=build-$* -- --with-port=$* --program-suffix=-$*
 	touch $@
 
-build-%-stamp: build-%/config-stamp
-	dh_testdir
-	$(MAKE) -C build-$*
+override_dh_auto_build: $(foreach f,$(FLAVOURS),$(patsubst %,dh_auto_build_%,$(f)))
+
+dh_auto_build_%:
+	dh_auto_build --builddirectory=build-$*
 	touch $@
 
-build: build-gtk-stamp build-qt-stamp
+override_dh_auto_install: $(foreach f,$(FLAVOURS),$(patsubst %,dh_auto_install_%,$(f)))
 
-clean:
-	dh_testdir
-	dh_testroot
+dh_auto_install_%:
+	dh_auto_install --builddirectory=build-$*
+	touch $@
 
+override_dh_auto_clean:
 	$(RM) -r build-gtk build-qt
-
-	dh_autoreconf_clean
-	dh_clean config-common config.sub config.guess
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) -C build-gtk install DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) -C build-qt install DESTDIR=$(CURDIR)/debian/tmp
-
-	dh_install
-
-# Build architecture-independent files here.
-binary-indep: install
-	dh binary-indep
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh binary-arch
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+	$(RM) -r dh_auto_configure_* dh_auto_build_* dh_auto_install_*
+	dh_auto_clean