The following commit has been merged in the master branch:
commit 20ef6994cf3eecccfdbdd78b86820494b9e1e087
Author: Peter Pentchev <[email protected]>
Date: Sun Dec 5 23:42:26 2010 +0200
Shorten the rules file using the dh(1) helper.
diff --git a/debian/changelog b/debian/changelog
index 7cc767e..4c475c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,8 @@ matanza (0.13+ds1-2) UNRELEASED; urgency=low
* Use dpkg-buildflags from dpkg-dev 1.15.7 to obtain CPPFLAGS, CFLAGS
and LDFLAGS.
* Bump the debhelper compatibility version to 7:
- - use dh_prep instead of dh_clean -k
- dh_clean removes build-stamp now
+ - shorten the rules file using the dh(1) helper
-- Peter Pentchev <[email protected]> Sun, 24 Oct 2010 18:56:37 +0300
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..59c90f5
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+ai.c
+matanza.c
+config.guess
+config.sub
diff --git a/debian/rules b/debian/rules
index 42d3292..cb98c9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,46 +14,25 @@ export CFLAGS CPPFLAGS LDFLAGS
build: build-stamp
build-stamp:
- dh_testdir
+ dh build --before auto_configure
cp -f /usr/share/misc/config.sub .
cp -f /usr/share/misc/config.guess .
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --bindir=/usr/games
- $(MAKE) CFLAGS="$(CFLAGS)"
+ dh_auto_configure -- --bindir=/usr/games
+ dh build --before auto_build
+ dh_auto_build -- CFLAGS="$(CFLAGS)"
+ dh build --remaining
touch build-stamp
clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f matanza.c ai.c config.sub config.guess
- rm -f *.o
- dh_clean
+ dh $@
install: build
- dh_testdir
- dh_testroot
- dh_prep
- $(MAKE) install DESTDIR=$(CURDIR)/debian/matanza
+ dh $@
binary: binary-indep binary-arch
binary-indep: install
binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh $@
.PHONY: build clean install binary binary-arch binary-indep
--
matanza - a space ascii war game
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
