[SCM] Packaging for Tile World branch, master, updated. debian/1.3.0-5-7-gceb0c4d

Peter Pentchev roam at ringlet.net
Fri Feb 11 10:38:07 UTC 2011 

The following commit has been merged in the master branch:
commit a823b0978be9347b23dca2847d9586177934e434
Author: Peter Pentchev <roam at ringlet.net>
Date:   Fri Feb 11 12:21:26 2011 +0200

    Convert to debhelper 8, break stuff out from the rules file.

diff --git a/debian/c4 b/debian/c4
old mode 100644
new mode 100755
diff --git a/debian/changelog b/debian/changelog
index bc5e59f..aa66f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,16 @@ tworld (1.3.0-6) UNRELEASED; urgency=low
     Closes: #427360
   * Add myself to the list of Uploaders.
   * Convert to the 3.0 (quilt) source format.
+  * Convert the build system to debhelper:
+    - add a dependency on debhelper >= 8
+    - add debian/compat and specify level 8
+    - move various things from the rules file into debian/* files
+    - reorder the packages in the control file so that the "main" tworld
+      package comes first
+    - add misc:Depends to the tworld-data package, just in case
+    - rename the menu, postinst and postrm files to tworld.*
+    - add the 03_destdir patch to make the Makefile honor DESTDIR
+    - make debian/c4 executable now that its mode will be preserved
 
  -- Peter Pentchev <roam at ringlet.net>  Thu, 10 Feb 2011 22:11:53 +0200
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..9749daf
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+Makefile
+debian/c4.6
+oshw
+oshw-sdl/Makefile
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
index 1824e1f..54d86c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,12 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Gerfried Fuchs <rhonda at debian.at>, Peter Pentchev <roam at ringlet.net>
-Build-Depends: libsdl1.2-dev
+Build-Depends: debhelper (>= 8), libsdl1.2-dev
 Standards-Version: 3.8.0
 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/
 
-Package: tworld-data
-Architecture: all
-Replaces: tworld (<< 1.3.0-4)
-Description: Chip's Challenge Game Engine Emulation
- Tile World is an emulation of the game "Chip's Challenge".  "Chip's
- Challenge" was originally written for the Atari Lynx by Chuck Sommerville,
- and was later ported to MS Windows by Microsoft (among other ports).
- .
- This package contains the architecture independent data files.
-
 Package: tworld
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, tworld-data (= ${source:Version})
@@ -38,3 +28,14 @@ Description: Chip's Challenge Game Engine Emulation
  released introduced a number of changes to the rules of the game, Tile World
  is capable of emulating either the MS version or the original Atari Lynx
  version of the game.
+
+Package: tworld-data
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: tworld (<< 1.3.0-4)
+Description: Chip's Challenge Game Engine Emulation
+ Tile World is an emulation of the game "Chip's Challenge".  "Chip's
+ Challenge" was originally written for the Atari Lynx by Chuck Sommerville,
+ and was later ported to MS Windows by Microsoft (among other ports).
+ .
+ This package contains the architecture independent data files.
diff --git a/debian/patches/03_destdir b/debian/patches/03_destdir
new file mode 100644
index 0000000..4673066
--- /dev/null
+++ b/debian/patches/03_destdir
@@ -0,0 +1,40 @@
+Description: Honor DESTDIR during installation.
+Forwarded: no
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2011-02-11
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -92,19 +92,19 @@
+ #
+ 
+ install: tworld
+-	mkdir -p $(bindir)
+-	mkdir -p $(sharedir)/sets
+-	mkdir -p $(sharedir)/data
+-	mkdir -p $(sharedir)/res
+-	mkdir -p $(mandir)/man6
+-	cp -i ./tworld $(bindir)/.
+-	cp -i sets/*.dac $(sharedir)/sets/.
+-	cp -i data/*.dat $(sharedir)/data/.
+-	cp -i res/rc $(sharedir)/res/.
+-	cp -i res/*.bmp $(sharedir)/res/.
+-	cp -i res/*.txt $(sharedir)/res/.
+-	cp -i res/*.wav $(sharedir)/res/.
+-	cp -i docs/tworld.6 $(mandir)/man6/.
++	mkdir -p $(DESTDIR)$(bindir)
++	mkdir -p $(DESTDIR)$(sharedir)/sets
++	mkdir -p $(DESTDIR)$(sharedir)/data
++	mkdir -p $(DESTDIR)$(sharedir)/res
++	mkdir -p $(DESTDIR)$(mandir)/man6
++	cp -i ./tworld $(DESTDIR)$(bindir)/.
++	cp -i sets/*.dac $(DESTDIR)$(sharedir)/sets/.
++	cp -i data/*.dat $(DESTDIR)$(sharedir)/data/.
++	cp -i res/rc $(DESTDIR)$(sharedir)/res/.
++	cp -i res/*.bmp $(DESTDIR)$(sharedir)/res/.
++	cp -i res/*.txt $(DESTDIR)$(sharedir)/res/.
++	cp -i res/*.wav $(DESTDIR)$(sharedir)/res/.
++	cp -i docs/tworld.6 $(DESTDIR)$(mandir)/man6/.
+ 
+ all: tworld mklynxcc
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0f0c77f..24d1be7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix-manpage
 02_integer-types
+03_destdir
diff --git a/debian/rules b/debian/rules
index 13ced57..49d336d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,104 +32,24 @@ ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	STRIP = true
 endif
 
-clean:
-	$(checkdir)
-	$(checkroot)
-	[ ! -f Makefile ] || $(MAKE) clean
-	-rm -rf $(TMP1) $(TMP2) debian/substvars debian/files build-stamp \
-		Makefile oshw-sdl/Makefile oshw install-stamp
+export CFLAGS LDFLAGS
 
+override_dh_auto_configure:
+	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games
 
-config.status: configure
-	$(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
+override_dh_auto_build:
+	dh_auto_build
+	pod2man -s 6 -r 'Tile World' -c '' debian/c4 > debian/c4.6
 
+override_dh_installchangelogs:
+	dh_installchangelogs -ptworld-data
 
-build: build-stamp
-build-stamp: config.status
-	$(checkdir)
-	$(MAKE)
-	touch build-stamp
+override_dh_installdocs:
+	dh_installdocs -ptworld-data
 
+override_dh_compress:
+	dh_compress -ptworld
+	dh_compress -ptworld-data usr/share/doc/tworld-data/tworld.html
 
-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
-	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)
-	cd $(TMP2)/usr/share && gzip -9 man/man6/c4.6 \
-		doc/$(PKG2)/README doc/$(PKG2)/tworld.html
-
-	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
+%:
+	dh $@
diff --git a/debian/tworld-data.docs b/debian/tworld-data.docs
new file mode 100644
index 0000000..d3c8764
--- /dev/null
+++ b/debian/tworld-data.docs
@@ -0,0 +1,4 @@
+BUGS
+README
+debian/README.Debian
+docs/tworld.html
diff --git a/debian/tworld-data.install b/debian/tworld-data.install
new file mode 100644
index 0000000..645db24
--- /dev/null
+++ b/debian/tworld-data.install
@@ -0,0 +1,2 @@
+debian/c4		usr/games
+usr/share/games/tworld
diff --git a/debian/tworld-data.manpages b/debian/tworld-data.manpages
new file mode 100644
index 0000000..5752421
--- /dev/null
+++ b/debian/tworld-data.manpages
@@ -0,0 +1 @@
+debian/c4.6
diff --git a/debian/tworld.install b/debian/tworld.install
new file mode 100644
index 0000000..354ce3f
--- /dev/null
+++ b/debian/tworld.install
@@ -0,0 +1,4 @@
+debian/tworld.desktop	usr/share/applications
+debian/tworld.xpm	usr/share/pixmaps
+usr/games/tworld*
+usr/share/man/man6/tworld*
diff --git a/debian/tworld.links b/debian/tworld.links
new file mode 100644
index 0000000..1175604
--- /dev/null
+++ b/debian/tworld.links
@@ -0,0 +1 @@
+usr/share/doc/tworld-data	usr/share/doc/tworld
diff --git a/debian/menu b/debian/tworld.menu
similarity index 100%
rename from debian/menu
rename to debian/tworld.menu
diff --git a/debian/postinst b/debian/tworld.postinst
similarity index 100%
rename from debian/postinst
rename to debian/tworld.postinst
diff --git a/debian/postrm b/debian/tworld.postrm
similarity index 100%
rename from debian/postrm
rename to debian/tworld.postrm

-- 
Packaging for Tile World

More information about the Pkg-games-commits mailing list