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

[Andres Salomon]

Author: dilinger
Date: 2005-07-09 23:36:15 +0000 (Sat, 09 Jul 2005)
New Revision: 3429

Modified:
   trunk/kernel/source/linux-kernel-2.6.12/debian/rules
Log:
future-proof $(major); we don't want an upstream of 2.6.12.1 (for example)
returning a $(major) of 2.6.12.  It might be better to have $(major) be
the actual major version (ie, 2), and export $(minor) as well (ie, 6).


Modified: trunk/kernel/source/linux-kernel-2.6.12/debian/rules
===================================================================
--- trunk/kernel/source/linux-kernel-2.6.12/debian/rules	2005-07-09 23:26:20 UTC (rev 3428)
+++ trunk/kernel/source/linux-kernel-2.6.12/debian/rules	2005-07-09 23:36:15 UTC (rev 3429)
@@ -3,6 +3,8 @@
 # Required variables
 # 
 version  := $(shell dpkg-parsechangelog | sed -n 's/^Source: linux-kernel-\(.\+\)$$/\1/p')
+major_v  := $(wordlist 1,1,$(subst ., ,$(version)))
+minor_v  := $(wordlist 2,2,$(subst ., ,$(version)))
 abiname  := 1
 ltver    := 1
 #
@@ -10,7 +12,7 @@
 #
 SHELL    := sh -e
 karch    := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-major    := $(basename $(version))
+major    := $(major_v).$(minor_v)
 srcver   := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 release  := $(version)-$(ltver)
 uver     := $(subst .,_,$(version))