Author: roam-guest
Date: 2011-02-17 09:56:34 +0000 (Thu, 17 Feb 2011)
New Revision: 11766
Added:
packages/trunk/tecnoballz/debian/clean
packages/trunk/tecnoballz/debian/patches/031_honor_cxxflags.diff
packages/trunk/tecnoballz/debian/tecnoballz.manpages
Modified:
packages/trunk/tecnoballz/debian/changelog
packages/trunk/tecnoballz/debian/patches/series
packages/trunk/tecnoballz/debian/rules
Log:
Shorten the rules file by using dh(1) and add a patch to honor CXXFLAGS.
Modified: packages/trunk/tecnoballz/debian/changelog
===================================================================
--- packages/trunk/tecnoballz/debian/changelog 2011-02-17 09:08:09 UTC (rev 11765)
+++ packages/trunk/tecnoballz/debian/changelog 2011-02-17 09:56:34 UTC (rev 11766)
@@ -6,8 +6,10 @@
* Add misc:Depends to the binary packages.
* Bump the debhelper compatibility level to 7:
- let dh_clean remove the *-stamp files
- - use dh_prep instead of dh_clean -k
- dh_installchangelogs picks up the CHANGES file now
+ - break the clean-up list and the manpages list into debian/* files
+ - shorten the rules file by using the dh(1) helper
+ * Add the 031_honor_cxxflags patch.
-- Peter Pentchev <roam at ringlet.net> Thu, 17 Feb 2011 10:35:58 +0200
Added: packages/trunk/tecnoballz/debian/clean
===================================================================
--- packages/trunk/tecnoballz/debian/clean (rev 0)
+++ packages/trunk/tecnoballz/debian/clean 2011-02-17 09:56:34 UTC (rev 11766)
@@ -0,0 +1,10 @@
+config.status config.log
+config.sub config.guess
+configure
+aclocal.m4
+INSTALL
+autotools/config.sub
+autotools/config.guess
+autotools/depcomp
+autotools/install-sh
+src/.deps
Added: packages/trunk/tecnoballz/debian/patches/031_honor_cxxflags.diff
===================================================================
--- packages/trunk/tecnoballz/debian/patches/031_honor_cxxflags.diff (rev 0)
+++ packages/trunk/tecnoballz/debian/patches/031_honor_cxxflags.diff 2011-02-17 09:56:34 UTC (rev 11766)
@@ -0,0 +1,16 @@
+Description: Honor the user-supplied CXXFLAGS.
+Forwarded: no
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2011-02-17
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,7 @@
+
+ dnl Default flags
+ #CXXFLAGS="-g -O3 -Wall"
+-CXXFLAGS=" -O3 -Wall"
++#CXXFLAGS=" -O3 -Wall"
+
+ dnl Check for X
+ AC_PATH_X
Modified: packages/trunk/tecnoballz/debian/patches/series
===================================================================
--- packages/trunk/tecnoballz/debian/patches/series 2011-02-17 09:08:09 UTC (rev 11765)
+++ packages/trunk/tecnoballz/debian/patches/series 2011-02-17 09:56:34 UTC (rev 11766)
@@ -2,3 +2,4 @@
011_gcc-4.3-fixes.diff
020_level_data.diff
030_texts_dir.diff
+031_honor_cxxflags.diff
Modified: packages/trunk/tecnoballz/debian/rules
===================================================================
--- packages/trunk/tecnoballz/debian/rules 2011-02-17 09:08:09 UTC (rev 11765)
+++ packages/trunk/tecnoballz/debian/rules 2011-02-17 09:56:34 UTC (rev 11766)
@@ -3,16 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
# Optimisation flag if needed
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -O0
@@ -23,86 +13,35 @@
# Warnings
CXXFLAGS = -g -Wall
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- printf "\n\n*** Configuring the package ***\n\n"
+export CXXFLAGS
- autoreconf -fvi
-
- CXXFLAGS="$(CXXFLAGS)" ./configure $(confflags) --prefix=/usr --datadir=/usr/share/games
- touch configure-stamp
-
build: build-stamp
-build-stamp: configure-stamp
- printf "\n*** Building the package ***\n"
- dh_testdir
- $(MAKE) CXXFLAGS="$(CXXFLAGS)"
+build-stamp:
+ dh build --before auto_configure
+ autoreconf -fvi
+ dh_auto_configure -- --datadir=/usr/share/games
+ dh build --remaining
touch build-stamp
clean:
- printf "\n*** Cleaning the package ***\n"
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.status config.log
- rm -f config.sub config.guess
- rm -f configure
- rm -f aclocal.m4
- rm -f INSTALL
- rm -f autotools/config.sub
- rm -f autotools/config.guess
- rm -f autotools/depcomp
- rm -f autotools/install-sh
+ dh $@ --before dh_clean
find ./ -name Makefile.in -delete
- rm -rf src/.deps
- dh_clean
+ dh $@ --remaining
install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- # building the main package
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+ dh $@ --until auto_install
# The data package
mv $(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi \
$(CURDIR)/debian/tmp/var/games/tecnoballz/tecnoballz.hi.clean
+ dh $@ --remaining
# Build architecture-independent files here.
binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install -i --list-missing
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+ dh $@
# Build architecture-dependent files here.
binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install -s --list-missing
- dh_installchangelogs -s
- dh_installdocs -s
- dh_installmenu -s
- dh_installman -s man/*.6
- dh_link -s
- dh_strip -s
- dh_compress -s
- dh_fixperms -s
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
+ dh $@
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Added: packages/trunk/tecnoballz/debian/tecnoballz.manpages
===================================================================
--- packages/trunk/tecnoballz/debian/tecnoballz.manpages (rev 0)
+++ packages/trunk/tecnoballz/debian/tecnoballz.manpages 2011-02-17 09:56:34 UTC (rev 11766)
@@ -0,0 +1,2 @@
+man/tecnoballz.6
+man/tecnoballz.fr.6