This is an automated email from the git hooks/post-receive script. bbk-guest pushed a commit to branch master in repository trigger-rally.
commit 741b68bf8bb9a2a86e4f8fc79304807ea9c9d748 Author: Bertrand Marc <[email protected]> Date: Thu Oct 22 16:24:12 2015 +0000 Move to debhelper v9, to reduce debian/rules and enable hardening: + update debian/compat. + build-depend on debhelper (>=9), autotools-dev and dh-exec. + remove debian/dirs. + remove debian/patches/30_autotools.patch. + update debian/rules to dh style. + add debian/trigger-rally.install. --- debian/changelog | 8 +++- debian/compat | 2 +- debian/control | 4 +- debian/dirs | 2 - debian/patches/30_autotools.patch | 31 --------------- debian/patches/series | 1 - debian/rules | 82 +++++---------------------------------- debian/trigger-rally.install | 3 ++ 8 files changed, 23 insertions(+), 110 deletions(-) diff --git a/debian/changelog b/debian/changelog index 90fc2f4..641b639 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,6 @@ trigger-rally (0.6.2-1) UNRELEASED; urgency=medium * New upstream release. * Update watchfile, thanks to Tobias Frost (Closes: #789268). * Add myself as uploader. - * debian/rules: replace depreciated dh_clean -k with dh_prep. * Use new icons (Closes: #789272): + remove debian/trigger-rally*.xpm. + stop copying these xpm in debian/rules. @@ -16,6 +15,13 @@ trigger-rally (0.6.2-1) UNRELEASED; urgency=medium + point trigger-rally.desktop to /usr/share/pixmaps/trigger-rally-icons.svg. + remove debian/menu. * Standards-version 3.9.6. + * Move to debhelper v9, to reduce debian/rules and enable hardening: + + update debian/compat. + + build-depend on debhelper (>=9), autotools-dev and dh-exec. + + remove debian/dirs. + + remove debian/patches/30_autotools.patch. + + update debian/rules to dh style. + + add debian/trigger-rally.install. -- Bertrand Marc <[email protected]> Sun, 18 Oct 2015 12:08:57 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index 935622a..f2559be 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,9 @@ Source: trigger-rally Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Build-Depends: debhelper (>= 5.0.0), +Build-Depends: debhelper (>= 9), + dh-exec, + autotools-dev, jam, libopenal-dev, libalut-dev, diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 3bc245a..0000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/games -usr/share/applications diff --git a/debian/patches/30_autotools.patch b/debian/patches/30_autotools.patch deleted file mode 100644 index 47f792b..0000000 --- a/debian/patches/30_autotools.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Update autotools files not update by autogen.sh - This patch updates the autotools files (config.sub/config.guess) - shipped in mk/autoconf. - . - Author: Stefan Potyra <[email protected]> - -Index: trigger-rally-0.6.0/autogen.sh -=================================================================== ---- trigger-rally-0.6.0.orig/autogen.sh 2014-01-23 21:48:28.000000000 +0100 -+++ trigger-rally-0.6.0/autogen.sh 2014-01-23 21:52:30.675851846 +0100 -@@ -24,3 +24,20 @@ - autoheader - - autoconf -+ -+# copy file $1 to directory $2 -+copy_file() { -+ if [ ! -r "$1" ]; then -+ echo "$1 not readable/presenkt." -+ else -+ if [ ! -d "$2" ]; then -+ echo "$2: no directory." -+ else -+ echo "$1 --> $2" -+ cp "$1" "$2" -+ fi -+ fi -+} -+ -+copy_file /usr/share/misc/config.sub mk/autoconf -+copy_file /usr/share/misc/config.guess mk/autoconf diff --git a/debian/patches/series b/debian/patches/series index f89ea7d..b1fbcc5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 10_system_glew.patch 20_system_tinyxml.patch -30_autotools.patch diff --git a/debian/rules b/debian/rules index ffed3a8..24d650d 100755 --- a/debian/rules +++ b/debian/rules @@ -4,31 +4,19 @@ # 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) - # location of datafiles DATADIR=/usr/share/games/trigger-rally -# name of package -PACKAGE=trigger-rally # what manpages to build? MANPAGES=debian/trigger-rally.6 -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +%: + dh $@ --with autotools-dev # rule to build manpages $(MANPAGES): $(addsuffix .sgml,$(MANPAGES)) docbook-to-man $< > $@ -configure: configure.ac +override_dh_auto_configure: # make sure that the shipped glew is not used during build $(RM) -r src/glew # same goes for tinyxml @@ -39,69 +27,17 @@ configure: configure.ac $(RM) src/pengine/tinyxmlerror.cpp $(RM) src/pengine/tinystr.h ./autogen.sh + dh_auto_configure -- --datadir=$(DATADIR) -config.status: configure - dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" \ - ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --datadir=$(DATADIR) - - -build: build-arch build-indep - -build-stamp: config.status - dh_testdir +override_dh_auto_build: jam - touch build-stamp -clean:: - dh_testdir - dh_testroot - rm -f build-stamp +override_dh_installman: $(MANPAGES) + dh_installman $(MANPAGES) +override_dh_auto_clean: if [ -f Jamconfig ]; then jam distclean; fi $(RM) $(MANPAGES) - $(RM) configure mk/autoconf/sdl.m4 aclocal.m4 Jamconfig.in - dh_clean - -install: build $(MANPAGES) - dh_testdir - dh_testroot - dh_prep - dh_installdirs - # yay, we do it by hand :) - cp trigger debian/$(PACKAGE)/usr/games/trigger-rally - -# no indep package -binary-indep: - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - # manually install desktop file - cp debian/trigger-rally.desktop debian/$(PACKAGE)/usr/share/applications/trigger-rally.desktop - dh_installmenu - dh_installman $(MANPAGES) - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + dh_auto_clean -build-arch: build-stamp -# no indep package -build-indep: -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install build-arch \ - build-indep diff --git a/debian/trigger-rally.install b/debian/trigger-rally.install new file mode 100755 index 0000000..a7d81b2 --- /dev/null +++ b/debian/trigger-rally.install @@ -0,0 +1,3 @@ +#! /usr/bin/dh-exec +debian/trigger-rally.desktop /usr/share/applications +trigger => /usr/games/trigger-rally -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
