Author: pabs Date: 2011-03-24 10:16:24 +0000 (Thu, 24 Mar 2011) New Revision: 11995
Added: packages/trunk/barrage/debian/manpages Modified: packages/trunk/barrage/debian/compat packages/trunk/barrage/debian/control packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch packages/trunk/barrage/debian/rules Log: drop already applied parts of the Ubuntu patch Modified: packages/trunk/barrage/debian/compat =================================================================== --- packages/trunk/barrage/debian/compat 2011-03-24 10:11:20 UTC (rev 11994) +++ packages/trunk/barrage/debian/compat 2011-03-24 10:16:24 UTC (rev 11995) @@ -1 +1 @@ -5 +7 Modified: packages/trunk/barrage/debian/control =================================================================== --- packages/trunk/barrage/debian/control 2011-03-24 10:11:20 UTC (rev 11994) +++ packages/trunk/barrage/debian/control 2011-03-24 10:16:24 UTC (rev 11995) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Barry deFreese <[email protected]>, Gonéri Le Bouder <[email protected]> -Build-Depends: debhelper (>= 5.0.0), +Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev, autotools-dev Added: packages/trunk/barrage/debian/manpages =================================================================== --- packages/trunk/barrage/debian/manpages (rev 0) +++ packages/trunk/barrage/debian/manpages 2011-03-24 10:16:24 UTC (rev 11995) @@ -0,0 +1 @@ +debian/barrage.6 Modified: packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch =================================================================== --- packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch 2011-03-24 10:11:20 UTC (rev 11994) +++ packages/trunk/barrage/debian/patches/fix-FTBFS-with-GCC-4.5.patch 2011-03-24 10:16:24 UTC (rev 11995) @@ -1,22 +1,11 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -14,7 +14,7 @@ barrage_SOURCES = \ +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -185,7 +185,7 @@ SFont.c barrage_LDFLAGS = -barrage_LDADD = @audio_lib@ +barrage_LDADD = @audio_lib@ -lm - EXTRA_DIST = \ defs.h particle.h shots.h units.h\ ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -82,7 +82,7 @@ barrage_SOURCES = main.c particle.c - - - barrage_LDFLAGS = --barrage_LDADD = @audio_lib@ -+barrage_LDADD = @audio_lib@ -lm - - EXTRA_DIST = defs.h particle.h shots.h units.h data.h bfield.h menu.h SFont.h chart.h - + data.h bfield.h menu.h SFont.h chart.h Modified: packages/trunk/barrage/debian/rules =================================================================== --- packages/trunk/barrage/debian/rules 2011-03-24 10:11:20 UTC (rev 11994) +++ packages/trunk/barrage/debian/rules 2011-03-24 10:16:24 UTC (rev 11995) @@ -1,75 +1,13 @@ #!/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) +%: + dh $@ --with autotools_dev -CFLAGS = -Wall -g +override_dh_auto_configure: + dh_auto_configure -- --bindir=\$${prefix}/games -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -config.status: configure - dh_testdir - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games - - -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 -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 - - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) install DESTDIR=$(CURDIR)/debian/barrage +override_dh_auto_install: + dh_auto_install mkdir -p $(CURDIR)/debian/barrage/usr/share/pixmaps/ cp debian/barrage.xpm $(CURDIR)/debian/barrage/usr/share/pixmaps/ echo "Icon=barrage" >> $(CURDIR)/debian/barrage/usr/share/applications/barrage.desktop - - -binary-indep: build install -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_installman debian/barrage.6 - dh_installmenu - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
