From: Russ Allbery <rra@debian.org>
Date: Wed, 4 Oct 2006 18:52:39 +0000 (+0000)
Subject: * The UTS_RELEASE string is no longer found in linux/version.h in
X-Git-Tag: debian/1.4.2.fc4-3~1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0d1b9b97327b242688e5a59c6ded08a92eab6ff0;p=packages%2Fo%2Fopenafs.git

* The UTS_RELEASE string is no longer found in linux/version.h in
  2.6.18, so fall back on looking in config/kernel.release.  Thanks to
  Marcus Watts for the patch.
---

diff --git a/debian/changelog b/debian/changelog
index 2f8e4dcd7..90eaa1acf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 openafs (1.4.2~fc4-3) unstable; urgency=low
 
   * Apply upstream patch to fix klog segfaults.  (Closes: #390940)
+  * The UTS_RELEASE string is no longer found in linux/version.h in
+    2.6.18, so fall back on looking in config/kernel.release.  Thanks to
+    Marcus Watts for the patch.
 
- -- Russ Allbery <rra@debian.org>  Tue,  3 Oct 2006 17:09:23 -0700
+ -- Russ Allbery <rra@stanford.edu>  Wed,  4 Oct 2006 11:52:20 -0700
 
 openafs (1.4.2~fc4-2) unstable; urgency=low
 
diff --git a/debian/kernel-version b/debian/kernel-version
index 093e7d91c..a1985a277 100755
--- a/debian/kernel-version
+++ b/debian/kernel-version
@@ -8,8 +8,17 @@ my $ksrc = shift;
 unless ($ksrc && open (VERSION, "$ksrc/include/linux/version.h")) {
     exit 0;
 }
+my $found;
 my $line = <VERSION>;
 if ($line =~ /"(.+)"/) {
     print "$1\n";
+    $found = 1;
+}
+exit 0 if $found;
+unless (open (VERSION, "$ksrc/include/config/kernel.release")) {
+    exit 0;
+}
+if ($line = <VERSION>) {
+    print "$line";
 }
 exit 0;