r3994 - in trunk/kernel/linux-2.6/debian: bin templates

[Bastian Blank]

Author: waldi
Date: 2005-08-19 22:26:44 +0000 (Fri, 19 Aug 2005)
New Revision: 3994

Modified:
   trunk/kernel/linux-2.6/debian/bin/gencontrol.py
   trunk/kernel/linux-2.6/debian/templates/control.tree.in
Log:
* debian/bin/gencontrol.py: Add patch package to tree dependencies.
* debian/templates/control.tree.in: Remove Dependency line.


Modified: trunk/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- trunk/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-19 19:58:05 UTC (rev 3993)
+++ trunk/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-19 22:26:44 UTC (rev 3994)
@@ -315,6 +315,7 @@
         if tmp:
             value.extend([j.strip() for j in tmp.split(',')])
         if i == 'Depends':
+            value.append("linux-patch-debian-%(version)s (= %(source)s)" % 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])
@@ -328,7 +329,6 @@
 
 def vars_changelog(vars, changelog):
     version = changelog[0]['Version']
-    vars['srcver'] = version['source']
     vars['version'] = version['version']
     vars['major'] = version['major']
     return vars

Modified: trunk/kernel/linux-2.6/debian/templates/control.tree.in
===================================================================
--- trunk/kernel/linux-2.6/debian/templates/control.tree.in	2005-08-19 19:58:05 UTC (rev 3993)
+++ trunk/kernel/linux-2.6/debian/templates/control.tree.in	2005-08-19 22:26:44 UTC (rev 3994)
@@ -2,7 +2,6 @@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: linux-patch-debian- at version@ (= @srcver@)
 Description: Linux kernel source tree for building Debian kernel images
  This meta package is used as a build dependency of Debian
  linux-image packages to prevent a version discrepancy between