From 94d4d84b696376c3ab439de070114dbf63936faf Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 14 Apr 2006 16:56:10 +0000 Subject: [PATCH] * debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py, debian/modules/gencontrol.py: Move handling of revisions to special code. svn path=/dists/trunk/linux-2.6/; revision=6425 --- debian/bin/gencontrol.py | 1 + debian/lib/python/debian_linux/gencontrol.py | 2 -- debian/modules/gencontrol.py | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 7a0d401bb..7e2f590b7 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -26,6 +26,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol): def do_arch_setup(self, vars, makeflags, arch): vars.update(self.config.get(('image', arch), {})) + makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]), def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra): headers_arch = self.templates["control.headers.arch"] diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 1e8669680..4ea28a25c 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -41,8 +41,6 @@ class gencontrol(object): 'SOURCEVERSION': self.version['source'], 'UPSTREAMVERSION': self.version['upstream'], 'ABINAME': self.abiname, - # TODO: Don't read this here, this is linux-2.6 specific - 'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]), } vars = self.vars.copy() diff --git a/debian/modules/gencontrol.py b/debian/modules/gencontrol.py index b2efcb3c3..ab5e776c7 100755 --- a/debian/modules/gencontrol.py +++ b/debian/modules/gencontrol.py @@ -6,9 +6,6 @@ from debian_linux.config import * from debian_linux.debian import * class gencontrol(debian_linux.gencontrol.gencontrol): - # TODO: workaround - changelog = [] - def __init__(self, config): super(gencontrol, self).__init__(config) self.process_config_version(config_parser({}, [sys.path[0] + "/../version"]))