From 669ed91c2c359be5c81e7d49c0f935bbe1b0df92 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sat, 24 Jun 2006 11:58:54 +0000
Subject: [PATCH] * debian/bin/gencontrol.py: Call main setup method from super
 class. * debian/lib/python/debian_linux/gencontrol.py:   Move makeflags setup
 to setup method.

svn path=/dists/trunk/linux-2.6/; revision=6877
---
 debian/bin/gencontrol.py                     |  1 +
 debian/lib/python/debian_linux/gencontrol.py | 19 +++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index c48768dff..7695f9dad 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -11,6 +11,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
         self.process_changelog()
 
     def do_main_setup(self, vars, makeflags, extra):
+        super(gencontrol, self).do_main_setup(vars, makeflags, extra)
         vars.update(self.config['image',])
         makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]])
 
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 37cbd86ce..9501f3aa4 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -38,15 +38,7 @@ class gencontrol(object):
         vars = self.vars.copy()
         vars.update(config_entry)
 
-        makeflags = {
-            'MAJOR': self.version['major'],
-            'VERSION': self.version['version'],
-            'SOURCE_UPSTREAM': self.version['source_upstream'],
-            'SOURCEVERSION': self.version['source'],
-            'UPSTREAMVERSION': self.version['upstream'],
-            'ABINAME': self.abiname,
-        }
-
+        makeflags = {}
         extra = {}
 
         self.do_main_setup(vars, makeflags, extra)
@@ -57,7 +49,14 @@ class gencontrol(object):
             self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
 
     def do_main_setup(self, vars, makeflags, extra):
-        pass
+        makeflags.update({
+            'MAJOR': self.version['major'],
+            'VERSION': self.version['version'],
+            'SOURCE_UPSTREAM': self.version['source_upstream'],
+            'SOURCEVERSION': self.version['source'],
+            'UPSTREAMVERSION': self.version['upstream'],
+            'ABINAME': self.abiname,
+        })
 
     def do_main_makefile(self, makefile, makeflags, extra):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])