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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 16:33:47 2005
New Revision: 4811

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.


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:33:47 2005
@@ -119,6 +119,61 @@
         makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
         makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
 
+    def process_real_image(self, in_entry, vars):
+        in_entry = in_entry.copy()
+        if vars.has_key('desc'):
+            in_entry['Description'] += "\n.\n" + vars['desc']
+        entry = self.process_package(in_entry, vars)
+        for i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
+            value = []
+            tmp = entry.get(i, None)
+            if tmp:
+                tmp = tmp.split(',')
+                for t in tmp:
+                    value.append(t.strip())
+            if i == 'Depends':
+                t = vars.get('depends', None)
+                if t is not None:
+                    value.append(t)
+            elif i == 'Provides':
+                t = vars.get('provides', None)
+                if t is not None:
+                    value.append(t)
+            elif i == 'Suggests':
+                t = vars.get('suggests', None)
+                if t is not None:
+                    value.append(t)
+            elif i == 'Recommends':
+                t = vars.get('recommends', None)
+                if t is not None:
+                    value.append(t)
+            elif i == 'Conflicts':
+                t = vars.get('conflicts', None)
+                if t is not None:
+                    value.append(t)
+            entry[i] = ', '.join(value)
+        return entry
+
+    def process_real_tree(self, in_entry, vars):
+        entry = self.process_package(in_entry, vars)
+        tmp = self.changelog[0]['Version']['upstream']
+        versions = []
+        for i in self.changelog:
+            if i['Version']['upstream'] != tmp:
+                break
+            versions.insert(0, i['Version'])
+        for i in (('Depends', 'Provides')):
+            value = []
+            tmp = entry.get(i, None)
+            if tmp:
+                value.extend([j.strip() for j in tmp.split(',')])
+            if i == 'Depends':
+                value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version'])
+                value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % v for v in versions]))
+            elif i == 'Provides':
+                value.extend(["linux-tree-%(source)s" % v for v in versions])
+            entry[i] = ', '.join(value)
+        return entry
 
 if __name__ == '__main__':
     gencontrol()()

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:33:47 2005
@@ -140,8 +140,6 @@
     def do_subarch_makefile(self, makefile, arch, subarch, makeflags):
         for i in ('binary-arch', 'build', 'setup'):
             makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch))
-            makefile.append("%s-%s-%s::" % (i, arch, subarch))
-        for i in ('binary-arch', 'build', 'setup'):
             makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch))
 
     def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags, extra):
@@ -229,62 +227,6 @@
             entries.append(self.process_package(i, vars))
         return entries
 
-    def process_real_image(self, in_entry, vars):
-        in_entry = in_entry.copy()
-        if vars.has_key('desc'):
-            in_entry['Description'] += "\n.\n" + vars['desc']
-        entry = self.process_package(in_entry, vars)
-        for i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
-            value = []
-            tmp = entry.get(i, None)
-            if tmp:
-                tmp = tmp.split(',')
-                for t in tmp:
-                    value.append(t.strip())
-            if i == 'Depends':
-                t = vars.get('depends', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Provides':
-                t = vars.get('provides', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Suggests':
-                t = vars.get('suggests', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Recommends':
-                t = vars.get('recommends', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Conflicts':
-                t = vars.get('conflicts', None)
-                if t is not None:
-                    value.append(t)
-            entry[i] = ', '.join(value)
-        return entry
-
-    def process_real_tree(self, in_entry, vars):
-        entry = self.process_package(in_entry, vars)
-        tmp = self.changelog[0]['Version']['upstream']
-        versions = []
-        for i in self.changelog:
-            if i['Version']['upstream'] != tmp:
-                break
-            versions.insert(0, i['Version'])
-        for i in (('Depends', 'Provides')):
-            value = []
-            tmp = entry.get(i, None)
-            if tmp:
-                value.extend([j.strip() for j in tmp.split(',')])
-            if i == 'Depends':
-                value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version'])
-                value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % v for v in versions]))
-            elif i == 'Provides':
-                value.extend(["linux-tree-%(source)s" % v for v in versions])
-            entry[i] = ', '.join(value)
-        return entry
-
     def substitute(self, s, vars):
         def subst(match):
             return vars[match.group(1)]