r9652 - in packages/trunk/invaders/debian: . patches
Fabian Greffrath
fabian-guest at alioth.debian.org
Tue Apr 28 14:01:50 UTC 2009
Author: fabian-guest
Date: 2009-04-28 14:01:49 +0000 (Tue, 28 Apr 2009)
New Revision: 9652
Added:
packages/trunk/invaders/debian/patches/01-incomplete-clean.patch
packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch
packages/trunk/invaders/debian/patches/03-wrong-datatype.patch
packages/trunk/invaders/debian/patches/04-amd64.patch
packages/trunk/invaders/debian/patches/05-fix-misspelling.patch
packages/trunk/invaders/debian/patches/series
Removed:
packages/trunk/invaders/debian/patches/00list
packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch
packages/trunk/invaders/debian/patches/02-amd64.dpatch
Modified:
packages/trunk/invaders/debian/changelog
packages/trunk/invaders/debian/compat
packages/trunk/invaders/debian/control
packages/trunk/invaders/debian/copyright
packages/trunk/invaders/debian/rules
Log:
* debian/control:
+ Changed Section from misc to kernel.
+ Bumped Standards-Version to 3.8.1.
+ Removed spurious Suggests on grub2.
* debian/control, debian/compat:
+ Raised debhelper compatibility to 7.
* debian/copyright:
+ Converted into a machine-readable format.
+ Adjusted license for io.h to GPL-2 (not GPL-2+).
+ Relicensed my work under the GNU All-Permissive License.
* debian/rules:
+ Changed "touch build-stamp" to "touch $@".
+ Changed "dh_clean -k" to dh_prep.
* debian/control, debian/rules, debian/patches/*:
+ Switched from dpatch to quilt for patch management.
+ Applied a patch from Carl-Daniel Hailfinger
<c-d.hailfinger.devel.2006 at gmx.net> found at
<http://www.coreboot.org/pipermail/coreboot/2009-April/046558.html>
split into three parts.
* debian/patches/01-incomplete-clean.patch:
+ Remove invaders in clean script.
* debian/patches/02-binutils-incompatibility.patch:
+ Fix incompatibility with newer gcc and binutils.
* debian/patches/03-wrong-datatype.patch:
+ Use (char *) instead of (uint8 *).
* debian/patches/01-pointer-targets-differ-in-signedness.dpatch:
+ Partly obsoleted by 03-wrong-datatype.patch.
+ Refreshed and renamed to 05-fix-misspelling.patch.
* debian/patches/02-amd64.dpatch:
+ Refreshed and renamed to 04-amd64.patch.
Modified: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/changelog 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,3 +1,38 @@
+invaders (1.0.0-9) unstable; urgency=low
+
+ * debian/control:
+ + Changed Section from misc to kernel.
+ + Bumped Standards-Version to 3.8.1.
+ + Removed spurious Suggests on grub2.
+ * debian/control, debian/compat:
+ + Raised debhelper compatibility to 7.
+ * debian/copyright:
+ + Converted into a machine-readable format.
+ + Adjusted license for io.h to GPL-2 (not GPL-2+).
+ + Relicensed my work under the GNU All-Permissive License.
+ * debian/rules:
+ + Changed "touch build-stamp" to "touch $@".
+ + Changed "dh_clean -k" to dh_prep.
+ * debian/control, debian/rules, debian/patches/*:
+ + Switched from dpatch to quilt for patch management.
+ + Applied a patch from Carl-Daniel Hailfinger
+ <c-d.hailfinger.devel.2006 at gmx.net> found at
+ <http://www.coreboot.org/pipermail/coreboot/2009-April/046558.html>
+ split into three parts.
+ * debian/patches/01-incomplete-clean.patch:
+ + Remove invaders in clean script.
+ * debian/patches/02-binutils-incompatibility.patch:
+ + Fix incompatibility with newer gcc and binutils.
+ * debian/patches/03-wrong-datatype.patch:
+ + Use (char *) instead of (uint8 *).
+ * debian/patches/01-pointer-targets-differ-in-signedness.dpatch:
+ + Partly obsoleted by 03-wrong-datatype.patch.
+ + Refreshed and renamed to 05-fix-misspelling.patch.
+ * debian/patches/02-amd64.dpatch:
+ + Refreshed and renamed to 04-amd64.patch.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Tue, 28 Apr 2009 13:52:36 +0200
+
invaders (1.0.0-8) unstable; urgency=low
* debian/control:
Modified: packages/trunk/invaders/debian/compat
===================================================================
--- packages/trunk/invaders/debian/compat 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/compat 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1 +1 @@
-5
+7
Modified: packages/trunk/invaders/debian/control
===================================================================
--- packages/trunk/invaders/debian/control 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/control 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,10 +1,10 @@
Source: invaders
-Section: misc
+Section: kernel
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 7), quilt
+Standards-Version: 3.8.1
Homepage: http://www.erikyyy.de/invaders/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/invaders/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/invaders/
@@ -12,7 +12,6 @@
Package: grub-invaders
Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64
Depends: ${misc:Depends}
-Suggests: grub2 (>= 1.96+20080531-1)
Description: multiboot compliant kernel game
GRUB Invaders is a game that runs directly on a computer, without an operating
system. It is meant to be started with the GRUB bootloader for PCs.
Modified: packages/trunk/invaders/debian/copyright
===================================================================
--- packages/trunk/invaders/debian/copyright 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/copyright 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,75 +1,49 @@
-This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
-Fri, 23 Mar 2007 09:46:00 +0100.
+Author: Erik Thiele <erikyyy at erikyyy.de>
+Download: http://www.erikyyy.de/invaders/
-It was downloaded from <http://www.erikyyy.de/invaders/>.
+Files: *
+Copyright: © 2001, Erik Thiele
+ © 1999, Free Software Foundation, Inc.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Upstream Author: Erik Thiele <erikyyy at erikyyy.de>
+Files: io.h
+Copyright: © Linus Torvalds et al.
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-License (all files, except boot.S, multiboot.h and io.h):
-
- Copyright (C) 2001 Erik Thiele <erikyyy at erikyyy.de>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-License (boot.S, multiboot.h):
-
- Copyright (C) 1999 Free Software Foundation, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-License (io.h):
-
- Copyright (C) Linus Torvalds and others.
-
- This file is part of the Linux kernel (compare with `include/asm/io.h'
- in the Linux source code).
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2007-2008, Fabian Greffrath <fabian at debian-unofficial.org> and
-is licensed under the GPL, see above.
+Files: debian/*
+Copyright: © 2007-2009, Fabian Greffrath <fabian at debian-unofficial.org>
+License: GAP
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.
Deleted: packages/trunk/invaders/debian/patches/00list
===================================================================
--- packages/trunk/invaders/debian/patches/00list 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/patches/00list 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,2 +0,0 @@
-01-pointer-targets-differ-in-signedness
-02-amd64
Added: packages/trunk/invaders/debian/patches/01-incomplete-clean.patch
===================================================================
--- packages/trunk/invaders/debian/patches/01-incomplete-clean.patch (rev 0)
+++ packages/trunk/invaders/debian/patches/01-incomplete-clean.patch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -0,0 +1,10 @@
+Remove invaders in clean script.
+
+--- invaders.orig/clean.sh
++++ invaders/clean.sh
+@@ -2,4 +2,4 @@
+
+ set -e
+ set -v
+-rm -f *.o *~ invaders.exec
++rm -f *.o *~ invaders.exec invaders
Property changes on: packages/trunk/invaders/debian/patches/01-incomplete-clean.patch
___________________________________________________________________
Added: svn:executable
+ *
Deleted: packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch
===================================================================
--- packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,23 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-pointer-targets-differ-in-signedness.dpatch by Fabian Greffrath <fabian at debian-unofficial.org>
-##
-## DP: Fixes: "pointer targets in passing argument 3 of ‘video_putstring’ differ in signedness"
-## DP: Fixes misspelling: "YOU LOOSE" should be "YOU LOSE". Thanks Daniel Kahn Gillmor <dkg-debian.org at fifthhorseman.net>.
-
- at DPATCH@
-diff -urNad invaders-1.0.0~/game.c invaders-1.0.0/game.c
---- invaders-1.0.0~/game.c 2008-01-17 15:22:16.000000000 +0100
-+++ invaders-1.0.0/game.c 2008-01-18 08:02:12.000000000 +0100
-@@ -197,9 +197,9 @@
- bool pressed;
-
- video_usecolor(6,1);
-- video_putstring(30,10," GAME OVER ");
-- video_putstring(30,11,winner ? " YOU WIN " : " YOU LOOSE ");
-- video_putstring(30,12," PRESS ESC ");
-+ video_putstring(30,10,(uint8 *) " GAME OVER ");
-+ video_putstring(30,11,(uint8 *) (winner ? " YOU WIN " : " YOU LOSE "));
-+ video_putstring(30,12,(uint8 *) " PRESS ESC ");
- video_update();
- do{
- key_decode(&key,&pressed);
Deleted: packages/trunk/invaders/debian/patches/02-amd64.dpatch
===================================================================
--- packages/trunk/invaders/debian/patches/02-amd64.dpatch 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/patches/02-amd64.dpatch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,20 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-amd64.dpatch by Robert Millan <rmh at aybabtu.com>
-##
-## DP: support for building on amd64 and others
-
- at DPATCH@
-diff -urNad invaders-1.0.0~/compile.sh invaders-1.0.0/compile.sh
---- invaders-1.0.0~/compile.sh 2008-01-17 15:22:16.000000000 +0100
-+++ invaders-1.0.0/compile.sh 2008-01-18 08:02:23.000000000 +0100
-@@ -3,8 +3,8 @@
- set -e
- set -v
-
--CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
--LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
-+CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror -m32"
-+LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -m32"
- gcc $CFLAGS -c keyboard.c
- gcc $CFLAGS -c delay.c
- gcc $CFLAGS -c common.c
Added: packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch
===================================================================
--- packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch (rev 0)
+++ packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -0,0 +1,13 @@
+Fix incompatibility with newer gcc and binutils.
+
+--- invaders.orig/compile.sh
++++ invaders/compile.sh
+@@ -4,7 +4,7 @@
+ set -v
+
+ CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
+-LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
++LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
+ gcc $CFLAGS -c keyboard.c
+ gcc $CFLAGS -c delay.c
+ gcc $CFLAGS -c common.c
Property changes on: packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/trunk/invaders/debian/patches/03-wrong-datatype.patch
===================================================================
--- packages/trunk/invaders/debian/patches/03-wrong-datatype.patch (rev 0)
+++ packages/trunk/invaders/debian/patches/03-wrong-datatype.patch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -0,0 +1,24 @@
+Use (char *) instead of (uint8 *).
+
+--- invaders.orig/video.c
++++ invaders/video.c
+@@ -36,7 +36,7 @@
+ video_putchar(x+1,y,hextab[hex&15]);
+ };
+
+-void video_putstring(int32 x, int32 y, uint8 *str)
++void video_putstring(int32 x, int32 y, char *str)
+ {
+ while (*str) video_putchar(x++,y,*(str++));
+ };
+--- invaders.orig/video.h
++++ invaders/video.h
+@@ -8,7 +8,7 @@
+ void video_putchar(int32 x, int32 y, uint8 code);
+ void video_fill(int32 x, int32 y, int32 width, int32 height, uint8 code);
+ void video_puthex8(int32 x, int32 y, uint8 hex);
+-void video_putstring(int32 x, int32 y, uint8 *str);
++void video_putstring(int32 x, int32 y, char *str);
+
+ // immediate effect
+ void video_update();
Property changes on: packages/trunk/invaders/debian/patches/03-wrong-datatype.patch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/trunk/invaders/debian/patches/04-amd64.patch
===================================================================
--- packages/trunk/invaders/debian/patches/04-amd64.patch (rev 0)
+++ packages/trunk/invaders/debian/patches/04-amd64.patch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -0,0 +1,15 @@
+Support for building on amd64 and others.
+
+--- invaders.orig/compile.sh
++++ invaders/compile.sh
+@@ -3,8 +3,8 @@
+ set -e
+ set -v
+
+-CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror"
+-LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none"
++CFLAGS="-fno-builtin -nostdinc -O2 -I. -Wall -Werror -m32"
++LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none -m32"
+ gcc $CFLAGS -c keyboard.c
+ gcc $CFLAGS -c delay.c
+ gcc $CFLAGS -c common.c
Added: packages/trunk/invaders/debian/patches/05-fix-misspelling.patch
===================================================================
--- packages/trunk/invaders/debian/patches/05-fix-misspelling.patch (rev 0)
+++ packages/trunk/invaders/debian/patches/05-fix-misspelling.patch 2009-04-28 14:01:49 UTC (rev 9652)
@@ -0,0 +1,13 @@
+Fix spelling error ("YOU LOOSE" should be "YOU LOSE") and preserve string length.
+
+--- invaders.orig/game.c
++++ invaders/game.c
+@@ -198,7 +198,7 @@
+
+ video_usecolor(6,1);
+ video_putstring(30,10," GAME OVER ");
+- video_putstring(30,11,winner ? " YOU WIN " : " YOU LOOSE ");
++ video_putstring(30,11,winner ? " YOU WIN " : " YOU LOSE ");
+ video_putstring(30,12," PRESS ESC ");
+ video_update();
+ do{
Added: packages/trunk/invaders/debian/patches/series
===================================================================
--- packages/trunk/invaders/debian/patches/series (rev 0)
+++ packages/trunk/invaders/debian/patches/series 2009-04-28 14:01:49 UTC (rev 9652)
@@ -0,0 +1,5 @@
+01-incomplete-clean.patch
+02-binutils-incompatibility.patch
+03-wrong-datatype.patch
+04-amd64.patch
+05-fix-misspelling.patch
Modified: packages/trunk/invaders/debian/rules
===================================================================
--- packages/trunk/invaders/debian/rules 2009-04-27 02:48:16 UTC (rev 9651)
+++ packages/trunk/invaders/debian/rules 2009-04-28 14:01:49 UTC (rev 9652)
@@ -1,18 +1,18 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTFLAGS += -s
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
sh ./compile.sh
- touch build-stamp
+ touch $@
clean: unpatch
dh_testdir
@@ -27,7 +27,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
install -D -m644 $(INSTFLAGS) invaders.exec debian/grub-invaders/boot/invaders
More information about the Pkg-games-commits
mailing list