Author: fabian-guest
Date: 2009-08-14 08:39:59 +0000 (Fri, 14 Aug 2009)
New Revision: 10132
Added:
packages/trunk/invaders/debian/clean
packages/trunk/invaders/debian/grub-invaders.docs
packages/trunk/invaders/debian/grub-invaders.examples
packages/trunk/invaders/debian/grub-invaders.install
packages/trunk/invaders/debian/grub-invaders.postinst
packages/trunk/invaders/debian/grub-invaders.postrm
packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch
packages/trunk/invaders/debian/patches/02-amd64.patch
packages/trunk/invaders/debian/scripts/22_invaders
Removed:
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/postinst
packages/trunk/invaders/debian/postrm
packages/trunk/invaders/debian/scripts/grub
Modified:
packages/trunk/invaders/debian/changelog
packages/trunk/invaders/debian/control
packages/trunk/invaders/debian/copyright
packages/trunk/invaders/debian/examples/grub-menu.lst
packages/trunk/invaders/debian/patches/series
packages/trunk/invaders/debian/rules
Log:
invaders (1.0.0-9) unstable; urgency=low
* debian/clean, debian/grub-invaders.{docs,examples,install}:
+ Added.
* debian/compat:
+ Raised debhelper compatibility to 7.
* debian/control:
+ Raised Build-Depends to debhelper (>= 7.2) and quilt (>= 0.46-7).
+ Bumped Standards-Version to 3.8.2.
* debian/copyright:
+ Relicensed the Debian packaging under the GNU All-Permissive License.
* debian/examples/grub-menu.lst, debian/scripts/22_invaders:
+ Use the original filename "invaders.exec" instead of "invaders".
* debian/grub-invaders.post{inst,rm}:
+ Renamed from post{inst,rm}.
* debian/rules:
+ Converted to debhelper 7.2.
+ Improved stripping.
* debian/scripts/22_invaders:
+ Renamed from debian/scripts/grub.
+ Use grub-mkconfig_lib instead of the deprecated update-grub_lib
(Closes: #539947). Thanks Didier 'OdyX' Raboud.
Modified: packages/trunk/invaders/debian/changelog
===================================================================
--- packages/trunk/invaders/debian/changelog 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/changelog 2009-08-14 08:39:59 UTC (rev
10132)
@@ -1,39 +1,40 @@
invaders (1.0.0-9) unstable; urgency=low
+ * debian/clean, debian/grub-invaders.{docs,examples,install}:
+ + Added.
+ * debian/compat:
+ + Raised debhelper compatibility to 7.
* debian/control:
+ Changed Section from misc to kernel.
- + Bumped Standards-Version to 3.8.1.
+ + Raised Build-Depends to debhelper (>= 7.2) and quilt (>= 0.46-7).
+ + Bumped Standards-Version to 3.8.2.
+ 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/*:
+ + Relicensed the Debian packaging under the GNU All-Permissive License.
+ * debian/examples/grub-menu.lst, debian/scripts/22_invaders:
+ + Use the original filename "invaders.exec" instead of "invaders".
+ * debian/grub-invaders.post{inst,rm}:
+ + Renamed from post{inst,rm}.
+ * debian/patches/:
+ Switched from dpatch to quilt for patch management.
- + Applied a patch from Carl-Daniel Hailfinger
+ + Applied fixes 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:
+ <http://www.coreboot.org/pipermail/coreboot/2009-April/046558.html>:
+ * debian/patches/01-pointer-targets-differ-in-signedness.dpatch:
+ 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.
- * debian/scripts/grub:
- + Use grub-mkconfig_lib instead of the deprecated update-grub_lib.
+ + Fix incompatibility with newer gcc and binutils.
+ * debian/rules:
+ + Converted to debhelper 7.2.
+ + Improved stripping.
+ * debian/scripts/22_invaders:
+ + Renamed from debian/scripts/grub.
+ + Use grub-mkconfig_lib instead of the deprecated update-grub_lib
+ (Closes: #539947). Thanks Didier 'OdyX' Raboud.
- -- Fabian Greffrath <[email protected]> Thu, 28 May 2009 10:07:08
+0200
+ -- Fabian Greffrath <[email protected]> Fri, 14 Aug 2009 10:25:26
+0200
invaders (1.0.0-8) unstable; urgency=low
Added: packages/trunk/invaders/debian/clean
===================================================================
--- packages/trunk/invaders/debian/clean (rev 0)
+++ packages/trunk/invaders/debian/clean 2009-08-14 08:39:59 UTC (rev
10132)
@@ -0,0 +1 @@
+invaders
Modified: packages/trunk/invaders/debian/control
===================================================================
--- packages/trunk/invaders/debian/control 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/control 2009-08-14 08:39:59 UTC (rev
10132)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Games Team <[email protected]>
Uploaders: Fabian Greffrath <[email protected]>
-Build-Depends: debhelper (>= 7), quilt
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.2), quilt (>= 0.46-7)
+Standards-Version: 3.8.2
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/
Modified: packages/trunk/invaders/debian/copyright
===================================================================
--- packages/trunk/invaders/debian/copyright 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/copyright 2009-08-14 08:39:59 UTC (rev
10132)
@@ -44,6 +44,6 @@
Files: debian/*
Copyright: © 2007-2009, Fabian Greffrath <[email protected]>
License: GAP
- Copying and distribution of this file, with or without modification,
+ Copying and distribution of the Debian packaging, with or without
modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved.
Modified: packages/trunk/invaders/debian/examples/grub-menu.lst
===================================================================
--- packages/trunk/invaders/debian/examples/grub-menu.lst 2009-08-13
16:56:26 UTC (rev 10131)
+++ packages/trunk/invaders/debian/examples/grub-menu.lst 2009-08-14
08:39:59 UTC (rev 10132)
@@ -5,4 +5,4 @@
title GRUB Invaders
root (hd0,0)
-kernel /boot/invaders
+kernel /boot/invaders.exec
Added: packages/trunk/invaders/debian/grub-invaders.docs
===================================================================
--- packages/trunk/invaders/debian/grub-invaders.docs
(rev 0)
+++ packages/trunk/invaders/debian/grub-invaders.docs 2009-08-14 08:39:59 UTC
(rev 10132)
@@ -0,0 +1 @@
+README
Added: packages/trunk/invaders/debian/grub-invaders.examples
===================================================================
--- packages/trunk/invaders/debian/grub-invaders.examples
(rev 0)
+++ packages/trunk/invaders/debian/grub-invaders.examples 2009-08-14
08:39:59 UTC (rev 10132)
@@ -0,0 +1 @@
+debian/examples/*
Added: packages/trunk/invaders/debian/grub-invaders.install
===================================================================
--- packages/trunk/invaders/debian/grub-invaders.install
(rev 0)
+++ packages/trunk/invaders/debian/grub-invaders.install 2009-08-14
08:39:59 UTC (rev 10132)
@@ -0,0 +1,2 @@
+invaders.exec boot
+debian/scripts/22_invaders etc/grub.d
Copied: packages/trunk/invaders/debian/grub-invaders.postinst (from rev 10131,
packages/trunk/invaders/debian/postinst)
===================================================================
--- packages/trunk/invaders/debian/grub-invaders.postinst
(rev 0)
+++ packages/trunk/invaders/debian/grub-invaders.postinst 2009-08-14
08:39:59 UTC (rev 10132)
@@ -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
Copied: packages/trunk/invaders/debian/grub-invaders.postrm (from rev 10131,
packages/trunk/invaders/debian/postrm)
===================================================================
--- packages/trunk/invaders/debian/grub-invaders.postrm
(rev 0)
+++ packages/trunk/invaders/debian/grub-invaders.postrm 2009-08-14 08:39:59 UTC
(rev 10132)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ -x "`which update-grub2 2>/dev/null`" ]; then update-grub2 ; fi
+
+#DEBHELPER#
+
+exit 0
Deleted: packages/trunk/invaders/debian/patches/01-incomplete-clean.patch
===================================================================
--- packages/trunk/invaders/debian/patches/01-incomplete-clean.patch
2009-08-13 16:56:26 UTC (rev 10131)
+++ packages/trunk/invaders/debian/patches/01-incomplete-clean.patch
2009-08-14 08:39:59 UTC (rev 10132)
@@ -1,10 +0,0 @@
-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
Added:
packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch
===================================================================
---
packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch
(rev 0)
+++
packages/trunk/invaders/debian/patches/01-pointer-targets-differ-in-signedness.patch
2009-08-14 08:39:59 UTC (rev 10132)
@@ -0,0 +1,35 @@
+Use (char *) instead of (uint8 *) and fix a spelling error.
+
+--- 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();
+--- 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{
Copied: packages/trunk/invaders/debian/patches/02-amd64.patch (from rev 10131,
packages/trunk/invaders/debian/patches/04-amd64.patch)
===================================================================
--- packages/trunk/invaders/debian/patches/02-amd64.patch
(rev 0)
+++ packages/trunk/invaders/debian/patches/02-amd64.patch 2009-08-14
08:39:59 UTC (rev 10132)
@@ -0,0 +1,15 @@
+Support for building on amd64 and fix an incompatibility with newer gcc and
binutils.
+
+--- 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"
++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
Deleted:
packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch
===================================================================
--- packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch
2009-08-13 16:56:26 UTC (rev 10131)
+++ packages/trunk/invaders/debian/patches/02-binutils-incompatibility.patch
2009-08-14 08:39:59 UTC (rev 10132)
@@ -1,13 +0,0 @@
-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
Deleted: packages/trunk/invaders/debian/patches/03-wrong-datatype.patch
===================================================================
--- packages/trunk/invaders/debian/patches/03-wrong-datatype.patch
2009-08-13 16:56:26 UTC (rev 10131)
+++ packages/trunk/invaders/debian/patches/03-wrong-datatype.patch
2009-08-14 08:39:59 UTC (rev 10132)
@@ -1,24 +0,0 @@
-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();
Deleted: packages/trunk/invaders/debian/patches/04-amd64.patch
===================================================================
--- packages/trunk/invaders/debian/patches/04-amd64.patch 2009-08-13
16:56:26 UTC (rev 10131)
+++ packages/trunk/invaders/debian/patches/04-amd64.patch 2009-08-14
08:39:59 UTC (rev 10132)
@@ -1,15 +0,0 @@
-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
Deleted: packages/trunk/invaders/debian/patches/05-fix-misspelling.patch
===================================================================
--- packages/trunk/invaders/debian/patches/05-fix-misspelling.patch
2009-08-13 16:56:26 UTC (rev 10131)
+++ packages/trunk/invaders/debian/patches/05-fix-misspelling.patch
2009-08-14 08:39:59 UTC (rev 10132)
@@ -1,13 +0,0 @@
-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{
Modified: packages/trunk/invaders/debian/patches/series
===================================================================
--- packages/trunk/invaders/debian/patches/series 2009-08-13 16:56:26 UTC
(rev 10131)
+++ packages/trunk/invaders/debian/patches/series 2009-08-14 08:39:59 UTC
(rev 10132)
@@ -1,5 +1,2 @@
-01-incomplete-clean.patch
-02-binutils-incompatibility.patch
-03-wrong-datatype.patch
-04-amd64.patch
-05-fix-misspelling.patch
+01-pointer-targets-differ-in-signedness.patch
+02-amd64.patch
Deleted: packages/trunk/invaders/debian/postinst
===================================================================
--- packages/trunk/invaders/debian/postinst 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/postinst 2009-08-14 08:39:59 UTC (rev
10132)
@@ -1,13 +0,0 @@
-#!/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
Deleted: packages/trunk/invaders/debian/postrm
===================================================================
--- packages/trunk/invaders/debian/postrm 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/postrm 2009-08-14 08:39:59 UTC (rev
10132)
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -x "`which update-grub2 2>/dev/null`" ]; then update-grub2 ; fi
-
-#DEBHELPER#
-
-exit 0
Modified: packages/trunk/invaders/debian/rules
===================================================================
--- packages/trunk/invaders/debian/rules 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/rules 2009-08-14 08:39:59 UTC (rev
10132)
@@ -1,53 +1,22 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+%:
+ dh --with quilt $@
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTFLAGS += -s
-endif
-
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
- dh_testdir
-
+override_dh_auto_build:
sh ./compile.sh
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
+override_dh_auto_clean:
sh ./clean.sh
- rm -f invaders
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- 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
+override_dh_fixperms:
dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ chmod 0644 debian/grub-invaders/boot/invaders.exec
+ chmod 0755 debian/grub-invaders/etc/grub.d/22_invaders
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_strip:
+ dh_strip
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ strip --remove-section=.comment --remove-section=.note \
+ debian/grub-invaders/boot/invaders.exec
+endif
Copied: packages/trunk/invaders/debian/scripts/22_invaders (from rev 10131,
packages/trunk/invaders/debian/scripts/grub)
===================================================================
--- packages/trunk/invaders/debian/scripts/22_invaders
(rev 0)
+++ packages/trunk/invaders/debian/scripts/22_invaders 2009-08-14 08:39:59 UTC
(rev 10132)
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+if test -e /boot/invaders.exec ; then
+ source /usr/lib/grub/grub-mkconfig_lib
+ INVADERSPATH=$( make_system_path_relative_to_its_root "/boot/invaders.exec" )
+ echo "Found GRUB Invaders image: /boot/invaders.exec" >&2
+ cat << EOF
+menuentry "GRUB Invaders" {
+EOF
+ prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/g"
+ cat << EOF
+ multiboot ${INVADERSPATH}
+}
+EOF
+fi
Deleted: packages/trunk/invaders/debian/scripts/grub
===================================================================
--- packages/trunk/invaders/debian/scripts/grub 2009-08-13 16:56:26 UTC (rev
10131)
+++ packages/trunk/invaders/debian/scripts/grub 2009-08-14 08:39:59 UTC (rev
10132)
@@ -1,15 +0,0 @@
-#!/bin/bash -e
-
-if test -e /boot/invaders ; then
- source /usr/lib/grub/grub-mkconfig_lib
- INVADERSPATH=$( make_system_path_relative_to_its_root "/boot/invaders" )
- echo "Found GRUB Invaders image: /boot/invaders" >&2
- cat << EOF
-menuentry "GRUB Invaders" {
-EOF
- prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/g"
- cat << EOF
- multiboot ${INVADERSPATH}
-}
-EOF
-fi
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
