Minor packaging updates, ACKed by Jimmy.

diff --git a/debian/README b/debian/README
index 2adf493..9004e4d 100644 (file)
--- a/debian/README
+++ b/debian/README
@@ -2,9 +2,10 @@ The Debian Package grml-rescueboot
 ----------------------------------
 
 Usually systems are rescued with CD or usb stick. grml-rescueboot makes
 ----------------------------------
 
 Usually systems are rescued with CD or usb stick. grml-rescueboot makes

-it possible to simply copy an ISO image onto harddisk and boot the
+it possible to simply copy an ISO image to the harddisk and boot the

 rescue image. This eliminates the need to carry around a usb stick
 to rescue a system.
 rescue image. This eliminates the need to carry around a usb stick
 to rescue a system.

+

 grml-rescueboot includes the script 42_grml which is installed in
 /etc/grub.d and run when update-grub is executed. The script looks for
 ISO images in /boot/grml/ and adds an entry for each image found.
 grml-rescueboot includes the script 42_grml which is installed in
 /etc/grub.d and run when update-grub is executed. The script looks for
 ISO images in /boot/grml/ and adds an entry for each image found.


@@ -12,7 +13,7 @@ ISO images in /boot/grml/ and adds an entry for each image found.
 Howto:
 ------
 
 Howto:
 ------
 

-- Get a recent grml image from http://grml.org/download/
+- Get a recent Grml image from http://grml.org/download/

 - Copy the image to /boot/grml
 - Run update-grub
 - Reboot and enjoy your new rescue system
 - Copy the image to /boot/grml
 - Run update-grub
 - Reboot and enjoy your new rescue system


@@ -23,7 +24,8 @@ Limitations:
 grml-rescueboot uses the loopback feature of grub2, so it won't work
 with legacy grub. Furthermore the ISO image needs to support
 loopback.cfg, a file which is placed in /boot/grub/. Grml supports
 grml-rescueboot uses the loopback feature of grub2, so it won't work
 with legacy grub. Furthermore the ISO image needs to support
 loopback.cfg, a file which is placed in /boot/grub/. Grml supports

-loopback.cfg beginning with version 2010.04.
+loopback.cfg beginning with release version 2010.04.
+

 More technical details can be found here: 
 http://www.supergrubdisk.org/wiki/Loopback.cfg
 
 More technical details can be found here: 
 http://www.supergrubdisk.org/wiki/Loopback.cfg
 

diff --git a/debian/copyright b/debian/copyright
index c55bbc7..24bbe1e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,13 +8,14 @@ It was downloaded from:
 
 Copyright:
 
 
 Copyright:
 

-    <Copyright (C) 2010++ Andreas "Jimmy" Gredler>
+    Copyright (C) 2010 Andreas "Jimmy" Gredler
+    Copyright (C) 2010 Michael Prokop

 
 License:
 
     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
 
 License:
 
     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 3 of the License, or
+    the Free Software Foundation, either version 2 of the License, or

     (at your option) any later version.
 
     This package is distributed in the hope that it will be useful,
     (at your option) any later version.
 
     This package is distributed in the hope that it will be useful,


@@ -26,10 +27,11 @@ License:
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General

-Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

 
 The Debian packaging is:
 
     Copyright (C) 2010 Andreas "Jimmy" Gredler <jimmy@grml.org>
 
 
 The Debian packaging is:
 
     Copyright (C) 2010 Andreas "Jimmy" Gredler <jimmy@grml.org>
 

-and is licensed under the GPL version 3, see above.
+and is licensed under the GPL version 2 or (at your option) any later version,
+see above.

diff --git a/debian/postinst b/debian/postinst
index 29a15d8..99343dc 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,26 +1,17 @@
 #!/bin/sh
 # postinst script for grml-rescueboot
 #!/bin/sh
 # postinst script for grml-rescueboot

-#
-# see: dh_installdeb(1)

 
 set -e
 
 
 set -e
 

-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-

 case "$1" in
     configure)
 case "$1" in
     configure)

-      update-grub
+      if ls /boot/grml/*iso >/dev/null 2>&1 ; then
+       echo "ISOs found inside /boot/grml, invoking update-grub:"
+        update-grub
+      else
+       echo "No *.iso files found inside /boot/grml/. Please create /boot/grml and"
+       echo "place Grml ISO(s) there. Finally invoke update-grub and enjoy your rescue system."
+      fi

     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)


@@ -32,9 +23,6 @@ case "$1" in
     ;;
 esac
 
     ;;
 esac
 

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-

 #DEBHELPER#
 
 exit 0
 #DEBHELPER#
 
 exit 0

diff --git a/debian/postrm b/debian/postrm
index 8617968..6291c90 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,26 +1,11 @@
 #!/bin/sh
 # postrm script for grml-rescueboot
 #!/bin/sh
 # postrm script for grml-rescueboot

-#
-# see: dh_installdeb(1)

 
 set -e
 
 
 set -e
 

-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-

 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

+      echo "Updating grub.cfg to make sure there are no non-existing entries being left."

       update-grub
     ;;
 
       update-grub
     ;;
 


@@ -30,9 +15,6 @@ case "$1" in
     ;;
 esac
 
     ;;
 esac
 

-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-

 #DEBHELPER#
 
 exit 0
 #DEBHELPER#
 
 exit 0