The following commit has been merged in the master branch:
commit 776be28ad461a589f12857906442bc4788621014
Author: Bruno Kleinert <[email protected]>
Date: Fri Jun 3 12:33:08 2011 +0200
Switch to debhelper 8
Rework debian/rules file
Build-depend on debhelper (>= 8)
diff --git a/debian/changelog b/debian/changelog
index f315f02..1633b3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+scorched3d (43.2a.dfsg-3) unstable; urgency=low
+
+ * Team upload
+ * Switch to debhelper 8
+ * Rewrite debian/rules
+ * Build-depend on debhelper (>= 8)
+
+ -- Bruno "Fuddl" Kleinert <[email protected]> Fri, 03 Jun 2011 12:32:31 +0200
+
scorched3d (43.2a.dfsg-2) unstable; urgency=low
* Don't mess with users' PATH environment variable in
diff --git a/debian/control b/debian/control
index 181b4f6..1973f49 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders: Reinhard Tartler <[email protected]>,
Build-Depends: binutils,
automake,
autoconf,
- debhelper (>= 7),
+ debhelper (>= 8),
libsdl1.2-dev,
libsdl-net1.2-dev,
libopenal-dev,
diff --git a/debian/rules b/debian/rules
index c06410c..130e081 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@
# 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)
@@ -36,40 +34,28 @@ else
CFLAGS += -O2
endif
-config.status:
- dh_testdir
+%:
+ dh $@
+
+override_dh_auto_configure:
# Upstream ships non-DFSG icons, so we replace them
mkdir -p data/avatars
cp -r debian/avatars data
sh ./autogen.sh $(confflags)
-build: build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
+override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f src/client/scorchedc/Makefile.am \
+ rm -f src/client/scorchedc/Makefile.am \
src/launcher/scorched/Makefile.am \
src/server/scorcheds/Makefile.am
rm -f data/fonts/test.ttf
rm -f config.log config.status
rm -rf data/avatars debian/avatars-svg/*.png
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_auto_install:
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- # Both fonts are in ttf-dejavu-core. Remove them here and create
symlinks
- # later on by debian/scorched3d-data
+ # Both fonts are in ttf-dejavu-core. Remove them here and create
+ # symlinks later on by debian/scorched3d-data
rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusans.ttf
rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
mkdir -p debian/tmp/usr/share/bug/scorched3d
@@ -80,47 +66,141 @@ install: build
cp debian/scorched3d.desktop debian/tmp/usr/share/applications/
mkdir -p debian/tmp/usr/share/pixmaps
cp debian/scorched3d.xpm debian/tmp/usr/share/pixmaps/
- rm -f \
-
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/authors.txt \
+ rm -f
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/authors.txt \
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/license.txt \
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/readme-nexus.txt \
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/readme.txt \
debian/tmp/usr/share/games/scorched3d/data/shaders/water.license
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs -i
- dh_installdocs -i
- dh_install --source=debian/tmp -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+override_dh_auto_binary-indep:
+ dh_install --source=debian/tmp
+
+override_dh_auto_installman:
+ dh_installman debian/scorched3d.6 \
+ debian/scorched3dc.6 \
+ debian/scorched3ds.6
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_installchangelogs -a --exclude=CHANGELOG
- dh_installdocs -a
+override_dh_auto_binary-arch:
dh_install --source=debian/tmp -a
- dh_installmenu -a
- dh_installman debian/scorched3d.6 debian/scorched3dc.6
debian/scorched3ds.6 -a
- dh_icons -a
- dh_link -a
- dh_strip -a --dbg-package=scorched3d-dbg
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ dh_strip --dbg-package=scorched3d-dbg
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+## 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)
+#
+## 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
+#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+# NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+# MAKEFLAGS += -j$(NUMJOBS)
+#endif
+#
+#confflags += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+#confflags += --prefix=/usr --bindir=\$${prefix}/games
+#confflags += --datadir=\$${prefix}/share/games/scorched3d
+#confflags += --with-docdir=/usr/share/doc/scorched3d
+#confflags += --mandir=\$${prefix}/share/man
+#confflags += --infodir=\$${prefix}/share/info
+#
+#CFLAGS = -Wall -g
+#
+#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+#$(info Disable all optimisations)
+# CFLAGS += -O0
+#else
+# CFLAGS += -O2
+#endif
+#
+#config.status:
+# dh_testdir
+# # Upstream ships non-DFSG icons, so we replace them
+# mkdir -p data/avatars
+# cp -r debian/avatars data
+# sh ./autogen.sh $(confflags)
+#
+#build: build-stamp
+#build-stamp: config.status
+# dh_testdir
+# $(MAKE)
+# touch build-stamp
+#
+#clean:
+# dh_testdir
+# dh_testroot
+# rm -f build-stamp
+# [ ! -f Makefile ] || $(MAKE) distclean
+# rm -f src/client/scorchedc/Makefile.am \
+# src/launcher/scorched/Makefile.am \
+# src/server/scorcheds/Makefile.am
+# rm -f data/fonts/test.ttf
+# rm -f config.log config.status
+# rm -rf data/avatars debian/avatars-svg/*.png
+# dh_clean
+#
+#install: build
+# dh_testdir
+# dh_testroot
+# dh_prep
+# dh_installdirs
+# $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+# # Both fonts are in ttf-dejavu-core. Remove them here and create
symlinks
+# # later on by debian/scorched3d-data
+# rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusans.ttf
+# rm debian/tmp/usr/share/games/scorched3d/data/fonts/dejavusmobd.ttf
+# mkdir -p debian/tmp/usr/share/bug/scorched3d
+# cp debian/presubj debian/tmp/usr/share/bug/scorched3d/
+# mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
+# cp debian/scorched3d.png debian/tmp/usr/share/icons/hicolor/48x48/apps/
+# mkdir -p debian/tmp/usr/share/applications
+# cp debian/scorched3d.desktop debian/tmp/usr/share/applications/
+# mkdir -p debian/tmp/usr/share/pixmaps
+# cp debian/scorched3d.xpm debian/tmp/usr/share/pixmaps/
+# rm -f \
+#
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/authors.txt \
+#
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/license.txt \
+#
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/readme-nexus.txt \
+#
debian/tmp/usr/share/games/scorched3d/data/globalmods/apoc/readme.txt \
+# debian/tmp/usr/share/games/scorched3d/data/shaders/water.license
+#
+#binary-indep: build install
+# dh_testdir -i
+# dh_testroot -i
+# dh_installchangelogs -i
+# dh_installdocs -i
+# dh_install --source=debian/tmp -i
+# dh_link -i
+# dh_strip -i
+# dh_compress -i
+# dh_fixperms -i
+# dh_installdeb -i
+# dh_shlibdeps -i
+# dh_gencontrol -i
+# dh_md5sums -i
+# dh_builddeb -i
+#
+#binary-arch: build install
+# dh_testdir -a
+# dh_testroot -a
+# dh_installchangelogs -a --exclude=CHANGELOG
+# dh_installdocs -a
+# dh_install --source=debian/tmp -a
+# dh_installmenu -a
+# dh_installman debian/scorched3d.6 debian/scorched3dc.6
debian/scorched3ds.6 -a
+# dh_icons -a
+# dh_link -a
+# dh_strip -a --dbg-package=scorched3d-dbg
+# dh_compress -a
+# dh_fixperms -a
+# dh_installdeb -a
+# dh_shlibdeps -a
+# dh_gencontrol -a
+# dh_md5sums -a
+# dh_builddeb -a
+#
+#binary: binary-indep binary-arch
+#.PHONY: build clean binary-indep binary-arch binary install
--
Packaging for scorched3d
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
