r3407 - trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian

[Dann Frazier]

Author: dannf
Date: 2005-06-28 00:52:05 +0000 (Tue, 28 Jun 2005)
New Revision: 3407

Modified:
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
Log:
* Fix the build so that the debian version doesn't have to be a number


Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog	2005-06-28 00:12:55 UTC (rev 3406)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/changelog	2005-06-28 00:52:05 UTC (rev 3407)
@@ -4,6 +4,7 @@
   * Add amd64-specific handling to rules files.
   * Release this package (closes: #306930) (Simon Horman)
   * Add ia64 support (dann frazier)
+  * Fix the build so that the debian version doesn't have to be a number
 
  -- dann frazier <dannf@debian.org>  Mon, 27 Jun 2005 17:58:05 -0600
 

Modified: trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules
===================================================================
--- trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-06-28 00:12:55 UTC (rev 3406)
+++ trunk/kernel/source/kernel-source-nonfree-2.6.11-2.6.11/debian/rules	2005-06-28 00:52:05 UTC (rev 3407)
@@ -11,7 +11,7 @@
 #flavours := $(shell grep "^flavours $(subarch):" debian/flavours | sed -e # 's/^flavours $(subarch): *//')
 abi := $(shell grep "^abi $(arch):" debian/flavours | sed -e 's/^abi $(arch): *//')
 
-upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$$/\1/p')
+upstream := $(shell dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-.\+$$/\1/p')
 
 #| some files in debian/ get version numbers and stuff updated on the fly
 M4 = m4 -DM4UPSTREAM="$(upstram)" -DM4ABI="$(abi)" -DM4ARCH="$(arch)" -DM4SUBARCH="$(subarch)" -DM4FLAVOUR="$(flavour)"