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

Gerfried Fuchs rhonda at debian.org
Fri Feb 11 11:24:41 UTC 2011


The following commit has been merged in the master branch:
commit 127c5f677d1cf279111a6e577115f60a2ca0b664
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Fri Feb 11 12:23:43 2011 +0100

    Revert non-discussed intrusive hijack-like overhaul commits

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..3556bbc
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+This package uses quilt for its patch management, see
+/usr/share/doc/quilt/README.source if you are unfamiliar with it.
diff --git a/debian/c4 b/debian/c4
old mode 100755
new mode 100644
diff --git a/debian/changelog b/debian/changelog
index c23ad12..edf320e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,3 @@
-tworld (1.3.0-6) UNRELEASED; urgency=low
-
-  * Add the 02-integer-types patch to fix the 32/64-bit problems.
-    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 and postinst 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
-    - replace the update-menus invocation in the postinst script with
-      a #DEBHELPER# token
-    - remove the postrm script since its whole purpose is automagically
-      fulfilled by debhelper autogenerated code
-  - Explicitly use "set -e" in the postinst script.
-  - Enhance the tworld-data short description.
-
- -- Peter Pentchev <roam at ringlet.net>  Thu, 10 Feb 2011 22:11:53 +0200
-
 tworld (1.3.0-5) unstable; urgency=low
 
   * Switch doc dir from tworld to symlink as dpkg isn't able to do so.
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 9749daf..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-debian/c4.6
-oshw
-oshw-sdl/Makefile
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 45a4fb7..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/debian/control b/debian/control
index 9fe6b0f..305a50e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,23 @@ Source: tworld
 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: debhelper (>= 8), libsdl1.2-dev
+Uploaders: Gerfried Fuchs <rhonda at debian.at>
+Build-Depends: libsdl1.2-dev, quilt
 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})
