[kernel] r11102 - in dists/trunk/linux-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: Sat Apr 19 11:29:21 2008
New Revision: 11102

Log:
* debian/bin/gencontrol.py: Don't create debian/bin/patch.unpatch.
* debian/rules.real: Install patch.unpatch from templates.
* debian/templates/patch.unpatch
  - Move from debian/templates/patch.unpatch.in.
  - Only use static informations.


Added:
   dists/trunk/linux-2.6/debian/templates/patch.unpatch
      - copied, changed from r7262, /dists/trunk/linux-2.6/debian/templates/patch.unpatch.in
Removed:
   dists/trunk/linux-2.6/debian/templates/patch.unpatch.in
Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Apr 19 11:29:21 2008
@@ -247,7 +247,6 @@
 
     def do_extra(self, packages, makefile):
         apply = self.templates['patch.apply']
-        unpatch = self.templates['patch.unpatch']
 
         vars = {
             'revisions': 'orig ' + ' '.join([i.debian for i in self.versions[::-1]]),
@@ -257,10 +256,8 @@
         }
 
         apply = self.substitute(apply, vars)
-        unpatch = self.substitute(unpatch, vars)
 
         file('debian/bin/patch.apply', 'w').write(apply)
-        file('debian/bin/patch.unpatch', 'w').write(unpatch)
 
     def process_changelog(self):
         act_upstream = self.changelog[0].version.linux_upstream

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Sat Apr 19 11:29:21 2008
@@ -495,7 +495,7 @@
 	dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch'
 	dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian'
 	install debian/bin/patch.apply '$(pfull)/apply/debian'
-	install debian/bin/patch.unpatch '$(pfull)/unpatch/debian'
+	install debian/templates/patch.unpatch '$(pfull)/unpatch/debian'
 	find '$(pfull)/debian' ! -path '*/series/*' -type f -execdir bzip2 '{}' ';' -execdir chmod 644 '{}.bz2' ';'
 	$(MAKE_SELF) install-base DH_OPTIONS='$(DH_OPTIONS)'
 

Copied: dists/trunk/linux-2.6/debian/templates/patch.unpatch (from r7262, /dists/trunk/linux-2.6/debian/templates/patch.unpatch.in)
==============================================================================
--- /dists/trunk/linux-2.6/debian/templates/patch.unpatch.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/patch.unpatch	Sat Apr 19 11:29:21 2008
@@ -1,5 +1,4 @@
 #!/bin/sh
 set -e
 
-upstream="@upstream@"
-exec "/usr/src/kernel-patches/all/$upstream/apply/debian" "$upstream-0"
+exec "$(dirname $0)/../apply/debian" orig