r3474 - trunk/kernel/source/linux-kernel-2.6.12/debian

Andres Salomon dilinger@costa.debian.org
Tue, 12 Jul 2005 11:02:40 +0000


Author: dilinger
Date: 2005-07-12 11:02:40 +0000 (Tue, 12 Jul 2005)
New Revision: 3474

Modified:
   trunk/kernel/source/linux-kernel-2.6.12/debian/rules
Log:
Since the source package name is no longer indicative of the upstream kernel
version, we need to grab it from the package version instead.  Hopefully this
won't cause things to break too terribly if we decide to mess around w/ the
upstream version (ie, 2.6.12.99.rc3-1 or something).


Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/rules
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/rules	2005-07-12 10:57:24 UTC (rev 3473)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/rules	2005-07-12 11:02:40 UTC (rev 3474)
@@ -8,12 +8,12 @@
 #
 SHELL    := sh -e
 karch    := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-version  := $(shell dpkg-parsechangelog | sed -n 's/^Source: linux-kernel-\(.\+\)$$/\1/p')
+srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
+version  := $(word 1,$(subst -, ,$(srcver)))
+ltver    := $(word 2,$(subst -, ,$(srcver)))
 major_v  := $(word 1,$(subst ., ,$(version)))
 minor_v  := $(word 2,$(subst ., ,$(version)))
 major    := $(major_v).$(minor_v)
-srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-ltver    := $(word 2,$(subst -, ,$(srcver)))
 release  := $(version)-$(ltver)
 uver     := $(subst .,_,$(version))
 #