Author: waldi
Date: Fri Sep 8 08:30:49 2006
New Revision: 7368
Modified:
dists/trunk/linux-2.6/debian/bin/ (props changed)
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/rules
dists/trunk/linux-2.6/debian/rules.real
Log:
* debian/bin: Update svn:ignore propery.
* debian/bin/gencontrol.py: Install as bin/patch.*.
* debian/rules: Clean correct files.
* debian/rules.real: Use bin/patch.*.
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 Fri Sep 8 08:30:49 2006
@@ -187,8 +187,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)
+ file('debian/bin/patch.apply', 'w').write(apply)
+ file('debian/bin/patch.unpatch', 'w').write(unpatch)
def process_changelog(self):
self.version = self.changelog[0]['Version']
Modified: dists/trunk/linux-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-2.6/debian/rules (original)
+++ dists/trunk/linux-2.6/debian/rules Fri Sep 8 08:30:49 2006
@@ -52,7 +52,7 @@
fi
maintainerclean:
- -rm debian/control debian/control.md5sum debian/rules.gen
debian/bin/patch-* debian/linux-*
+ rm -f debian/control debian/control.md5sum debian/rules.gen
debian/bin/patch.* debian/linux-*
rm -rf $(filter-out debian .svn, $(wildcard * .[^.]*))
clean: debian/control
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 Fri Sep 8 08:30:49 2006
@@ -100,7 +100,7 @@
rm -rf '$(DIR)'
define patch_cmd
-cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/patch-apply'
--overwrite-home='$(CURDIR)/debian/patches'
+cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/patch.apply'
--overwrite-home='$(CURDIR)/debian/patches'
endef
srcfiles := $(filter-out debian, $(wildcard * .[^.]*))
@@ -396,8 +396,8 @@
dh_clean -d -k $(DH_OPTIONS)
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/bin/patch.apply '$(pfull)/apply/debian'
+ install debian/bin/patch.unpatch '$(pfull)/unpatch/debian'
chmod 644 '$(pfull)/debian/'*.patch
bzip2 -9 '$(pfull)/debian/'*.patch
$(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)'
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
