diff --git a/debian/changelog b/debian/changelog index 6fef1b7..2ee0d66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ * Switch to dpkg-source v3 * Wrap and sort fields in various files * Sync desktop file to the menu file + * Switch to debhelper compat 9 and dh rules.tiny -- Jon Dowland Wed, 08 Sep 2010 21:18:32 +0100 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index de8edae..93af27e 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Sam Hocevar , Marco Rodrigues , Barry deFreese -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 9) Build-Depends-Indep: autotools-dev, libsdl-perl Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/pangzero/ diff --git a/debian/rules b/debian/rules index ae33dd5..7f478e0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,86 +1,3 @@ #!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# 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) - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -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 \ - --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \ - CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - -build: build-stamp - -build-stamp: config.status - dh_testdir - $(MAKE) - #docbook-to-man debian/pangzero.sgml > pangzero.1 - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) distclean - -rm -f config.sub config.guess config.log config.status - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/pangzero install - dh_installdirs usr/share/pixmaps - dh_install debian/pangzero.xpm usr/share/pixmaps - dh_installdirs usr/share/applications - dh_install debian/pangzero.desktop usr/share/applications - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples -# dh_install - dh_installmenu - dh_installinfo - dh_installman debian/pangzero.6 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_perl - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. -binary-arch: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --parallel