[kernel] r4810 - in people/waldi/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 16:10:30 2005
New Revision: 4810

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/bin/gencontrol.py
- Move code from debian/lib/python/debian_linux/gencontrol.py.
- Update.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sun Nov 13 16:10:30 2005
@@ -4,6 +4,15 @@
 import debian_linux.gencontrol
 
 class gencontrol(debian_linux.gencontrol.gencontrol):
+    def do_main_packages(self, packages):
+        vars = self.changelog_vars
+
+        main = self.templates["control.main"]
+        packages.extend(self.process_packages(main, vars))
+
+        tree = self.templates["control.tree"]
+        packages.append(self.process_real_tree(tree[0], vars))
+
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
         headers_arch = self.templates["control.headers.arch"]
         package_headers_arch = self.process_package(headers_arch[0], vars)

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sun Nov 13 16:10:30 2005
@@ -49,15 +49,6 @@
         for arch in iter(self.config['base']['arches']):
             self.do_arch(packages, makefile, arch, self.changelog_vars.copy(), makeflags.copy())
 
-    def do_main_packages(self, packages):
-        vars = self.changelog_vars
-
-        main = self.templates["control.main"]
-        packages.extend(self.process_packages(main, vars))
-
-        tree = self.templates["control.tree"]
-        packages.append(self.process_real_tree(tree[0], vars))
-
     def do_main_makefile(self, makefile, makeflags):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
@@ -65,6 +56,9 @@
         cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags_string,))
         makefile.append(("binary-indep:", cmds_binary_indep))
 
+    def do_main_packages(self, packages):
+        pass
+
     def do_extra(self, packages, makefile):
         try:
             templates_extra = self.templates["control.extra"]