[PATCH] Support for 2.2.0-pre1 style numbering for make-kpkg

[Ben Gertzfield <che@debian.org>]

Package: kernel-package
Version: 6.01

Hey folks! With the exciting new release of kernel 2.2.0-pre1 I've
noticed that there's a new feature in the Makefile that make-kpkg does
not support; the EXTRAVERSION in the kernel version that adds the
-pre1 bit.

This breaks module-related programs like depmod and insmod, as make-kpkg
creates the directory:

/lib/modules/2.2.0/

instead of

/lib/modules/2.2.0-pre1/

as it should.

Here is a patch to fix this problem. I am all set to make an NMU since
Manoj is out of town; should I do so? The patch also fixes a few
random spelling/spacing nits in the pre/post scripts.

Ben

diff -ruN kernel-package-6.01/debian/changelog kernel-package-6.01.1/debian/changelog
--- kernel-package-6.01/debian/changelog	Tue Nov 24 23:42:59 1998
+++ kernel-package-6.01.1/debian/changelog	Tue Dec 29 20:02:24 1998
@@ -1,3 +1,9 @@
+kernel-package (6.01.1) unstable; urgency=low
+
+  * NMU; adds EXTRAVERSION support for 2.2.0-preblah kernels
+
+ -- Ben Gertzfield <che@debian.org>  Tue, 29 Dec 1998 20:02:24 -0800
+
 kernel-package (6.01) unstable; urgency=low
 
   * Added support for netwinders. closes: BUG#29333
diff -ruN kernel-package-6.01/kernel/image.preinst kernel-package-6.01.1/kernel/image.preinst
--- kernel-package-6.01/kernel/image.preinst	Wed Jul 22 23:19:02 1998
+++ kernel-package-6.01.1/kernel/image.preinst	Tue Dec 29 20:00:43 1998
@@ -20,7 +20,6 @@
 
 version="=V";
 
-
 if [ "X$version" = "X" ]; then
     echo >&2 "Pre inst Internal error. Aborting."
     exit 1;
@@ -35,25 +34,25 @@
     # "prerm upgrade" has already been called for the old version of
     # this package.
     if [ -d /lib/modules/$version ]; then
-	echo >&2 "You are attempting to install a kernel image(version $version)"
+	echo >&2 "You are attempting to install a kernel image (version $version)"
 	echo >&2 "However, the directory /lib/modules/$version still exists."
 	echo >&2 "If you have deselected some modules, this could be bad."
 	echo >&2 ""
 	echo >&2 "This is your last chance to abort the installation of this"
 	echo >&2 "kernel image (nothing has been changed yet). "
 	echo >&2 ""
-	echo >&2 "I Suggest you move /lib/modules/$version out of the way,"
+	echo >&2 "I suggest you move /lib/modules/$version out of the way,"
 	echo >&2 "perhaps to /lib/modules/$version.old or something,"
 	echo >&2 "and then try re-installing this image."
 	echo >&2 ""
-	echo -n >&2 "Do you want to stop now?[Y/n] "
+	echo -n >&2 "Do you want to stop now? [Y/n] "
 	read ans;
 	case $ans in
 	    [Nn]*)
 		:
 		;;
 	    *)
-		echo >&2 "Ok, Aborting"
+		echo >&2 "OK, aborting"
 		exit 1;
 		;;
 	esac
diff -ruN kernel-package-6.01/kernel/rules kernel-package-6.01.1/kernel/rules
--- kernel-package-6.01/kernel/rules	Tue Nov 24 23:43:41 1998
+++ kernel-package-6.01.1/kernel/rules	Tue Dec 29 20:37:00 1998
@@ -238,6 +238,8 @@
                     sed -e 's/[^0-9]*\([0-9]*\)/\1/')
 SUBLEVEL:=$(shell egrep '^SUBLEVEL +=' Makefile 2>/dev/null | \
                   sed -e 's/[^0-9]*\([0-9]*\)/\1/')
+EXTRAVERSION:=$(shell egrep '^EXTRAVERSION +=' Makefile 2>/dev/null | \
+		  sed -e 's/EXTRAVERSION =\(.*\)/\1/')
 HAVE_NEW_MODLIB:=$(shell egrep '\(INSTALL_MOD_PATH)\' Makefile 2>/dev/null )
 
 # If you want to have more than one kernel configuration per kernel
@@ -262,7 +264,7 @@
 FLAV_ARG :=
 endif
 
-version = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(INT_FLAV)
+version = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)$(INT_FLAV)
 
 # SUBARCH is used to distinguish Amiga, Atari, Macintosh, etc. kernels
 # for Debian/m68k.  It only affects the naming of the kernel-image as