[kernel] r8963 - in dists/trunk/linux-modules-nonfree-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Sun Jun 10 10:07:46 2007
New Revision: 8963

Log:
* debian/bin/gencontrol.py: Adopt changes.
* debian/changelog: Update.
* debian/rules.defs: Use 2.6.21-1.


Modified:
   dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-modules-nonfree-2.6/debian/changelog
   dists/trunk/linux-modules-nonfree-2.6/debian/rules.defs

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py	Sun Jun 10 10:07:46 2007
@@ -14,8 +14,8 @@
     def do_main_setup(self, vars, makeflags, extra):
         super(gencontrol, self).do_main_setup(vars, makeflags, extra)
         makeflags.update({
-            'VERSION_SOURCE': self.version['upstream'],
-            'VERSION_DEBIAN': self.version['debian'],
+            'VERSION_SOURCE': self.version.upstream,
+            'VERSION_DEBIAN': self.version.debian,
         })
 
     def do_main_makefile(self, makefile, makeflags, extra):
@@ -25,10 +25,10 @@
         vars = self.vars
 
         packages['source']['Build-Depends'].extend(
-            ['linux-support-%s%s' % (self.version['linux']['upstream'], self.abiname)]
+            ['linux-support-%s%s' % (self.version.linux_upstream, self.abiname)]
         )
         packages['source']['Build-Depends'].extend(
-            ['linux-headers-%s%s-all-%s [%s]' % (self.version['linux']['upstream'], self.abiname, arch, arch)
+            ['linux-headers-%s%s-all-%s [%s]' % (self.version.linux_upstream, self.abiname, arch, arch)
             for arch in self.config['base',]['arches']],
         )
 
@@ -118,9 +118,9 @@
         return True
 
     def process_changelog(self):
-        changelog = read_changelog()
-        self.version = changelog[0]['Version']
-        if self.version['linux']['modifier'] is not None:
+        changelog = Changelog(version = VersionLinux)
+        self.version = changelog[0].version
+        if self.version.linux_modifier is not None:
             self.abiname = ''
         else:
             self.abiname = '-%s' % self.config['abi',]['abiname']

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/changelog	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/changelog	Sun Jun 10 10:07:46 2007
@@ -1,3 +1,9 @@
+linux-modules-nonfree-2.6 (2.6.21-1) UNRELEASED; urgency=low
+
+  * Update to 2.6.21-1.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 10 Jun 2007 11:47:38 +0200
+
 linux-modules-nonfree-2.6 (2.6.18-5) unstable; urgency=low
 
   * Be in sync with kqemu-source.

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/rules.defs
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/rules.defs	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/rules.defs	Sun Jun 10 10:07:46 2007
@@ -1 +1 @@
-KERNELVERSION := 2.6.18-4
+KERNELVERSION := 2.6.21-1