Update kernel module packaging scripts

* Update kernel module packaging scripts:
  - Remove selection of linux-image vs. kernel-image for kernel names.
  - Use Breaks instead of Conflicts.
  - Update standards version to 3.9.0.

diff --git a/debian/changelog b/debian/changelog
index f4d352b374fea6469b231f77eb1a0130a6ff6a51..2e49721f4d551db1d48101e7981ae9969e3e6b9b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,10 @@ openafs (1.5.75-1) UNRELEASED; urgency=low
     all.  The generated kernel source is now architecture-independent.
   * openafs-modules-source and openafs-modules-dkms now recommend an
     appropriate version of openafs-client.
+  * Update kernel module packaging scripts:
+    - Remove selection of linux-image vs. kernel-image for kernel names.
+    - Use Breaks instead of Conflicts.
+    - Update standards version to 3.9.0.
   * Remove the lpia architecture.  This was an experiment in Ubuntu that
     has apparently been dropped.
   * Add preliminary support for powerpcspe, mapping that architecture to

diff --git a/debian/module/control.in b/debian/module/control.in
index 260b195a7d8a1a9b93505f0e5c169c20b21f2305..69e7e882ab8c9fdd189de59ee56a68ea8c354d6e 100644 (file)
--- a/debian/module/control.in
+++ b/debian/module/control.in
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Russ Allbery <rra@debian.org>
 Uploaders: Sam Hartman <hartmans@debian.org>
 Build-Depends: debhelper (>= 5), flex, bison
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
 
 Package: openafs-modules-=KVERS
-Conflicts: openafs-client (<< 1.5.61)
+Breaks: openafs-client (<< 1.5.61)
 Provides: openafs-modules3
 Architecture: any
-Recommends: =IMG-=KVERS
+Recommends: linux-image-=KVERS
 Description: AFS distributed filesystem kernel module
  AFS is a distributed filesystem allowing cross-platform sharing of
  files among multiple computers.  Facilities are provided for access

diff --git a/debian/module/prep-modules b/debian/module/prep-modules
index 03c37d8de603684c909435611c08bfcbb9ace373..91846ea0fed0aa2f88210d47703b3f55a5a37be2 100755 (executable)
--- a/debian/module/prep-modules
+++ b/debian/module/prep-modules
@@ -7,12 +7,13 @@
 #    major kernel revision plus the debian subrevision and whatever
 #    architecture string is appropriate if building against the stock Debian
 #    kernels.  $(KVERS) should be identical to the version component contained
-#    in the Debian kernel package names.
+#    in the Debian kernel package names (in other words, the ABI version, not
+#    the package version)..
 #
-#  * Make the package recommend either kernel-image-$(KVERS) or
-#    linux-image-$(KVERS) as appropriate for the kernel version that we're
-#    building against.  Use recommend rather than depends since the user may
-#    have built their own kernel outside of the Debian package infrastructure.
+#  * Make the package recommend linux-image-$(KVERS) as appropriate for the
+#    kernel version that we're building against.  Use recommend rather than
+#    depends since the user may have built their own kernel outside of the
+#    Debian package infrastructure.
 #
 #  * Save the version number of the binary package in debian/VERSION for later
 #    use by dh_gencontrol.  This will be the version number of the source
@@ -29,7 +30,7 @@
 set -e
 
 if [ "$#" -ne 1 ]; then
-    echo Usage: $0 kernelsource-location
+    echo "Usage: $0 <kernel-source-location>" >&2
     exit 1
 fi
 
@@ -73,20 +74,9 @@ else
         | sed -e 's/.*source-\([^ ]*\) (\([^)]*\)).*/\2/'`
 fi
 
-# Determine the kernel package name.  For right now, assume linux-image for
-# 2.6.12 and later, and kernel-image for anything earlier.  If this doesn't
-# work for someone, please submit a bug with the details.
-
-if dpkg --compare-versions "$afs_kvers" ge "2.6.12" ; then
-    afs_image=linux-image
-else
-    afs_image=kernel-image
-fi
-
 # Generate the control file from the template.
 
-sed -e "s/=KVERS/${afs_kvers}/g" -e "s/=IMG/${afs_image}/g" \
-    debian/control.in > debian/control
+sed -e "s/=KVERS/${afs_kvers}/g" debian/control.in > debian/control
 
 # Now, calcuate the binary package version.  Extract the epoch from the kernel
 # package revision and add it to the beginning of the binary package version