* debian/bin/gencontrol.py: Add patch package to tree dependencies.

* debian/templates/control.tree.in: Remove Dependency line.

svn path=/trunk/kernel/linux-2.6/; revision=3994

debian/bin/gencontrol.py

@@ -315,6 +315,7 @@ def process_real_tree(in_entry, changelog, vars):
         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 substitute(s, vars):
 
 def vars_changelog(vars, changelog):
     version = changelog[0]['Version']
-    vars['srcver'] = version['source']
     vars['version'] = version['version']
     vars['major'] = version['major']
     return vars

debian/templates/control.tree.in

@@ -2,7 +2,6 @@ Package: linux-tree-@version@
 Architecture: all
 Section: devel
 Priority: optional
-Depends: linux-patch-debian-@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