Author: pabs Date: 2011-04-01 13:21:49 +0000 (Fri, 01 Apr 2011) New Revision: 12069
Added: packages/trunk/openyahtzee/debian/manpages Modified: packages/trunk/openyahtzee/debian/changelog packages/trunk/openyahtzee/debian/compat packages/trunk/openyahtzee/debian/control packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch packages/trunk/openyahtzee/debian/rules Log: Switch to debhelper 7 & dh Modified: packages/trunk/openyahtzee/debian/changelog =================================================================== --- packages/trunk/openyahtzee/debian/changelog 2011-04-01 13:02:45 UTC (rev 12068) +++ packages/trunk/openyahtzee/debian/changelog 2011-04-01 13:21:49 UTC (rev 12069) @@ -14,6 +14,7 @@ * Switch to dpkg-source v3 * Add a patch to fix FTBFS with new GCC (Closes: #565080) * Update copyright information + * Switch to debhelper 7 & dh -- Barry deFreese <[email protected]> Tue, 04 Nov 2008 12:03:57 -0500 Modified: packages/trunk/openyahtzee/debian/compat =================================================================== --- packages/trunk/openyahtzee/debian/compat 2011-04-01 13:02:45 UTC (rev 12068) +++ packages/trunk/openyahtzee/debian/compat 2011-04-01 13:21:49 UTC (rev 12069) @@ -1 +1 @@ -5 +7 Modified: packages/trunk/openyahtzee/debian/control =================================================================== --- packages/trunk/openyahtzee/debian/control 2011-04-01 13:02:45 UTC (rev 12068) +++ packages/trunk/openyahtzee/debian/control 2011-04-01 13:21:49 UTC (rev 12069) @@ -3,7 +3,8 @@ Priority: extra Maintainer: Debian Games Team <[email protected]> Uploaders: Barry deFreese <[email protected]> -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 7.0.50~), + dh-autoreconf, autotools-dev, libsqlite3-dev, libwxgtk2.8-dev, Added: packages/trunk/openyahtzee/debian/manpages =================================================================== --- packages/trunk/openyahtzee/debian/manpages (rev 0) +++ packages/trunk/openyahtzee/debian/manpages 2011-04-01 13:21:49 UTC (rev 12069) @@ -0,0 +1 @@ +debian/openyahtzee.6 Modified: packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch =================================================================== --- packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch 2011-04-01 13:02:45 UTC (rev 12068) +++ packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch 2011-04-01 13:21:49 UTC (rev 12069) @@ -29,23 +29,3 @@ AM_CXXFLAGS = @WX_CXXFLAGS@ -openyahtzee_LDFLAGS = @WX_LIBS@ +openyahtzee_LDADD = @WX_LIBS@ -ldl ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -54,7 +54,7 @@ - openyahtzee_OBJECTS = $(am_openyahtzee_OBJECTS) - openyahtzee_LDADD = $(LDADD) - openyahtzee_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -- $(openyahtzee_LDFLAGS) $(LDFLAGS) -o $@ -+ $(openyahtzee_LDADD) $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -211,7 +211,7 @@ - openyahtzee.rc - - AM_CXXFLAGS = @WX_CXXFLAGS@ --openyahtzee_LDFLAGS = @WX_LIBS@ -+openyahtzee_LDADD = @WX_LIBS@ -ldl - all: all-am - - .SUFFIXES: Modified: packages/trunk/openyahtzee/debian/rules =================================================================== --- packages/trunk/openyahtzee/debian/rules 2011-04-01 13:02:45 UTC (rev 12068) +++ packages/trunk/openyahtzee/debian/rules 2011-04-01 13:21:49 UTC (rev 12069) @@ -1,99 +1,9 @@ #!/usr/bin/make -f -# -*- makefile -*- -# debian/rules for openyahtzee -# Modified by Zak B. Elep <[email protected]> -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +%: + dh $@ --parallel --with autotools_dev --with autoreconf -# 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) - - -CXXFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CXXFLAGS += -O0 -else - CXXFLAGS += -O2 -endif - -config.status: configure - dh_testdir - # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr \ - --bindir=\$${prefix}/games \ - CXXFLAGS="$(CXXFLAGS) -fno-strict-aliasing" \ - LDFLAGS="-Wl,-z,defs" - test -f debian/stamp-configure-openyahtzee || \ - (touch config.h.in && touch stamp-h1 && touch config.h && \ - touch debian/stamp-configure-openyahtzee) - -build: build-stamp - -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -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 - - rm -f debian/stamp-configure-openyahtzee - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/openyahtzee. - $(MAKE) DESTDIR=$(CURDIR)/debian/openyahtzee install - - -# 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 - dh_testroot - dh_install - dh_installchangelogs ChangeLog - dh_installdocs - dh_installmenu - dh_installman debian/openyahtzee.6 - 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 +override_dh_auto_configure: + dh_auto_configure -- --bindir=/usr/games _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
