From fc13725e91491e079da04e935ec0313bb417faa7 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sat, 19 Apr 2008 11:29:21 +0000
Subject: [PATCH] * 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.

svn path=/dists/trunk/linux-2.6/; revision=11102
---
 debian/bin/gencontrol.py          | 3 ---
 debian/rules.real                 | 2 +-
 debian/templates/patch.unpatch    | 4 ++++
 debian/templates/patch.unpatch.in | 5 -----
 4 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 debian/templates/patch.unpatch
 delete mode 100644 debian/templates/patch.unpatch.in

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index ef894758f..42290ac18 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -247,7 +247,6 @@ class Gencontrol(Base):
 
     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 @@ class Gencontrol(Base):
         }
 
         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
diff --git a/debian/rules.real b/debian/rules.real
index 529285810..ea2d0e6ba 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -495,7 +495,7 @@ install-patch:
 	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)'
 
diff --git a/debian/templates/patch.unpatch b/debian/templates/patch.unpatch
new file mode 100644
index 000000000..51401d9fd
--- /dev/null
+++ b/debian/templates/patch.unpatch
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+exec "$(dirname $0)/../apply/debian" orig
diff --git a/debian/templates/patch.unpatch.in b/debian/templates/patch.unpatch.in
deleted file mode 100644
index e7bf8372d..000000000
--- a/debian/templates/patch.unpatch.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-
-upstream="@upstream@"
-exec "/usr/src/kernel-patches/all/$upstream/apply/debian" "$upstream-0"