Author: wijnen Date: 2011-07-19 10:18:11 +0000 (Tue, 19 Jul 2011) New Revision: 12536
Added: packages/trunk/gnujump/debian/patches/04_linker_arguments.patch packages/trunk/gnujump/debian/patches/05_full_build.patch packages/trunk/gnujump/debian/source/ packages/trunk/gnujump/debian/source/format Modified: packages/trunk/gnujump/debian/changelog packages/trunk/gnujump/debian/compat packages/trunk/gnujump/debian/control packages/trunk/gnujump/debian/copyright packages/trunk/gnujump/debian/gnujump-data.install packages/trunk/gnujump/debian/gnujump.desktop packages/trunk/gnujump/debian/gnujump.install packages/trunk/gnujump/debian/patches/03_main_c_include_locale_h.patch packages/trunk/gnujump/debian/patches/series packages/trunk/gnujump/debian/rules Log: Improved packaging and some minor fixes Modified: packages/trunk/gnujump/debian/changelog =================================================================== --- packages/trunk/gnujump/debian/changelog 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/changelog 2011-07-19 10:18:11 UTC (rev 12536) @@ -1,3 +1,16 @@ +gnujump (1.0.6-3) unstable; urgency=low + + * Update standards version (no changes needed). + * Use new debhelper format in debian/rules. + * Replaced quilt build-dependency with the source format. + * Link with -Wl,--as-needed to avoid extra dependencies. + * Adjust tree to build from source. + * Don't use versioned automake. + * Remove autoconf-archive dependency. (Closes: #634530) + * Upgraded packaging license to GPL-3+. + + -- Bas Wijnen <[email protected]> Tue, 19 Jul 2011 11:40:51 +0200 + gnujump (1.0.6-2) unstable; urgency=low * Upload to unstable again. Modified: packages/trunk/gnujump/debian/compat =================================================================== --- packages/trunk/gnujump/debian/compat 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/compat 2011-07-19 10:18:11 UTC (rev 12536) @@ -1 +1 @@ -5 +8 Modified: packages/trunk/gnujump/debian/control =================================================================== --- packages/trunk/gnujump/debian/control 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/control 2011-07-19 10:18:11 UTC (rev 12536) @@ -3,13 +3,12 @@ Priority: optional Maintainer: Debian Games Group <[email protected]> Uploaders: Bas Wijnen <[email protected]>, Evgeni Golov <[email protected]> -Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, libsdl-image1.2-dev, - libsdl-mixer1.2-dev, automake1.9, libtool, autoconf-archive, imagemagick, - quilt (>= 0.40) +Build-Depends: debhelper (>= 8), libsdl1.2-dev, libsdl-image1.2-dev, + libsdl-mixer1.2-dev, automake, libtool, imagemagick Homepage: http://gnujump.es.gnu.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gnujump/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gnujump/ -Standards-Version: 3.8.0 +Standards-Version: 3.9.2 Package: gnujump Architecture: any @@ -35,6 +34,7 @@ Package: gnujump-data Architecture: all Recommends: gnujump (>= ${source:Version}) +Depends: ${misc:Depends} Description: platform game where you have to jump up to survive - data files The goal in this game is to jump to the next floor so you don't fall down. As you go higher in the falling tower the floors will fall faster. Try to Modified: packages/trunk/gnujump/debian/copyright =================================================================== --- packages/trunk/gnujump/debian/copyright 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/copyright 2011-07-19 10:18:11 UTC (rev 12536) @@ -22,9 +22,9 @@ Licence: GPL-2+ Files: debian/* -Copyright: © 2006-2008 Bas Wijnen <[email protected]> +Copyright: © 2006-2011 Bas Wijnen <[email protected]> Copyright: © 2008 Evgeni Golov <[email protected]> -Licence: GPL-2+ +Licence: GPL-3+ License: GPL-2+ | GPL-3+ On Debian systems, the latest version of the GPL can be found in Modified: packages/trunk/gnujump/debian/gnujump-data.install =================================================================== --- packages/trunk/gnujump/debian/gnujump-data.install 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/gnujump-data.install 2011-07-19 10:18:11 UTC (rev 12536) @@ -1 +1 @@ -debian/tmp/usr/share/games/gnujump +/usr/share/games/gnujump Modified: packages/trunk/gnujump/debian/gnujump.desktop =================================================================== --- packages/trunk/gnujump/debian/gnujump.desktop 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/gnujump.desktop 2011-07-19 10:18:11 UTC (rev 12536) @@ -3,7 +3,7 @@ Name=GNUjump Comment=Jump up the tower to survive Exec=gnujump -Icon=gnujump +Icon=gnujump.png Terminal=false Type=Application -Categories=Game;ArcadeGame; +Categories=Game;ArcadeGame Modified: packages/trunk/gnujump/debian/gnujump.install =================================================================== --- packages/trunk/gnujump/debian/gnujump.install 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/gnujump.install 2011-07-19 10:18:11 UTC (rev 12536) @@ -1,4 +1,4 @@ -debian/tmp/usr/games/gnujump +/usr/games/gnujump debian/gnujump.xpm usr/share/pixmaps debian/gnujump.png usr/share/pixmaps debian/gnujump.desktop usr/share/applications/ Modified: packages/trunk/gnujump/debian/patches/03_main_c_include_locale_h.patch =================================================================== --- packages/trunk/gnujump/debian/patches/03_main_c_include_locale_h.patch 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/patches/03_main_c_include_locale_h.patch 2011-07-19 10:18:11 UTC (rev 12536) @@ -1,7 +1,9 @@ Inlude locale.h or we will FTBFS with -O0 ---- a/src/main.c 2008-09-23 16:17:29.000000000 +0200 -+++ b/src/main.c 2008-09-24 14:08:29.000000000 +0200 +Index: gnujump-1.0.6/src/main.c +=================================================================== +--- gnujump-1.0.6.orig/src/main.c 2011-07-19 10:13:20.314488830 +0200 ++++ gnujump-1.0.6/src/main.c 2011-07-19 10:13:35.058580030 +0200 @@ -26,6 +26,8 @@ #include "records.h" #include "replay.h" Added: packages/trunk/gnujump/debian/patches/04_linker_arguments.patch =================================================================== --- packages/trunk/gnujump/debian/patches/04_linker_arguments.patch (rev 0) +++ packages/trunk/gnujump/debian/patches/04_linker_arguments.patch 2011-07-19 10:18:11 UTC (rev 12536) @@ -0,0 +1,16 @@ +Only link used libraries, and link them as libraries, not flags. + +Index: gnujump-1.0.6/src/Makefile.am +=================================================================== +--- gnujump-1.0.6.orig/src/Makefile.am 2011-07-19 10:21:42.217593415 +0200 ++++ gnujump-1.0.6/src/Makefile.am 2011-07-19 10:21:45.345612764 +0200 +@@ -4,7 +4,8 @@ + INCLUDES= $(all_includes) + + # the library search path. +-gnujump_LDFLAGS = $(all_libraries) ++gnujump_LDFLAGS = -Wl,--as-needed ++gnujump_LDADD = $(all_libraries) + + gnujump_SOURCES = \ + game.h\ Added: packages/trunk/gnujump/debian/patches/05_full_build.patch =================================================================== --- packages/trunk/gnujump/debian/patches/05_full_build.patch (rev 0) +++ packages/trunk/gnujump/debian/patches/05_full_build.patch 2011-07-19 10:18:11 UTC (rev 12536) @@ -0,0 +1,15 @@ +Set the tree up for rebuilding from source + +--- gnujump-1.0.6.orig/Makefile.am 2011-07-19 10:17:22.447986524 +0200 ++++ gnujump-1.0.6/Makefile.am 2011-07-19 10:16:26.535640685 +0200 +@@ -4,9 +4,7 @@ + + SUBDIRS = src skins sound doc po + +-ACLOCAL_AMFLAGS = -I m4 +- +-EXTRA_DIST = config.rpath m4/ChangeLog ++EXTRA_DIST = config.rpath + + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ Modified: packages/trunk/gnujump/debian/patches/series =================================================================== --- packages/trunk/gnujump/debian/patches/series 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/patches/series 2011-07-19 10:18:11 UTC (rev 12536) @@ -1,3 +1,5 @@ 01_Makefile_am_datadir_fix.patch 02_manpage_fixes.patch 03_main_c_include_locale_h.patch +04_linker_arguments.patch +05_full_build.patch Modified: packages/trunk/gnujump/debian/rules =================================================================== --- packages/trunk/gnujump/debian/rules 2011-07-16 17:22:46 UTC (rev 12535) +++ packages/trunk/gnujump/debian/rules 2011-07-19 10:18:11 UTC (rev 12536) @@ -1,95 +1,27 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make - -export ACLOCAL=aclocal-1.9 -I /usr/share/autoconf-archive -export AUTOMAKE=automake-1.9 - AUTO_JUNK = config.guess config.sub configure depcomp INSTALL \ - install-sh ltmain.sh missing mkinstalldirs aclocal.m4 config.h.in + install-sh ltmain.sh missing mkinstalldirs aclocal.m4 config.h.in m4 -config: config-stamp -config-stamp: $(QUILT_STAMPFN) - dh_testdir - autoreconf -f -i -s - ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games \ - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -Wl,-z,defs -Wl,--as-needed" - touch $@ +%: + dh $@ -build: build-stamp -build-stamp: config - dh_testdir - $(MAKE) +override_dh_auto_configure: + autoreconf --force --install --symlink + ./configure --prefix=/usr --bindir=/usr/games --datadir=/usr/share/games/gnujump + +override_dh_auto_build: + dh_auto_build convert -transparent '#00fff6' skins/default/hero1.0.png debian/gnujump.xpm convert debian/gnujump.xpm debian/gnujump.png - touch $@ -install-foo: build - dh_testdir - dh_testroot - - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - dh_installdirs - dh_install - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp config-stamp -ifeq (Makefile,$(wildcard Makefile)) - $(MAKE) maintainer-clean -endif +override_dh_auto_clean: + test ! -e Makefile || $(MAKE) maintainer-clean + # rm -f, because if the list is empty rm is still called. + find . -name Makefile.in -print0 | xargs -0 rm -f + dh_auto_clean + test ! -e debian/gnujump.png || rm debian/gnujump.png + test ! -e debian/gnujump.xpm || rm debian/gnujump.xpm ifneq ($(wildcard ${AUTO_JUNK}),) - rm $(wildcard ${AUTO_JUNK}) + rm -r $(wildcard ${AUTO_JUNK}) endif - find . -name Makefile.in -exec rm {} \; - $(RM) debian/gnujump.png debian/gnujump.xpm - dh_clean - -install: build - dh_testdir - dh_testroot - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - dh_installdirs - dh_install - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i - # Don't install upstream ChangeLog for now, it's empty. - dh_installchangelogs -i - dh_installdocs -i - dh_installman -i - dh_installmenu -i - dh_link -i - dh_strip -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir -a - dh_testroot -a - # Don't install upstream ChangeLog for now, it's empty. - dh_installchangelogs -a - dh_installdocs -a - dh_installman -a - dh_installmenu -a - dh_link -a - dh_strip -a - 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 configure Added: packages/trunk/gnujump/debian/source/format =================================================================== --- packages/trunk/gnujump/debian/source/format (rev 0) +++ packages/trunk/gnujump/debian/source/format 2011-07-19 10:18:11 UTC (rev 12536) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
