This is an automated email from the git hooks/post-receive script. rhonda pushed a commit to branch master in repository tworld.
commit 57051683d67cd8b8ce7275da8068da6efc280fb1 Author: Rhonda D'Vine <[email protected]> Date: Thu Dec 31 23:10:44 2015 +0100 Source format 3.0 (quilt) and dh style debian/rules --- debian/changelog | 4 ++ debian/compat | 1 + debian/control | 4 +- debian/patches/03_fix-Makefile.in | 17 +++++ debian/patches/series | 1 + debian/postinst | 4 +- debian/postrm | 10 --- debian/rules | 146 +++----------------------------------- debian/source/format | 1 + debian/tworld-data.docs | 3 + debian/tworld-data.install | 7 ++ debian/tworld.install | 4 ++ debian/{menu => tworld.menu} | 0 13 files changed, 51 insertions(+), 151 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c09949..0aa1674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ tworld (1.3.2-1) unstable; urgency=medium * New Upstream release (closes: #807623) * Update 01_fix-manpage and refresh 02_integer-types patches. + * Change debian/rules to dh style. + * Change source format to 3.0 (quilt). + * Bump Standards-Version to 3.9.6. + * Add patch 03_fix-Makefile.in to make clean work (repeatedly). -- diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control index 4b1a8cd..0617766 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> Uploaders: Rhonda D'Vine <[email protected]> -Build-Depends: libsdl1.2-dev, quilt -Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 9~), libsdl1.2-dev +Standards-Version: 3.9.6 Vcs-Git: git://git.debian.org/git/pkg-games/tworld.git Vcs-Browser: http://git.debian.org/?p=pkg-games/tworld.git Homepage: http://www.muppetlabs.com/~breadbox/software/tworld/ diff --git a/debian/patches/03_fix-Makefile.in b/debian/patches/03_fix-Makefile.in new file mode 100644 index 0000000..029a780 --- /dev/null +++ b/debian/patches/03_fix-Makefile.in @@ -0,0 +1,17 @@ +Index: VCS/Makefile.in +=================================================================== +--- VCS.orig/Makefile.in ++++ VCS/Makefile.in +@@ -110,10 +110,10 @@ all: tworld + clean: + rm -f $(OBJS) tworld comptime.h config.* + rm -f tworldres.o tworld.exe +- (cd oshw && $(MAKE) clean) ++ -(cd oshw && $(MAKE) clean) + + spotless: + rm -f $(OBJS) tworld comptime.h config.* configure + rm -f tworldres.o tworld.exe +- (cd oshw && $(MAKE) spotless) ++ -(cd oshw && $(MAKE) spotless) + rm -f Makefile diff --git a/debian/patches/series b/debian/patches/series index 0f0c77f..a5bb88d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 01_fix-manpage 02_integer-types +03_fix-Makefile.in diff --git a/debian/postinst b/debian/postinst index 359e2e1..6bdd28f 100644 --- a/debian/postinst +++ b/debian/postinst @@ -17,6 +17,4 @@ if dpkg --compare-versions "$2" lt-nl "1.3.0-5"; then fi fi -if [ -x /usr/bin/update-menus ]; then - update-menus -fi +#DEBHELPER# diff --git a/debian/postrm b/debian/postrm deleted file mode 100644 index 99f9d85..0000000 --- a/debian/postrm +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# postrm script for tworld -# copyright 2006-2011 by Gerfried Fuchs <[email protected]> -# Licenced under WTFPLv2 - -set -e - -if [ -x /usr/bin/update-menus ]; then - update-menus -fi diff --git a/debian/rules b/debian/rules index a8f446f..9d9eadc 100755 --- a/debian/rules +++ b/debian/rules @@ -1,141 +1,15 @@ #!/usr/bin/make -f -# debian/rules for tworld -# copyright 2006-2011 by Gerfried Fuchs <[email protected]> -# Licenced under WTFPLv2 -PKG1 = tworld -PKG2 = tworld-data -TMP1 = $(CURDIR)/debian/$(PKG1) -TMP2 = $(CURDIR)/debian/$(PKG2) +%: + dh $@ -INSTALL = install -INSTALL_FILE = $(INSTALL) -p -oroot -groot -m644 -INSTALL_SCRIPT = $(INSTALL) -p -oroot -groot -m755 -INSTALL_DIR = $(INSTALL) -p -d -oroot -groot -m755 +override_dh_clean: + rm -f Makefile oshw-sdl/Makefile oshw + dh_clean -# 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) - - -CFLAGS = -Wall -W -fomit-frame-pointer -DNDEBUG -LDFLAGS = -Wall -W - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - LDFLAGS += -s - STRIP = true -endif - -include /usr/share/quilt/quilt.make - - -clean: unpatch - $(checkdir) - $(checkroot) - [ ! -f Makefile ] || $(MAKE) clean - -rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp \ - Makefile oshw-sdl/Makefile oshw install-stamp - - -config.status: configure patch - $(checkdir) - CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ - --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr/games --with-sharedir=\$${prefix}/../share/games/tworld \ - --bindir=\$${prefix} --mandir=\$${prefix}/../share/man - - -build: build-stamp -build-stamp: config.status - $(checkdir) - $(MAKE) - touch build-stamp - - -install: install-stamp -install-stamp: build - $(checkdir) - $(checkroot) - -rm -rf $(TMP1) $(TMP2) - - $(MAKE) install prefix=$(TMP2)/usr/games - test "$(STRIP)" != true || strip \ - --remove-section=.comment --remove-section=.note \ - $(TMP2)/usr/games/tworld - - $(INSTALL_DIR) $(TMP1)/usr - cd $(TMP1)/usr && $(INSTALL_DIR) games share/man/man6 share/doc \ - share/applications share/pixmaps - mv $(TMP2)/usr/games/tworld $(TMP1)/usr/games - mv $(TMP2)/usr/share/man/man6/tworld.6 $(TMP1)/usr/share/man/man6 - gzip --best $(TMP1)/usr/share/man/man6/tworld.6 - ln -s $(PKG2) $(TMP1)/usr/share/doc/$(PKG1) - $(INSTALL_FILE) debian/tworld.desktop $(TMP1)/usr/share/applications - $(INSTALL_FILE) debian/tworld.xpm $(TMP1)/usr/share/pixmaps - - $(INSTALL_SCRIPT) debian/c4 $(TMP2)/usr/games +override_dh_auto_install: + mkdir -p debian/tworld-data/usr/share/man/man6 pod2man -s 6 -r 'Tile World' -c '' debian/c4 \ - $(TMP2)/usr/share/man/man6/c4.6 - $(INSTALL_DIR) $(TMP2)/usr/share/doc/$(PKG2) - $(INSTALL_FILE) BUGS README docs/tworld.html \ - $(TMP2)/usr/share/doc/$(PKG2) - $(INSTALL_FILE) Changelog \ - $(TMP2)/usr/share/doc/$(PKG2)/changelog - cd $(TMP2)/usr/share && gzip -9 man/man6/c4.6 \ - doc/$(PKG2)/README doc/$(PKG2)/tworld.html \ - doc/$(PKG2)/changelog - - touch install-stamp - - -# 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 - $(checkdir) - $(checkroot) - $(INSTALL_DIR) $(TMP1)/DEBIAN $(TMP2)/DEBIAN \ - $(TMP1)/usr/share/menu - - $(INSTALL_FILE) debian/menu $(TMP1)/usr/share/menu/$(PKG1) - $(INSTALL_SCRIPT) debian/postinst debian/postrm \ - $(TMP1)/DEBIAN - dpkg-shlibdeps -Tdebian/substvars -dDepends \ - $(TMP1)/usr/games/* - dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars \ - -p$(PKG1) -P$(TMP1) - cd $(TMP1) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ - xargs -r0 md5sum > DEBIAN/md5sums - dpkg --build $(TMP1) .. - - $(INSTALL_FILE) debian/copyright debian/README.Debian \ - $(TMP2)/usr/share/doc/$(PKG2) - $(INSTALL_FILE) debian/changelog \ - $(TMP2)/usr/share/doc/$(PKG2)/changelog.Debian - gzip -9 $(TMP2)/usr/share/doc/$(PKG2)/changelog.Debian - dpkg-gencontrol -ldebian/changelog -isp \ - -p$(PKG2) -P$(TMP2) - cd $(TMP2) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \ - xargs -r0 md5sum > DEBIAN/md5sums - dpkg --build $(TMP2) .. - -binary: binary-indep binary-arch - - -define checkdir - test -f debian/rules -endef - -define checkroot - test root = "`whoami`" -endef - -.PHONY: clean build install binary-indep binary-arch binary + debian/tworld-data/usr/share/man/man6/c4.6 + mkdir -p debian/tworld/usr/share/doc + ln -s tworld-data debian/tworld/usr/share/doc/tworld diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tworld-data.docs b/debian/tworld-data.docs new file mode 100644 index 0000000..9d8ae75 --- /dev/null +++ b/debian/tworld-data.docs @@ -0,0 +1,3 @@ +BUGS +README +docs/tworld.html diff --git a/debian/tworld-data.install b/debian/tworld-data.install new file mode 100644 index 0000000..17e5381 --- /dev/null +++ b/debian/tworld-data.install @@ -0,0 +1,7 @@ +debian/c4 usr/games +sets/*.dac usr/share/games/tworld/sets +data/*.dat usr/share/games/tworld/data +res/rc usr/share/games/tworld/res +res/*.bmp usr/share/games/tworld/res +res/*.txt usr/share/games/tworld/res +res/*.wav usr/share/games/tworld/res diff --git a/debian/tworld.install b/debian/tworld.install new file mode 100644 index 0000000..3dcb0e4 --- /dev/null +++ b/debian/tworld.install @@ -0,0 +1,4 @@ +tworld usr/games +docs/tworld.6 usr/share/man/man6 +debian/tworld.desktop usr/share/applications +debian/tworld.xpm usr/share/pixmaps diff --git a/debian/menu b/debian/tworld.menu similarity index 100% rename from debian/menu rename to debian/tworld.menu -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/tworld.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
