This is an automated email from the git hooks/post-receive script. roam-guest pushed a commit to branch master in repository fenix.
commit 470aae93bba1d8e7463d290b0b08d21aa53926e7 Author: Peter Pentchev <[email protected]> Date: Thu Nov 25 22:31:14 2010 +0000 Shorten the rules file using the dh(1) helper. --- debian/changelog | 2 +- debian/rules | 65 +++++++++++++++++++------------------------------------- 2 files changed, 23 insertions(+), 44 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88a8d30..bddad3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,7 @@ fenix (0.92a.dfsg1-6) UNRELEASED; urgency=low * Fix some spelling mistakes in both the upstream source and some of the Debian packaging files. * Bump the debhelper compatibility level to 7: - - use dh_prep instead of dh_clean -k + - shorten the rules file using the dh(1) helper -- Peter Pentchev <[email protected]> Thu, 25 Nov 2010 13:25:18 +0200 diff --git a/debian/rules b/debian/rules index a906fe0..74adf42 100755 --- a/debian/rules +++ b/debian/rules @@ -5,8 +5,6 @@ # 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 -fno-strict-aliasing @@ -18,8 +16,9 @@ endif CFLAGS += -DUSE_GETTEXT -config.status: configure - dh_testdir +build: build-stamp +build-stamp: configure + dh build --before auto_configure ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -27,41 +26,30 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif chmod +x configure - ./configure \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ + dh_auto_configure -- \ --enable-fxc \ --enable-fxi \ --enable-map \ --enable-fpg \ --enable-dependency-tracking \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ CFLAGS="$(CFLAGS)" \ LDFLAGS="-Wl,-z,defs" - -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) CFLAGS="$(CFLAGS)" + dh build --before auto_build + dh_auto_build -- CFLAGS="$(CFLAGS)" $(MAKE) -C debian/i18n + dh build --remaining touch $@ clean: - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) distclean + dh clean --before auto_clean + dh_auto_clean $(MAKE) -C debian/i18n clean rm -f config.sub config.guess - dh_clean + dh clean --remaining install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + dh $@ --before auto_install + dh_auto_install cd $(CURDIR)/debian/tmp/usr/bin/ && \ for f in *; do \ mv "$$f" "fenix-$$f" ; \ @@ -69,31 +57,22 @@ install: build $(MAKE) -C debian/i18n install INSTALLPREFIX=$(CURDIR)/debian/tmp/usr/share/locale/ cp debian/fenix.sh $(CURDIR)/debian/tmp/usr/bin/fenix chmod +x $(CURDIR)/debian/tmp/usr/bin/fenix + dh_install + cd $(CURDIR)/debian/fenix-dev && patch -p1 < $(CURDIR)/debian/patches/headers.patch + dh_installdocs --exclude=license.txt --exclude=authors.txt + dh_installchangelogs NEWS + dh $@ --before compress + for i in debian/fenix/usr/share/doc/fenix/*.txt; do gzip $$i; done + dh_compress + dh $@ --remaining # Build architecture-independent files here. binary-indep: build install + dh $@ # Build architecture-dependent files here. binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs NEWS - dh_installdocs --exclude=license.txt --exclude=authors.txt - dh_installexamples - dh_install -pfenix --sourcedir=$(CURDIR)/debian/tmp - dh_install -pfenix-dev - cd $(CURDIR)/debian/fenix-dev && patch -p1 < $(CURDIR)/debian/patches/headers.patch - dh_installman - dh_link - dh_strip - for i in debian/fenix/usr/share/doc/fenix/*.txt; do gzip $$i; done - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh $@ get-orig-source: dh_testdir -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/fenix.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
