Author: bdefreese Date: 2013-05-22 01:58:29 +0000 (Wed, 22 May 2013) New Revision: 14125
Added: packages/trunk/adonthell/debian/manpages Removed: packages/trunk/adonthell/debian/pyversions Modified: packages/trunk/adonthell/debian/changelog packages/trunk/adonthell/debian/control packages/trunk/adonthell/debian/rules Log: Update packaging to dh7 style Modified: packages/trunk/adonthell/debian/changelog =================================================================== --- packages/trunk/adonthell/debian/changelog 2013-05-21 21:26:32 UTC (rev 14124) +++ packages/trunk/adonthell/debian/changelog 2013-05-22 01:58:29 UTC (rev 14125) @@ -1,9 +1,16 @@ -adonthell (0.3.5-8) UNRELEASED; urgency=low +adonthell (0.3.5-8) unstable; urgency=low * Acknowledge NMU. - * Add .desktop file. (Closes: #708933). + * Clean up packaging. + - Change debian/rules to dh7 style. + - Bump debhelper and compat to 7. + - Replace Conflicts with Breaks in control. + - Add hardening flags. + - Update Homepage to new address. + - Remove links against libdl and libutil since they aren't used. + * Bump Standards Version to 3.9.4. - -- Barry deFreese <bdefre...@debian.org> Sun, 19 May 2013 07:07:29 -0400 + -- Barry deFreese <bdefre...@debian.org> Mon, 20 May 2013 08:24:40 -0400 adonthell (0.3.5-7.1) unstable; urgency=medium Modified: packages/trunk/adonthell/debian/control =================================================================== --- packages/trunk/adonthell/debian/control 2013-05-21 21:26:32 UTC (rev 14124) +++ packages/trunk/adonthell/debian/control 2013-05-22 01:58:29 UTC (rev 14125) @@ -3,9 +3,10 @@ Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Barry deFreese <bdefre...@debian.org>, Moritz Muehlenhoff <j...@debian.org> -Build-Depends: debhelper (>= 5.0.37.2), autotools-dev, libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig (>= 1.3), libfreetype6-dev, libaa1-dev, python-dev, python-support, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev -Standards-Version: 3.8.3 -Homepage: http://adonthell.linuxgames.com/ +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, dpkg-dev (>= 1.16.1~), libsdl1.2-dev, libvorbis-dev, zlib1g-dev, swig (>= 1.3), + libfreetype6-dev, libaa1-dev, python-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libsdl1.2-dev +Standards-Version: 3.9.4 +Homepage: http://adonthell.nongnu.org/index.shtml Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/adonthell/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/adonthell/?op=log @@ -13,7 +14,7 @@ Architecture: alpha amd64 avr32 hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Recommends: adonthell-data (>= 0.3.3-3), adonthell-data (<< 0.4) -Conflicts: adonthell-data (<< 0.3.3-3) +Breaks: adonthell-data (<< 0.3.3-3) Description: 2D graphical roleplaying game A 2D graphical RPG game inspired by good old console RPGs like the ones on the SNES. Added: packages/trunk/adonthell/debian/manpages =================================================================== --- packages/trunk/adonthell/debian/manpages (rev 0) +++ packages/trunk/adonthell/debian/manpages 2013-05-22 01:58:29 UTC (rev 14125) @@ -0,0 +1 @@ +debian/adonthell.6 Deleted: packages/trunk/adonthell/debian/pyversions =================================================================== --- packages/trunk/adonthell/debian/pyversions 2013-05-21 21:26:32 UTC (rev 14124) +++ packages/trunk/adonthell/debian/pyversions 2013-05-22 01:58:29 UTC (rev 14125) @@ -1 +0,0 @@ -2.3- Modified: packages/trunk/adonthell/debian/rules =================================================================== --- packages/trunk/adonthell/debian/rules 2013-05-21 21:26:32 UTC (rev 14124) +++ packages/trunk/adonthell/debian/rules 2013-05-22 01:58:29 UTC (rev 14125) @@ -2,15 +2,17 @@ #export DH_VERBOSE=1 +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CXXFLAGS = -Wall -fno-exceptions -DSWIG_GLOBAL -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\" +CXXFLAGS += -Wall -fno-exceptions -DSWIG_GLOBAL -DDATA_DIR=\"\\\"/usr/share/games/adonthell\"\\\" CFGDEBUG = "" INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} -p -o root -g root -m 755 PYVERSIONNN:=$(shell pyversions -d -v) - PYVERSION :=python$(PYVERSIONNN) ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) @@ -26,59 +28,32 @@ CXXFLAGS += -O2 endif -configure: configure-stamp -configure-stamp: - dh_testdir +%: + dh $@ --with python2, yes - +override_dh_auto_configure: -test -r /usr/share/misc/config.sub && \ cp -f /usr/share/misc/config.sub config.sub -test -r /usr/share/misc/config.guess && \ cp -f /usr/share/misc/config.guess config.guess + ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --bindir=\$${prefix}/games \ --datadir=\$${prefix}/share/games \ - --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config -l$(PYVERSION) -ldl -lpthread -lutil -lSDL -lSDL_ttf -lSDL_mixer" \ + --with-py-libs="-Wl,-E -L/usr/lib/$(PYVERSION)/config -l$(PYVERSION) -lpthread -lSDL -lSDL_ttf -lSDL_mixer" \ --with-py-cflags="-I/usr/include/$(PYVERSION)" \ $(CFGDEBUG) - touch configure-stamp -build: configure-stamp build-stamp +override_dh_auto_build: + $(MAKE) CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" -build-stamp: - dh_testdir - $(MAKE) CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f configure-stamp build-stamp - - [ ! -f Makefile ] || $(MAKE) distclean - -rm -f `find . -name "*~"` - -rm -f src/adonthell.pyc - - rm -f config.guess config.sub - - # drop files generated by SWIG - rm -f src/modules/adonthell.py src/py_adonthell_wrap.cc - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - +override_dh_auto_install: $(MAKE) install DESTDIR="$(CURDIR)/debian/adonthell" INSTALL_PROGRAM="$(INSTALL_PROGRAM)" #Remove the symlink and change binary name back to adonthell @@ -86,29 +61,13 @@ mv $(CURDIR)/debian/adonthell/usr/games/adonthell-0.3 \ $(CURDIR)/debian/adonthell/usr/games/adonthell -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. +override_dh_clean: + [ ! -f Makefile ] || $(MAKE) distclean + -rm -f `find . -name "*~"` + -rm -f src/adonthell.pyc -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installmenu - dh_installman debian/adonthell.6 - dh_installchangelogs ChangeLog - dh_pysupport -V $(PYVERSIONNN) adonthell /usr/share/games/adonthell/modules/ - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + rm -f config.guess config.sub -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install - + # drop files generated by SWIG + rm -f src/modules/adonthell.py src/py_adonthell_wrap.cc + dh_clean _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
