Author: vlegout Date: 2011-12-04 09:21:06 +0000 (Sun, 04 Dec 2011) New Revision: 12919
Added: packages/trunk/gnome-breakout/debian/gnome-breakout.install packages/trunk/gnome-breakout/debian/gnome-breakout.manpages Modified: packages/trunk/gnome-breakout/debian/changelog packages/trunk/gnome-breakout/debian/compat packages/trunk/gnome-breakout/debian/control packages/trunk/gnome-breakout/debian/dirs packages/trunk/gnome-breakout/debian/rules Log: Rewrite debian/rules using dh Modified: packages/trunk/gnome-breakout/debian/changelog =================================================================== --- packages/trunk/gnome-breakout/debian/changelog 2011-12-03 16:32:34 UTC (rev 12918) +++ packages/trunk/gnome-breakout/debian/changelog 2011-12-04 09:21:06 UTC (rev 12919) @@ -1,3 +1,17 @@ +gnome-breakout (0.5.3-3) UNRELEASED; urgency=low + + * Bump debhelper compatibility level to 9, thus enabling hardened build + flags + * debian/rules: Use dh + - Enable pie and bindnow options. gnome-breakout does not build with + -Wformat-security, so disable format. + - Call autoreconf with dh_autoreconf, add dh_autoreconf in Build-Depends + - Use --with autotools-dev to update config.guess and config.sub + - Add debian/gnome-breakout.manpages and debian/gnome-breakout.install + * Drop unneeded build dependencies on quilt, autoconf and automake1.9 + + -- Vincent Legout <vleg...@debian.org> Sun, 04 Dec 2011 10:02:19 +0100 + gnome-breakout (0.5.3-2) unstable; urgency=low [ Barry deFreese ] Modified: packages/trunk/gnome-breakout/debian/compat =================================================================== --- packages/trunk/gnome-breakout/debian/compat 2011-12-03 16:32:34 UTC (rev 12918) +++ packages/trunk/gnome-breakout/debian/compat 2011-12-04 09:21:06 UTC (rev 12919) @@ -1 +1 @@ -5 +9 Modified: packages/trunk/gnome-breakout/debian/control =================================================================== --- packages/trunk/gnome-breakout/debian/control 2011-12-03 16:32:34 UTC (rev 12918) +++ packages/trunk/gnome-breakout/debian/control 2011-12-04 09:21:06 UTC (rev 12919) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Barry deFreese <bddeb...@comcast.net>, Vincent Legout <vinc...@legout.info> -Build-Depends: debhelper (>= 5), libgnomeui-dev, autotools-dev, quilt, libglib2.0-dev, autoconf, automake1.9 +Build-Depends: debhelper (>= 8.9.11), libgnomeui-dev, libglib2.0-dev, autotools-dev, dh-autoreconf Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gnome-breakout/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gnome-breakout/?op=log Modified: packages/trunk/gnome-breakout/debian/dirs =================================================================== --- packages/trunk/gnome-breakout/debian/dirs 2011-12-03 16:32:34 UTC (rev 12918) +++ packages/trunk/gnome-breakout/debian/dirs 2011-12-04 09:21:06 UTC (rev 12919) @@ -1 +1,2 @@ usr/share/applications +usr/share/pixmaps Added: packages/trunk/gnome-breakout/debian/gnome-breakout.install =================================================================== --- packages/trunk/gnome-breakout/debian/gnome-breakout.install (rev 0) +++ packages/trunk/gnome-breakout/debian/gnome-breakout.install 2011-12-04 09:21:06 UTC (rev 12919) @@ -0,0 +1 @@ +debian/gnome-breakout.xpm /usr/share/pixmaps Added: packages/trunk/gnome-breakout/debian/gnome-breakout.manpages =================================================================== --- packages/trunk/gnome-breakout/debian/gnome-breakout.manpages (rev 0) +++ packages/trunk/gnome-breakout/debian/gnome-breakout.manpages 2011-12-04 09:21:06 UTC (rev 12919) @@ -0,0 +1 @@ +debian/gnome-breakout.6 Modified: packages/trunk/gnome-breakout/debian/rules =================================================================== --- packages/trunk/gnome-breakout/debian/rules 2011-12-03 16:32:34 UTC (rev 12918) +++ packages/trunk/gnome-breakout/debian/rules 2011-12-04 09:21:06 UTC (rev 12919) @@ -1,73 +1,25 @@ #!/usr/bin/make -f -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +export DEB_BUILD_MAINT_OPTIONS := hardening=-format,+pie,+bindnow -CFLAGS = -Wall -g +%: + dh $@ --with autoreconf --with autotools-dev -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif - - autoreconf -f -i - ./configure --prefix=/usr \ +override_dh_auto_configure: + dh_auto_configure -- \ + --prefix=/usr \ --bindir=\$${prefix}/games \ - --datadir=\$${prefix}/share/games \ - --localedir=\$${prefix}/share/locale \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --localstatedir=\$${prefix}/../var/lib/ \ - --enable-compile-warnings=minimum \ - CFLAGS="$(CFLAGS)" + --datadir=\$${prefix}/share/games - touch configure-stamp +override_dh_auto_install: + dh_auto_install -build: configure-stamp build-stamp -build-stamp: - dh_testdir - - $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - - [ ! -f Makefile ] || $(MAKE) distclean - rm -f build-stamp configure-stamp - rm -f config.sub config.guess - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install prefix=$(CURDIR)/debian/gnome-breakout/usr localstatedir=$(CURDIR)/debian/gnome-breakout/var/lib - - install -D -m 644 debian/gnome-breakout.xpm debian/gnome-breakout/usr/share/pixmaps/gnome-breakout.xpm - # don't include this file in the package, postinst will take care of it rm -rf debian/gnome-breakout/var # install puts desktop file in incorect location - mv debian/gnome-breakout/usr/share/games/gnome/apps/Games/gnome-breakout.desktop debian/gnome-breakout/usr/share/applications + mv debian/gnome-breakout/usr/share/games/gnome/apps/Games/gnome-breakout.desktop \ + debian/gnome-breakout/usr/share/applications rm -rf debian/gnome-breakout/usr/share/games/gnome # install puts gnome-breakout.png in incorrect location @@ -75,33 +27,7 @@ debian/gnome-breakout/usr/share/pixmaps/ rm -rf debian/gnome-breakout/usr/share/games/pixmaps -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installdocs -a - dh_installexamples -a - dh_installmenu -a - dh_installman -a debian/gnome-breakout.6 - dh_installinfo -a - dh_installchangelogs -a ChangeLog - dh_link -a - dh_strip -a - dh_compress -a - dh_fixperms -a - +override_dh_fixperms: + dh_fixperms chgrp games debian/gnome-breakout/usr/games/gnome-breakout chmod 2755 debian/gnome-breakout/usr/games/gnome-breakout - - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums - - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
