[kernel] r11305 - in dists/trunk/linux-2.6/debian: . lib/python/debian_linux

[Daniel Baumann]

Author: daniel
Date: Tue May  6 10:42:03 2008
New Revision: 11305

Log:
Re-adding dropped process_version_linux argument in linux-support to make conglomeration packages work again.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue May  6 10:42:03 2008
@@ -14,6 +14,10 @@
     EEEPC_LAPTOP.
   * [amd64]: Enable SCSI_DPT_I2O as 64 bit now.
 
+  [ Daniel Baumann ]
+  * Re-adding dropped process_version_linux argument in linux-support to
+    make conglomeration packages work again.
+
  -- maximilian attems <maks at debian.org>  Sat, 26 Apr 2008 23:11:17 +0200
 
 linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Tue May  6 10:42:03 2008
@@ -275,6 +275,15 @@
             entries.append(self.process_package(i, vars))
         return entries
 
+    def process_version_linux(self, version, abiname):
+    	return {
+	    'upstreamversion': version.linux_upstream,
+	    'version': version.linux_version,
+	    'source_upstream': version.upstream,
+	    'major': version.linux_major,
+	    'abiname': abiname,
+	}
+
     def substitute(self, s, vars):
         if isinstance(s, (list, tuple)):
             for i in xrange(len(s)):