r1578 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian

Joshua Kwan joshk@haydn.debian.org
Mon, 13 Sep 2004 07:55:13 -0600


Author: joshk
Date: 2004-09-13 07:54:53 -0600 (Mon, 13 Sep 2004)
New Revision: 1578

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
Log:
fix $(upstream) regex

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-09-12 04:05:13 UTC (rev 1577)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-09-13 13:54:53 UTC (rev 1578)
@@ -3,8 +3,9 @@
   * Split out many monolithic diffs into smaller diffs for easy submission
     to upstream.
   * Annotate all diffs for the same purpose.
+  * Fix $(upstream) regex, thanks Michael Tokarev. 
 
- -- Joshua Kwan <joshk@triplehelix.org>  Sat,  4 Sep 2004 13:08:07 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Mon, 13 Sep 2004 06:54:17 -0700
 
 kernel-source-2.4.27 (2.4.27-5) unstable; urgency=high
 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2004-09-12 04:05:13 UTC (rev 1577)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2004-09-13 13:54:53 UTC (rev 1578)
@@ -11,7 +11,7 @@
 #export DH_VERBOSE=1
 
 release := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
-upstream := $(shell echo "$(release)" | sed 's/:\?\([0-9\.]\+\)-[0-9]*/\1/')
+upstream := $(shell echo "$(release)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
 patch_home := debian/kernel-patch-debian-$(upstream)/usr/src/kernel-patches/all/$(upstream)
 
 # Helpful things for developers