Author: waldi
Date: Thu Jan 31 18:01:45 2008
New Revision: 10344
Log:
* debian/bin/gencontrol.py: Adopt changes.
* debian/changelog: Update
* debian/rules.defs: Update to 2.6.24-1.
Modified:
dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
dists/sid/linux-latest-2.6/debian/changelog
dists/sid/linux-latest-2.6/debian/rules.defs
Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py (original)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py Thu Jan 31 18:01:45 2008
@@ -1,23 +1,32 @@
#!/usr/bin/env python2.4
+
import sys
-sys.path.append(sys.argv[1]+ "/lib/python")
+sys.path.append(sys.argv[1] + "/lib/python")
+
+from debian_linux.config import ConfigCoreDump
+from debian_linux.debian import Changelog, VersionLinux
from debian_linux.gencontrol import Gencontrol as Base
-from debian_linux.config import *
-from debian_linux.debian import *
+from debian_linux.utils import Templates
class Gencontrol(Base):
def __init__(self, config):
- super(Gencontrol, self).__init__(config)
- self.process_config_version(ConfigParser({}, [sys.argv[1] +
"/version"]))
- self.process_changelog_version()
+ super(Gencontrol, self).__init__(ConfigCoreDump(fp = file(config)),
Templates(["debian/templates"]))
+
+ config_entry = self.config['version',]
+ self.version = VersionLinux(config_entry['source'])
+ self.abiname = config_entry['abiname']
+ self.vars = self.process_version_linux(self.version, self.abiname)
+
+ changelog_version = Changelog()[0].version
+ self.package_version = '%s+%s' % (self.version.upstream,
changelog_version.complete)
def do_main_packages(self, packages, extra):
packages['source']['Build-Depends'].extend(
['linux-support-%s%s' % (self.version.linux_upstream,
self.abiname)]
)
- def do_flavour_packages(self, packages, makefile, arch, subarch, flavour,
vars, makeflags, extra):
- config_entry = self.config.merge('base', arch, subarch, flavour)
+ def do_flavour_packages(self, packages, makefile, arch, featureset,
flavour, vars, makeflags, extra):
+ config_entry = self.config.merge('base', arch, featureset, flavour)
templates = []
@@ -40,12 +49,9 @@
packages.append(package)
makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
- makeflags_string = ' '.join(["%s='%s'" % i for i in
makeflags.iteritems()])
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy
DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in
packages_dummy]), makeflags_string),))
- makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch,
flavour), cmds_binary_arch))
- makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour)))
+ cmds_binary_arch = ["$(MAKE) -f debian/rules.real install-dummy
DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in
packages_dummy]), makeflags)]
+ makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset,
flavour), cmds = cmds_binary_arch)
def do_extra(self, packages, makefile):
templates_extra = self.templates["control.extra"]
@@ -68,18 +74,8 @@
else:
version = '-v%s' % self.package_version
cmds.append("$(MAKE) -f debian/rules.real install-dummy
ARCH='%s' DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch, i['Package'],
version))
- makefile.append("binary-arch-%s:: binary-arch-%s-extra" % (arch,
arch))
- makefile.append(("binary-arch-%s-extra:" % arch, cmds))
-
- def process_changelog_version(self):
- changelog_version = Changelog()[0].version
- self.package_version = '%s+%s' % (self.version.upstream,
changelog_version.complete)
-
- def process_config_version(self, config):
- entry = config['version',]
- self.version = VersionLinux(entry['source'])
- self.abiname = entry['abiname']
- self.vars = self.process_version_linux(self.version, self.abiname)
+ makefile.add('binary-arch_%s' % arch, ['binary-arch_%s_extra' %
arch])
+ makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
if __name__ == '__main__':
- Gencontrol(sys.argv[1] + "/arch")()
+ Gencontrol(sys.argv[1] + "/config.defines.dump")()
Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog (original)
+++ dists/sid/linux-latest-2.6/debian/changelog Thu Jan 31 18:01:45 2008
@@ -1,3 +1,9 @@
+linux-latest-2.6 (12) UNRELEASED; urgency=low
+
+ * Update to 2.6.24-1.
+
+ -- Bastian Blank <[EMAIL PROTECTED]> Thu, 31 Jan 2008 17:51:00 +0100
+
linux-latest-2.6 (11) unstable; urgency=low
* Update to 2.6.22-3.
Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.defs (original)
+++ dists/sid/linux-latest-2.6/debian/rules.defs Thu Jan 31 18:01:45 2008
@@ -1 +1 @@
-KERNELVERSION := 2.6.22-3
+KERNELVERSION := 2.6.24-1
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