@@ -28,14 +38,3 @@ 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 - level data files
- 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/tworld.menu b/debian/menu
similarity index 100%
rename from debian/tworld.menu
rename to debian/menu
diff --git a/debian/patches/02_integer-types b/debian/patches/02_integer-types
deleted file mode 100644
index 9da92bb..0000000
--- a/debian/patches/02_integer-types
+++ /dev/null
@@ -1,320 +0,0 @@
-Description: Fix 32/64-bit issues.
-Forwarded: no
-Author: Drake Wilson <drake at begriffli.ch>
-Last-Update: 2011-02-10
-
---- a/defs.h
-+++ b/defs.h
-@@ -8,6 +8,7 @@
- #define	_defs_h_
- 
- #include	<stdio.h>
-+#include	<stdint.h>
- #include	"gen.h"
- 
- /*
-@@ -34,8 +35,8 @@
- /* Pseudorandom number generators.
-  */
- typedef	struct prng {
--    unsigned long	initial;	/* initial seed value */
--    unsigned long	value;		/* latest random value */
-+    uint32_t		initial;	/* initial seed value */
-+    uint32_t	 	value;		/* latest random value */
-     char		shared;		/* FALSE if independent sequence */
- } prng;
- 
-@@ -65,8 +66,8 @@
-  */
- typedef	struct solutioninfo {
-     actlist		moves;		/* the actual moves of the solution */
--    unsigned long	rndseed;	/* the PRNG's initial seed */
--    unsigned long	flags;		/* other flags (currently unused) */
-+    uint32_t		rndseed;	/* the PRNG's initial seed */
-+    uint32_t		flags;		/* other flags (currently unused) */
-     unsigned char	rndslidedir;	/* random slide's initial direction */
-     signed char		stepping;	/* the timer offset */
- } solutioninfo;
-@@ -196,7 +197,7 @@
-     int			solutionsize;	/* size of the saved solution data */
-     unsigned char      *leveldata;	/* the data defining the level */
-     unsigned char      *solutiondata;	/* the player's best solution so far */
--    unsigned long	levelhash;	/* the level data's hash value */
-+    uint32_t		levelhash;	/* the level data's hash value */
-     char const	       *unsolvable;	/* why level is unsolvable, or NULL */
-     char		name[256];	/* name of the level */
-     char		passwd[256];	/* the level's password */
---- a/fileio.c
-+++ b/fileio.c
-@@ -242,7 +242,7 @@
- 
- /* Read one byte as an unsigned integer value.
-  */
--int filereadint8(fileinfo *file, unsigned char *val8, char const *msg)
-+int filereadint8(fileinfo *file, uint8_t *val8, char const *msg)
- {
-     int	byte;
- 
-@@ -255,7 +255,7 @@
- 
- /* Write one byte as an unsigned integer value.
-  */
--int filewriteint8(fileinfo *file, unsigned char val8, char const *msg)
-+int filewriteint8(fileinfo *file, uint8_t val8, char const *msg)
- {
-     errno = 0;
-     if (fputc(val8, file->fp) != EOF)
-@@ -265,7 +265,7 @@
- 
- /* Read two bytes as an unsigned integer value stored in little-endian.
-  */
--int filereadint16(fileinfo *file, unsigned short *val16, char const *msg)
-+int filereadint16(fileinfo *file, uint16_t *val16, char const *msg)
- {
-     int	byte;
- 
-@@ -282,7 +282,7 @@
- 
- /* Write two bytes as an unsigned integer value in little-endian.
-  */
--int filewriteint16(fileinfo *file, unsigned short val16, char const *msg)
-+int filewriteint16(fileinfo *file, uint16_t val16, char const *msg)
- {
-     errno = 0;
-     if (fputc(val16 & 0xFF, file->fp) != EOF
-@@ -293,7 +293,7 @@
- 
- /* Read four bytes as an unsigned integer value stored in little-endian.
-  */
--int filereadint32(fileinfo *file, unsigned long *val32, char const *msg)
-+int filereadint32(fileinfo *file, uint32_t *val32, char const *msg)
- {
-     int	byte;
- 
-@@ -316,7 +316,7 @@
- 
- /* Write four bytes as an unsigned integer value in little-endian.
-  */
--int filewriteint32(fileinfo *file, unsigned long val32, char const *msg)
-+int filewriteint32(fileinfo *file, uint32_t val32, char const *msg)
- {
-     errno = 0;
-     if (fputc(val32 & 0xFF, file->fp) != EOF
---- a/fileio.h
-+++ b/fileio.h
-@@ -8,6 +8,7 @@
- #define	_fileio_h_
- 
- #include	"defs.h"
-+#include	<stdint.h>
- 
- /* Reset a fileinfo structure to indicate no file.
-  */
-@@ -49,17 +50,17 @@
-  * from the current position in the given file. For the multi-byte
-  * values, the value is assumed to be stored in little-endian.
-  */
--extern int filereadint8(fileinfo *file, unsigned char *val8,
-+extern int filereadint8(fileinfo *file, uint8_t *val8,
- 			char const *msg);
--extern int filewriteint8(fileinfo *file, unsigned char val8,
-+extern int filewriteint8(fileinfo *file, uint8_t val8,
- 			 char const *msg);
--extern int filereadint16(fileinfo *file, unsigned short *val16,
-+extern int filereadint16(fileinfo *file, uint16_t *val16,
- 			 char const *msg);
--extern int filewriteint16(fileinfo *file, unsigned short val16,
-+extern int filewriteint16(fileinfo *file, uint16_t val16,
- 			  char const *msg);
--extern int filereadint32(fileinfo *file, unsigned long *val32,
-+extern int filereadint32(fileinfo *file, uint32_t *val32,
- 			 char const *msg);
--extern int filewriteint32(fileinfo *file, unsigned long val32,
-+extern int filewriteint32(fileinfo *file, uint32_t val32,
- 			  char const *msg);
- 
- /* Read size bytes from the given file and return the bytes in a
---- a/oshw.h
-+++ b/oshw.h
-@@ -131,7 +131,7 @@
- 
- /* The font provides special monospaced digit characters at 144-153.
-  */
--enum { CHAR_MZERO = 144 };
-+#define CHAR_MZERO ((char)144)
- 
- /*
-  * Video output functions.
---- a/random.c
-+++ b/random.c
-@@ -24,12 +24,12 @@
- /* The most recently generated random number is stashed here, so that
-  * it can provide the initial seed of the next PRNG.
-  */
--static unsigned long	lastvalue = 0x80000000UL;
-+static uint32_t	lastvalue = 0x80000000UL;
- 
- /* The standard linear congruential random-number generator needs no
-  * introduction.
-  */
--static unsigned long nextvalue(unsigned long value)
-+static uint32_t nextvalue(uint32_t value)
- {
-     return ((value * 1103515245UL) + 12345UL) & 0x7FFFFFFFUL;
- }
-@@ -67,7 +67,7 @@
- 
- /* Reset a PRNG to an independent sequence.
-  */
--void restartprng(prng *gen, unsigned long seed)
-+void restartprng(prng *gen, uint32_t seed)
- {
-     gen->value = gen->initial = seed & 0x7FFFFFFFUL;
-     gen->shared = FALSE;
---- a/random.h
-+++ b/random.h
-@@ -19,7 +19,7 @@
- 
- /* Restart an existing PRNG upon a predetermined sequence.
-  */
--extern void restartprng(prng *gen, unsigned long initial);
-+extern void restartprng(prng *gen, uint32_t initial);
- 
- /* Retrieve the original seed value of the current sequence.
-  */
---- a/series.c
-+++ b/series.c
-@@ -46,9 +46,9 @@
- 
- /* Calculate a hash value for the given block of data.
-  */
--static unsigned long hashvalue(unsigned char const *data, unsigned int size)
-+static uint32_t hashvalue(unsigned char const *data, unsigned int size)
- {
--    static unsigned long remainders[256] = {
-+    static uint32_t remainders[256] = {
- 	0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B,
- 	0x1A864DB2, 0x1E475005, 0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61,
- 	0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD, 0x4C11DB70, 0x48D0C6C7,
-@@ -94,7 +94,7 @@
- 	0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
-     };
- 
--    unsigned long	accum;
-+    uint32_t		accum;
-     unsigned int	i, j;
- 
-     for (j = 0, accum = 0xFFFFFFFFUL ; j < size ; ++j) {
-@@ -113,7 +113,7 @@
-  */
- static int readseriesheader(gameseries *series)
- {
--    unsigned short	val16;
-+    uint16_t		val16;
-     int			ruleset;
- 
-     if (!filereadint16(&series->mapfile, &val16, "not a valid data file"))
-@@ -149,7 +149,7 @@
- {
-     unsigned char	       *data;
-     unsigned char const	       *dataend;
--    unsigned short		size;
-+    uint16_t			size;
-     int				n;
- 
-     if (!filereadint16(file, &size, NULL))
-@@ -450,7 +450,7 @@
-     fileinfo		file;
-     seriesdata	       *sdata = (seriesdata*)data;
-     gameseries	       *series;
--    unsigned long	magic;
-+    uint32_t		magic;
-     char	       *datfilename;
-     int			config, f;
- 
---- a/solution.c
-+++ b/solution.c
-@@ -8,6 +8,7 @@
- #include	<stdlib.h>
- #include	<string.h>
- #include	<ctype.h>
-+#include	<stdint.h>
- #include	"defs.h"
- #include	"err.h"
- #include	"fileio.h"
-@@ -215,9 +216,9 @@
- static int readsolutionheader(fileinfo *file, int ruleset, int *flags,
- 			      int *extrasize, unsigned char *extra)
- {
--    unsigned long	sig;
--    unsigned short	f;
--    unsigned char	n;
-+    uint32_t	sig;
-+    uint16_t	f;
-+    uint8_t	n;
- 
-     if (!filereadint32(file, &sig, "not a valid solution file"))
- 	return FALSE;
-@@ -475,7 +476,7 @@
-  */
- static int readsolution(fileinfo *file, gamesetup *game)
- {
--    unsigned long	size;
-+    uint32_t	size;
- 
-     game->number = 0;
-     game->sgflags = 0;
-@@ -706,8 +707,8 @@
- int loadsolutionsetname(char const *filename, char *buffer)
- {
-     fileinfo		file;
--    unsigned long	dwrd;
--    unsigned short	word;
-+    uint32_t		dwrd;
-+    uint16_t		word;
-     int			size;
- 
-     clearfileinfo(&file);
---- a/unslist.c
-+++ b/unslist.c
-@@ -22,7 +22,7 @@
-     int			setid;		/* the ID of the level set's name */
-     int			levelnum;	/* the level's number */
-     int			size;		/* the levels data's compressed size */
--    unsigned long	hashval;	/* the levels data's hash value */
-+    uint32_t		hashval;	/* the levels data's hash value */
-     int			note;		/* the entry's annotation ID, if any */
- } unslistentry;
- 
-@@ -112,7 +112,7 @@
- /* Add a new entry with the given data to the list.
-  */
- static int addtounslist(int setid, int levelnum,
--			int size, unsigned long hashval, int note)
-+			int size, uint32_t hashval, int note)
- {
-     if (listcount == listallocated) {
- 	listallocated = listallocated ? listallocated * 2 : 16;
-@@ -152,8 +152,10 @@
- {
-     char		buf[256], token[256];
-     char const	       *p;
--    unsigned long	hashval;
--    int			setid, size;
-+    uint32_t		hashval;
-+    unsigned long	hashval_long;
-+    int			setid;
-+    unsigned int	size;
-     int			lineno, levelnum, n;
- 
-     setid = 0;
-@@ -169,7 +171,8 @@
- 	    continue;
- 	}
- 	n = sscanf(p, "%d: %04X%08lX: %[^\n\r]",
--		      &levelnum, &size, &hashval, token);
-+		      &levelnum, &size, &hashval_long, token);
-+	hashval = (uint32_t)hashval_long;
- 	if (n > 0 && levelnum > 0 && levelnum < 65536 && setid) {
- 	    if (n == 1) {
- 		n = sscanf(p, "%*d: %s", token);
diff --git a/debian/patches/03_destdir b/debian/patches/03_destdir
deleted file mode 100644
index 4673066..0000000
--- a/debian/patches/03_destdir
+++ /dev/null
@@ -1,40 +0,0 @@
-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 24d1be7..6b5e0b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 01_fix-manpage
-02_integer-types
-03_destdir
diff --git a/debian/tworld.postinst b/debian/postinst
similarity index 83%
rename from debian/tworld.postinst
rename to debian/postinst
index a555a5b..39fd6e1 100644
--- a/debian/tworld.postinst
+++ b/debian/postinst
@@ -1,10 +1,8 @@
-#!/bin/sh
+#!/bin/sh -e
 # postinst script for tworld
 # copyright 2006-2008 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced BSD style
 
-set -e
-
 if [ "$1" != configure ]; then
 	exit 0
 fi
@@ -17,4 +15,6 @@ if dpkg --compare-versions "$2" le-nl "1.3.0-5"; then
 	fi
 fi
 
-#DEBHELPER#
+if [ -x /usr/bin/update-menus ]; then
+	update-menus
+fi
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..5893b02
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+# postrm script for tworld
+# copyright 2006-2008 by Gerfried Fuchs <rhonda at debian.at>
+# Licenced BSD style
+
+if [ -x /usr/bin/update-menus ]; then
+	update-menus
+fi
diff --git a/debian/rules b/debian/rules
index 49d336d..ba3769e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,24 +32,107 @@ ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	STRIP = true
 endif
 
-export CFLAGS LDFLAGS
+include /usr/share/quilt/quilt.make
 
-override_dh_auto_configure:
-	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games
 
-override_dh_auto_build:
-	dh_auto_build
-	pod2man -s 6 -r 'Tile World' -c '' debian/c4 > debian/c4.6
+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
 
-override_dh_installchangelogs:
-	dh_installchangelogs -ptworld-data
 
-override_dh_installdocs:
-	dh_installdocs -ptworld-data
+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
 
-override_dh_compress:
-	dh_compress -ptworld
-	dh_compress -ptworld-data usr/share/doc/tworld-data/tworld.html
 
-%:
-	dh $@
+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
+	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
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/tworld-data.docs b/debian/tworld-data.docs
deleted file mode 100644
index d3c8764..0000000
--- a/debian/tworld-data.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-BUGS
-README
-debian/README.Debian
-docs/tworld.html
diff --git a/debian/tworld-data.install b/debian/tworld-data.install
deleted file mode 100644
index 645db24..0000000
--- a/debian/tworld-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/c4		usr/games
-usr/share/games/tworld
diff --git a/debian/tworld-data.manpages b/debian/tworld-data.manpages
deleted file mode 100644
index 5752421..0000000
--- a/debian/tworld-data.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/c4.6
diff --git a/debian/tworld.install b/debian/tworld.install
deleted file mode 100644
index 354ce3f..0000000
--- a/debian/tworld.install
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 1175604..0000000
--- a/debian/tworld.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/tworld-data	usr/share/doc/tworld

-- 
Packaging for Tile World



More information about the Pkg-games-commits mailing list