[kernel] r18337 - in dists/sid/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Thu Dec  1 12:19:31 2011
New Revision: 18337

Log:
* debian/bin/gencontrol.py:
  Look on real upstream version during extraction of revisions for patch
  series.
* debian/changelog: Update.

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	Thu Dec  1 06:34:57 2011	(r18336)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Thu Dec  1 12:19:31 2011	(r18337)
@@ -335,10 +335,10 @@
                 packages.append(new_package)
 
     def process_changelog(self):
-        act_upstream = self.changelog[0].version.linux_upstream
+        act_upstream = self.changelog[0].version.upstream
         versions = []
         for i in self.changelog:
-            if i.version.linux_upstream != act_upstream:
+            if i.version.upstream != act_upstream:
                 break
             versions.append(i.version)
         self.versions = versions

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Dec  1 06:34:57 2011	(r18336)
+++ dists/sid/linux-2.6/debian/changelog	Thu Dec  1 12:19:31 2011	(r18337)
@@ -1,3 +1,9 @@
+linux-2.6 (3.1.4-2) UNRELEASED; urgency=low
+
+  * Fix generation of revisions for the patch list.
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 01 Dec 2011 13:17:34 +0100
+
 linux-2.6 (3.1.4-1) unstable; urgency=low
 
   * New upstream stable updates: