* 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
This commit is contained in:
parent
6a0cbff5e4
commit
fc13725e91
|
@ -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
|
||||
|
|
|
@ -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)'
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
exec "$(dirname $0)/../apply/debian" orig
|
|
@ -1,5 +0,0 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
upstream="@upstream@"
|
||||
exec "/usr/src/kernel-patches/all/$upstream/apply/debian" "$upstream-0"
|
Loading…
Reference in New Issue