r6592 - in packages/trunk/invaders: ! dirs' list truncated !

Fabian Greffrath fabian-guest at alioth.debian.org
Wed Apr 16 18:30:49 UTC 2008


Author: fabian-guest
Date: 2008-04-16 18:30:49 +0000 (Wed, 16 Apr 2008)
New Revision: 6592

Added:
   packages/trunk/invaders/debian/
   packages/trunk/invaders/debian/changelog
   packages/trunk/invaders/debian/compat
   packages/trunk/invaders/debian/control
   packages/trunk/invaders/debian/copyright
   packages/trunk/invaders/debian/examples/
   packages/trunk/invaders/debian/examples/grub-menu.lst
   packages/trunk/invaders/debian/patches/
   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
   packages/trunk/invaders/debian/postinst
   packages/trunk/invaders/debian/postrm
   packages/trunk/invaders/debian/rules
   packages/trunk/invaders/debian/scripts/
   packages/trunk/invaders/debian/scripts/grub
   packages/trunk/invaders/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


Property changes on: packages/trunk/invaders/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog	                        (rev 0)
+++ packages/trunk/invaders/debian/changelog	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,64 @@
+invaders (1.0.0-7) unstable; urgency=low
+
+  * debian/postinst:
+    + Remove forgotten config file `/etc/grub.d/20_invaders'
+      before running update-grub2.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Sun, 10 Feb 2008 15:30:00 +0100
+
+invaders (1.0.0-6) unstable; urgency=low
+
+  * debian/control:
+    + Changed Suggests to 'grub2 (>= 1.95+20080116-1)'.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Sun, 27 Jan 2008 20:15:00 +0100
+
+invaders (1.0.0-5) unstable; urgency=low
+
+  * debian/control:
+    + Bumped Standards-Version to 3.7.3.
+    + Added Homepage: field.
+    + Added 'Depends: ${misc:Depends}'.
+    + Added 'Suggests: grub2 (>= 1.95+20081116-1)'.
+    + Removed Recommends.
+  * debian/postinst, debian/postrm:
+    + Use update-grub2 instead of update-grub (Closes: #460078).
+  * debian/rules:
+    + Install debian/scripts/grub to '/etc/grub.d/22_invaders'.
+  * debian/scripts/grub:
+    + Synced with memtest86 (3.4-1) packaging.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 23 Jan 2008 10:00:00 +0100
+
+invaders (1.0.0-4) unstable; urgency=low
+
+  * Support /boot on separate partition (Closes: #424928).
+    Thanks, Paul Martin <pm at debian.org>!
+  * Support stripping of the binary file /boot/invaders.
+  * Recommends: grub2 (>= 1.95+20070515-1) | grub.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 18 May 2007 14:55:00 +0100
+
+invaders (1.0.0-3) unstable; urgency=low
+
+  * Fix bogus postrm.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Sun, 13 May 2007 15:08:00 +0100
+
+invaders (1.0.0-2) unstable; urgency=low
+
+  * Install ELF image, not a.out (Closes: #422366).
+    Thanks, Robert Millan <rmh at aybabtu.com>!
+  * Add support for building on amd64 (Closes: #422364).
+    Thanks again, Robert Millan <rmh at aybabtu.com>!
+  * Provide /etc/grub.d/20_invaders and run update-grub in postinst/-rm
+    (Closes: #417030). Thanks again, Robert Millan <rmh at aybabtu.com>!
+  * Recommends: grub2 (>= 1.95+20070505-1) | grub.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Sat,  5 May 2007 15:22:00 +0100
+
+invaders (1.0.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #415955).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 23 Mar 2007 09:46:00 +0100

Added: packages/trunk/invaders/debian/compat
===================================================================
--- packages/trunk/invaders/debian/compat	                        (rev 0)
+++ packages/trunk/invaders/debian/compat	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1 @@
+5

Added: packages/trunk/invaders/debian/control
===================================================================
--- packages/trunk/invaders/debian/control	                        (rev 0)
+++ packages/trunk/invaders/debian/control	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,15 @@
+Source: invaders
+Section: misc
+Priority: optional
+Maintainer: Fabian Greffrath <fabian at debian-unofficial.org>
+Build-Depends: debhelper (>= 5), dpatch
+Standards-Version: 3.7.3
+Homepage: http://www.erikyyy.de/invaders/
+
+Package: grub-invaders
+Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64
+Depends: ${misc:Depends}
+Suggests: grub2 (>= 1.95+20080116-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.

Added: packages/trunk/invaders/debian/copyright
===================================================================
--- packages/trunk/invaders/debian/copyright	                        (rev 0)
+++ packages/trunk/invaders/debian/copyright	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,75 @@
+This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
+Fri, 23 Mar 2007 09:46:00 +0100.
+
+It was downloaded from <http://www.erikyyy.de/invaders/>.
+
+Upstream Author: Erik Thiele <erikyyy at erikyyy.de>
+
+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.

Added: packages/trunk/invaders/debian/examples/grub-menu.lst
===================================================================
--- packages/trunk/invaders/debian/examples/grub-menu.lst	                        (rev 0)
+++ packages/trunk/invaders/debian/examples/grub-menu.lst	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,8 @@
+# sample /boot/grub/menu.lst entry for grub-invaders
+#
+# This example assumes the contents of /boot is on the root partition.
+# If your /boot is on its own partition, remove /boot from the 'kernel' line.
+
+title	GRUB Invaders
+root	(hd0,0)
+kernel	/boot/invaders

Added: packages/trunk/invaders/debian/patches/00list
===================================================================
--- packages/trunk/invaders/debian/patches/00list	                        (rev 0)
+++ packages/trunk/invaders/debian/patches/00list	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,2 @@
+01-pointer-targets-differ-in-signedness
+02-amd64

Added: packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch
===================================================================
--- packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch	                        (rev 0)
+++ packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,22 @@
+#!/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"
+
+ 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 LOOSE  "));
++  video_putstring(30,12,(uint8 *) "  PRESS ESC  ");
+   video_update();
+   do{
+     key_decode(&key,&pressed);


Property changes on: packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/invaders/debian/patches/02-amd64.dpatch
===================================================================
--- packages/trunk/invaders/debian/patches/02-amd64.dpatch	                        (rev 0)
+++ packages/trunk/invaders/debian/patches/02-amd64.dpatch	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,20 @@
+#!/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


Property changes on: packages/trunk/invaders/debian/patches/02-amd64.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/invaders/debian/postinst
===================================================================
--- packages/trunk/invaders/debian/postinst	                        (rev 0)
+++ packages/trunk/invaders/debian/postinst	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+rm -f /etc/grub.d/20_invaders
+
+if [ "$1" = "configure" ] && [ -x "`which update-grub2 2>/dev/null`" ]; then
+        update-grub2
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/trunk/invaders/debian/postrm
===================================================================
--- packages/trunk/invaders/debian/postrm	                        (rev 0)
+++ packages/trunk/invaders/debian/postrm	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ -x "`which update-grub2 2>/dev/null`" ]; then update-grub2 ; fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/trunk/invaders/debian/rules
===================================================================
--- packages/trunk/invaders/debian/rules	                        (rev 0)
+++ packages/trunk/invaders/debian/rules	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,53 @@
+#!/usr/bin/make -f
+
+include /usr/share/dpatch/dpatch.make
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTFLAGS += -s
+endif
+
+build: build-stamp
+build-stamp: patch-stamp
+	dh_testdir
+
+	sh ./compile.sh
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	sh ./clean.sh
+	rm -f invaders
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	install -D -m644 $(INSTFLAGS) invaders.exec debian/grub-invaders/boot/invaders
+	install -D -m755 debian/scripts/grub debian/grub-invaders/etc/grub.d/22_invaders
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs README
+	dh_installchangelogs
+	dh_installexamples debian/examples/*
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Property changes on: packages/trunk/invaders/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/trunk/invaders/debian/scripts/grub
===================================================================
--- packages/trunk/invaders/debian/scripts/grub	                        (rev 0)
+++ packages/trunk/invaders/debian/scripts/grub	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,10 @@
+#!/bin/bash -e
+
+if test -e /boot/invaders ; then
+  echo "Found GRUB Invaders image: /boot/invaders" >&2
+  cat << EOF
+menuentry "GRUB Invaders" {
+	multiboot	${GRUB_DRIVE_BOOT}/invaders
+}
+EOF
+fi

Added: packages/trunk/invaders/debian/watch
===================================================================
--- packages/trunk/invaders/debian/watch	                        (rev 0)
+++ packages/trunk/invaders/debian/watch	2008-04-16 18:30:49 UTC (rev 6592)
@@ -0,0 +1,2 @@
+version=3
+http://www.erikyyy.de/invaders/invaders-(.*)\.tar\.gz




More information about the Pkg-games-commits mailing list