Author: roam-guest
Date: 2011-04-11 11:04:51 +0000 (Mon, 11 Apr 2011)
New Revision: 12101
Added:
packages/trunk/netrek-client-cow/debian/clean
packages/trunk/netrek-client-cow/debian/manpages
Modified:
packages/trunk/netrek-client-cow/debian/changelog
packages/trunk/netrek-client-cow/debian/rules
Log:
Shorten the rules file using debhelper's dh(1) tool.
Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================
--- packages/trunk/netrek-client-cow/debian/changelog 2011-04-11 11:04:25 UTC
(rev 12100)
+++ packages/trunk/netrek-client-cow/debian/changelog 2011-04-11 11:04:51 UTC
(rev 12101)
@@ -22,6 +22,7 @@
* Let the build system honor CPPFLAGS, CFLAGS and LDFLAGS
- export them in the rules file
- add the 004-honor-flags patch
+ * Shorten the rules file using debhelper's dh(1) tool.
-- Peter Pentchev <[email protected]> Fri, 08 Apr 2011 16:06:48 +0300
Added: packages/trunk/netrek-client-cow/debian/clean
===================================================================
--- packages/trunk/netrek-client-cow/debian/clean
(rev 0)
+++ packages/trunk/netrek-client-cow/debian/clean 2011-04-11 11:04:51 UTC
(rev 12101)
@@ -0,0 +1,2 @@
+config.sub
+config.guess
Added: packages/trunk/netrek-client-cow/debian/manpages
===================================================================
--- packages/trunk/netrek-client-cow/debian/manpages
(rev 0)
+++ packages/trunk/netrek-client-cow/debian/manpages 2011-04-11 11:04:51 UTC
(rev 12101)
@@ -0,0 +1 @@
+debian/netrek-client-cow.6
Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules 2011-04-11 11:04:25 UTC
(rev 12100)
+++ packages/trunk/netrek-client-cow/debian/rules 2011-04-11 11:04:51 UTC
(rev 12101)
@@ -4,22 +4,14 @@
# 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)
-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
export CPPFLAGS CFLAGS LDFLAGS
-config.status: configure
- dh_testdir
+build: build-stamp
+
+build-stamp:
+ dh build --before auto_configure
# Add here commands to configure the package.
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -27,46 +19,21 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- ./configure $(CROSS) --prefix=/usr \
+ dh_auto_configure -- \
--bindir=\$${prefix}/games \
- --datadir=\$${prefix}/share/games \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
+ --datadir=\$${prefix}/share/games
+ dh build --before dh_auto_test
+ dh build --after dh_auto_test
touch $@
clean:
- dh_testdir
- dh_testroot
+ dh $@
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
-
- dh_clean
-
install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into
debian/netrek-client-cow.
- $(MAKE) DESTDIR=$(CURDIR)/debian/netrek-client-cow prefix=/usr install
-
- #Remove executable on key file.
+ dh $@ --before auto_install
+ dh_auto_install -- prefix=/usr
chmod -x
$(CURDIR)/debian/netrek-client-cow/usr/share/games/netrek-client-cow/key.cow.linux
+ dh $@ --remaining
# Build architecture-independent files here.
binary-indep: build install
@@ -74,23 +41,7 @@
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installmenu
- dh_installman debian/netrek-client-cow.6
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh $@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
