fix copyright

module-init-tools dep
gdth
lilo minor parsing fixes

6 files changed, 47 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index bfbd682..a2e8cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,28 @@
-initramfs-tools (0.57) unstable; urgency=low
+initramfs-tools (0.59) unstable; urgency=low
+
+  * debian/copyright: Add years of copyright and authors.
+
+ -- maximilian attems <maks@sternwelten.at>  Sun, 26 Mar 2006 21:04:28 +0200
+
+initramfs-tools (0.58) unstable; urgency=low
+
+  * hook-functions: Be more carefull about the minor parsing. The fix of
+    #357332 works for 3 digit roots, but not for hdc6 aka root=1606.
+    Thanks Martijn Pieters <mj@zopatista.com> for report
+    (closes: #358354, #358740).
+
+  * hook-functions: Add gdth to the scsi modules.
+
+  * mkinitramfs-kpkg: Use set -eu to capture full /boot.
+    Really (closes: #350875)
+
+  * Add dependency on module-init-tools. (closes: #358632)
+
+  * Don't include full path for man page reference. (closes: #358371)
+
+ -- maximilian attems <maks@sternwelten.at>  Sun, 26 Mar 2006 16:39:37 +0200
+
+initramfs-tools (0.57b) unstable; urgency=low
 
   * mkinitramfs, update-initramfs, hook-functions:
     On verbose mode show, which modules gets added to the initramfs.
@@ -7,7 +31,7 @@ initramfs-tools (0.57) unstable; urgency=low
     to Petter Reinholdtsen <pere@hungry.com>. (closes: #357980)
 
   * initramfs-tools.8: Document that `-' is not allowed to be used in a script
-    filename - the filenames get used as shell variable.  (closes: #355235)
+    filename - the filenames get used as shell variable.  (closes: #344639)
 
   * mkinitramfs: Don't exit succesfully in a case of a full fs. Leaves the
     linux-image unconfigured. Thanks martin f krafft <madduck@debian.org>
diff --git a/debian/control b/debian/control
index b4124ab..01ddf3b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.6.2.0
 
 Package: initramfs-tools
 Architecture: all
-Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, udev (>= 0.076-5)
+Depends: klibc-utils (>= 1.1.16-1), busybox (>= 1:1.01-3) | busybox-cvs-static (>= 20040623-1), cpio, module-init-tools, udev (>= 0.076-5)
 Provides: linux-initramfs-tool
 Description: tools for generating an initramfs
  This package contains tools to create and boot an initramfs for prepackaged
diff --git a/debian/copyright b/debian/copyright
index d495248..3a3bc5b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,7 @@
 This package was debianized by Jeff Bailey <jbailey@ubuntu.com> on
 Thu, 27 Jan 2005 15:23:52 -0500.
 
-Copyright:
-
-Author: Jeff Bailey <jbailey@ubuntu.com>
+The current Debian maintainer is maximilian attems <maks@sternwelten.at>
 
 The source code up to 0.31 can be found by using "bzr" at:
 http://people.ubuntu.com/~jbailey/bzrtree/initramfs-tools
@@ -14,6 +12,15 @@ http://archive.ubuntu.com/ubuntu/pool/main/i/initramfs-tools/
 The Debian tree is maintained with "bzr" at:
 http://debian.stro.at/bzr-test/initramfs-tools/
 
+Authors: Jeff Bailey <jbailey@ubuntu.com>, Adam Conrad <adconrad@ubuntu.com>,
+	 Scott James Remnant <scott@ubuntu.com>, 
+	 maximilian attems <maks@sternwelten.at>
+
+Copyright: 2005 Jeff Bailey
+	   2005 - 2006 Adam Conrad
+	   2005 - 2006 Scott James Remnant
+	   2005 - 2006 maximilian attems
+
 License:
 
 PUBLIC DOMAIN
diff --git a/hook-functions b/hook-functions
index efce32d..874d55f 100644
--- a/hook-functions
+++ b/hook-functions
@@ -170,7 +170,7 @@ auto_add_modules()
 		for x in 3w-9xxx 3w-xxxx a100u2x aacraid advansys ahci \
 		aic79xx aic7xxx ata_piix atari_scsi atp870u BusLogic \
 		cciss ch cpqarray dac960 dc395x dmx3191d dpt_i2o eata fdomain \
-		ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \
+		gdth ibmvscsic initio ipr ips isp1020 lpfc max_scsi mac53c94 \
 		megaraid megaraid_mbox megaraid_mm mesh mptfc mptscsih \
 		mptsas mptspi nsp32 osst qla1280 qla2100 qla2200 qla2300 \
 		qla2322 qla2xxx qla6312 qlogicfas408 qlogicfc sata_mv \
@@ -220,7 +220,7 @@ Options:
   -o outfile  Write to outfile.
   -r root     Override ROOT setting in mkinitrd.conf.
 
-See ${0}(8) for further details.
+See mkinitramfs(8) for further details.
 EOF
 	exit 1
 
diff --git a/mkinitramfs-kpkg b/mkinitramfs-kpkg
index d36710a..8d32005 100644
--- a/mkinitramfs-kpkg
+++ b/mkinitramfs-kpkg
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -eu
 
 STATEDIR=/var/lib/initramfs-tools
 
@@ -10,7 +11,7 @@ Usage: ${0} <-o outfile> [version]
 
 Please use update-initramfs(8):
 ${0} exists for compatibility by kernel-package(5) calls.
-See ${0}(8) for further details.
+See mkinitramfs-kpkg(8) for further details.
 EOF
 	exit 1
 }
diff --git a/scripts/functions b/scripts/functions
index 05b7779..8cf6ddc 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -189,6 +189,7 @@ load_modules()
 	fi
 }
 
+# lilo compatibility
 parse_numeric() {
 	case $1 in
 	"")
@@ -201,10 +202,14 @@ parse_numeric() {
 		minor=${1#*:}
 		major=${1%:*}
 		;;
-	*)
+	[0-9][0-9][0-9])
 		minor=$((0x${1#?}))
 		major=$((0x${1%??}))
 		;;
+	*)
+		minor=$((0x${1#??}))
+		major=$((0x${1%??}))
+		;;
 	esac
 
 	mknod /dev/root b ${major} ${minor}