[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

please unblock invaders 1.0.0-8



Dear release team,

please let invaders 1.0.0-8 enter testing. It contains a fix to close #492267, which makes sure it works with current versions of grub2, i.e. especially the version which currently *is* in testing.

The interdiff is rather small, please find it attached. The fix has been discussed with the GRUB maintainers and the packages has been sponsored by Robert Millan.

Thank you.

Cheers,
Fabian

--->8---

diff -u invaders-1.0.0/debian/scripts/grub invaders-1.0.0/debian/scripts/grub
--- invaders-1.0.0/debian/scripts/grub
+++ invaders-1.0.0/debian/scripts/grub
@@ -1,10 +1,15 @@
 #!/bin/bash -e

 if test -e /boot/invaders ; then
+  source /usr/lib/grub/update-grub_lib
+ INVADERSPATH=$( make_system_path_relative_to_its_root "/boot/invaders" )
   echo "Found GRUB Invaders image: /boot/invaders" >&2
   cat << EOF
 menuentry "GRUB Invaders" {
-	multiboot	${GRUB_DRIVE_BOOT}/invaders
+EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/g"
+  cat << EOF
+	multiboot	${INVADERSPATH}
 }
 EOF
 fi
diff -u invaders-1.0.0/debian/changelog invaders-1.0.0/debian/changelog
--- invaders-1.0.0/debian/changelog
+++ invaders-1.0.0/debian/changelog
@@ -1,3 +1,22 @@
+invaders (1.0.0-8) unstable; urgency=low
+
+  * debian/control:
+    + Set Maintainer to Debian Games Team and added myself to Uploaders.
+    + Added Vcs-Svn and Vcs-Browser fields.
+    + Bumped Suggests to 'grub2 (>= 1.96+20080531-1)'.
+  * debian/patches/01-pointer-targets-differ-in-signedness.dpatch:
+ + Fixed misspelling: "YOU LOOSE" should be "YOU LOSE" (Closes: #478928).
+      Thanks Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>.
+  * debian/scripts/grub:
+ + Fixed to use functions out of /usr/lib/grub/update-grub_lib instead of
+      ${GRUB_DRIVE_BOOT} (Closes: #492267). Thanks
+      Justin B Rye <jbr@edlug.org.uk>.
+    + Added a missing "prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}"
+ call. Without it, it could break if /boot/ is in a different device than + whatever came before invaders. Thanks Robert Millan <rmh@aybabtu.com>.
+
+ -- Fabian Greffrath <fabian@debian-unofficial.org> Fri, 1 Aug 2008 14:44:00 +0100
+
 invaders (1.0.0-7) unstable; urgency=low

   * debian/postinst:
diff -u invaders-1.0.0/debian/patches/01-pointer-targets-differ-in-signedness.dpatch invaders-1.0.0/debian/patches/01-pointer-targets-differ-in-signedness.dpatch --- invaders-1.0.0/debian/patches/01-pointer-targets-differ-in-signedness.dpatch +++ invaders-1.0.0/debian/patches/01-pointer-targets-differ-in-signedness.dpatch
@@ -15,7 +15,7 @@
 -  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,11,(uint8 *) (winner ? " YOU WIN " : " YOU LOSE "));
 +  video_putstring(30,12,(uint8 *) "  PRESS ESC  ");
    video_update();
    do{
diff -u invaders-1.0.0/debian/control invaders-1.0.0/debian/control
--- invaders-1.0.0/debian/control
+++ invaders-1.0.0/debian/control
@@ -1,15 +1,18 @@
 Source: invaders
 Section: misc
 Priority: optional
-Maintainer: Fabian Greffrath <fabian@debian-unofficial.org>
+Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Uploaders: Fabian Greffrath <fabian@debian-unofficial.org>
 Build-Depends: debhelper (>= 5), dpatch
 Standards-Version: 3.7.3
 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/

 Package: grub-invaders
 Architecture: i386 hurd-i386 kfreebsd-i386 amd64 kfreebsd-amd64
 Depends: ${misc:Depends}
-Suggests: grub2 (>= 1.95+20080116-1)
+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.

---8<---

--
Dipl.-Phys. Fabian Greffrath

Ruhr-Universität Bochum
Lehrstuhl für Energieanlagen und Energieprozesstechnik (LEAT)
Universitätsstr. 150, IB 3/134
D-44780 Bochum

Telefon: +49 (0)234 / 32-26334
Fax:     +49 (0)234 / 32-14227
E-Mail:  greffrath@leat.ruhr-uni-bochum.de


Reply to: