r4064 - in people/waldi/kernel/linux-2.6/debian: . bin patches-debian patches-debian/series

[Bastian Blank]

Author: waldi
Date: 2005-08-29 10:59:50 +0000 (Mon, 29 Aug 2005)
New Revision: 4064

Added:
   people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.13-1
Removed:
   people/waldi/kernel/linux-2.6/debian/patches-debian/drivers-s390-net-klist.patch
   people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1
Modified:
   people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
   people/waldi/kernel/linux-2.6/debian/changelog
Log:
* debian/bin/gencontrol.py: Really use abiname from config.
* debian/changelog: Update.
* debian/patches-debian/series/2.6.13-1: Move from debian/patches-debian/series/2.6.12+2.6.13-rc6-1.
* debian/patches-debian/drivers-s390-net-klist.patch: Drop, it is included in 2.6.13.


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-29 10:11:26 UTC (rev 4063)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-29 10:59:50 UTC (rev 4064)
@@ -111,7 +111,7 @@
     match = re.match(version_re, version, re.X)
     return match.groupdict()
 
-def process_changelog(in_vars, changelog):
+def process_changelog(in_vars, config, changelog):
     ret = [None, None, None, None]
     ret[0] = version = changelog[0]['Version']
     vars = in_vars.copy()
@@ -119,7 +119,7 @@
         ret[1] = vars['abiname'] = version['modifier']
         ret[2] = ""
     else:
-        ret[1] = vars['abiname'] = c['base']['abiname']
+        ret[1] = vars['abiname'] = config['base']['abiname']
         ret[2] = "-%s" % vars['abiname']
     vars['version'] = version['version']
     vars['major'] = version['major']
@@ -431,7 +431,7 @@
 
     c = config()
 
-    version, abiname, kpkg_abiname, vars = process_changelog({}, changelog)
+    version, abiname, kpkg_abiname, vars = process_changelog({}, c, changelog)
 
     packages = packages_list()
     makefile = []

Modified: people/waldi/kernel/linux-2.6/debian/changelog
===================================================================
--- people/waldi/kernel/linux-2.6/debian/changelog	2005-08-29 10:11:26 UTC (rev 4063)
+++ people/waldi/kernel/linux-2.6/debian/changelog	2005-08-29 10:59:50 UTC (rev 4064)
@@ -1,11 +1,8 @@
-linux-2.6 (2.6.12+2.6.13-rc6-1) UNRELEASED; urgency=low
+linux-2.6 (2.6.13-1) UNRELEASED; urgency=low
 
-  [ Simon Horman ]
-  * - Unset CC_OPTIMIZE_FOR_SIZE in i386 config,
-      it breaks iproute's (and other netlink users) ability
-      to set routes. (closes: #322723) 
+  *
 
- -- Simon Horman <horms at debian.org>  Sun, 21 Aug 2005 10:55:12 +0900
+ -- Bastian Blank <waldi at debian.org>  Thu, 25 Aug 2005 11:59:12 +0200
 
 linux-2.6 (2.6.12-6) UNRELEASED; urgency=low
 

Deleted: people/waldi/kernel/linux-2.6/debian/patches-debian/drivers-s390-net-klist.patch
===================================================================
(Binary files differ)

Deleted: people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1
===================================================================
--- people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1	2005-08-29 10:11:26 UTC (rev 4063)
+++ people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1	2005-08-29 10:59:50 UTC (rev 4064)
@@ -1,21 +0,0 @@
-+ amd64-int3-fix.patch
-+ drivers-ide-dma-blacklist-toshiba.patch
-+ drivers-scsi-megaraid_splitup.patch
-+ drivers-s390-net-klist.patch
-+ fbdev-radeon-noaccel.patch
-+ fs-asfs-2.patch
-+ ia64-irq-affinity-upfix.patch
-+ modular-ide.patch
-+ modular-ide-pnp.patch
-+ powerpc-calibrate-tau.patch
-+ powerpc-fix-power3-ftbfs.patch
-+ powerpc-g3-750cxe.patch
-+ powerpc-g4-l2-flush-errata.patch
-+ powerpc-mkvmlinuz-support.patch
-+ powerpc-pmac-cache-power34-fix.patch
-+ powerpc-ppc64-vio-data.patch
-+ powerpc-serial.patch
-+ qla2xxx-removed.patch
-+ remove-references-to-removed-drivers.patch
-+ sparc64-hme-lockup.patch
-+ tty-locking-fixes9.patch

Copied: people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.13-1 (from rev 4002, people/waldi/kernel/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1)