summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/README.source65
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules9
3 files changed, 78 insertions, 0 deletions
diff --git a/debian/README.source b/debian/README.source
index 919b04f36..89e832305 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -39,6 +39,71 @@ repository in ~/src/debian/openssh/, upstream checkouts in
39~/src/debian/openssh/upstream/, and my own working trees in 39~/src/debian/openssh/upstream/, and my own working trees in
40~/src/debian/openssh/trunk/. 40~/src/debian/openssh/trunk/.
41 41
42Patch handling
43--------------
44
45This package uses quilt to manage all modifications to the upstream source.
46Changes are stored in the source package as diffs in debian/patches and
47applied automatically by dpkg-source when the source package is extracted.
48
49To configure quilt to use debian/patches instead of patches, you want either
50to export QUILT_PATCHES=debian/patches in your environment or use this
51snippet in your ~/.quiltrc:
52
53 for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
54 if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
55 export QUILT_PATCHES=debian/patches
56 break
57 fi
58 done
59
60After unpacking the source package, all patches will be applied, and you can
61use quilt normally.
62
63If you check out the source code from bzr, then all patches will be applied,
64but you will need to inform quilt of this manually. Do this by running:
65
66 debian/rules quilt-setup
67
68To add a new set of changes, first run quilt push -a, and then run:
69
70 quilt new <patch>
71
72where <patch> is a descriptive name for the patch, used as the filename in
73debian/patches. Then, for every file that will be modified by this patch,
74run:
75
76 quilt add <file>
77
78before editing those files. You must tell quilt with quilt add what files
79will be part of the patch before making changes or quilt will not work
80properly. After editing the files, run:
81
82 quilt refresh
83
84to save the results as a patch.
85
86Alternately, if you already have an external patch and you just want to add
87it to the build system, run quilt push -a and then:
88
89 quilt import -P <patch> /path/to/patch
90 quilt push -a
91
92(add -p 0 to quilt import if needed). <patch> as above is the filename to
93use in debian/patches. The last quilt push -a will apply the patch to make
94sure it works properly.
95
96To remove an existing patch from the list of patches that will be applied,
97run:
98
99 quilt delete <patch>
100
101You may need to run quilt pop -a to unapply patches first before running
102this command.
103
104You should only commit changes to bzr with all patches applied, i.e. after
105'quilt push -a'.
106
42Merging new upstream releases 107Merging new upstream releases
43----------------------------- 108-----------------------------
44 109
diff --git a/debian/changelog b/debian/changelog
index a92370243..5157f5f71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
1openssh (1:5.3p1-3) UNRELEASED; urgency=low 1openssh (1:5.3p1-3) UNRELEASED; urgency=low
2 2
3 * Convert to source format 3.0 (quilt). 3 * Convert to source format 3.0 (quilt).
4 * Update README.source to match, and add a 'quilt-setup' target to
5 debian/rules for the benefit of those checking out the package from
6 revision control.
7 * All patches are now maintained separately and tagged according to DEP-3.
4 8
5 -- Colin Watson <cjwatson@debian.org> Sat, 27 Feb 2010 01:07:15 +0000 9 -- Colin Watson <cjwatson@debian.org> Sat, 27 Feb 2010 01:07:15 +0000
6 10
diff --git a/debian/rules b/debian/rules
index 7383de843..1abd84781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -347,6 +347,15 @@ debian/faq.html:
347 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \ 347 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \
348 > debian/faq.html 348 > debian/faq.html
349 349
350# You only need to run this immediately after checking out the package from
351# revision control.
352quilt-setup:
353 [ ! -d .pc ]
354 set -e; for patch in $$(quilt series | tac); do \
355 patch -p1 -R <"debian/patches/$$patch"; \
356 done
357 quilt push -a
358
350.PHONY: build clean binary-indep binary-arch binary install 359.PHONY: build clean binary-indep binary-arch binary install
351.PHONY: build-deb build-udeb 360.PHONY: build-deb build-udeb
352.PHONY: binary-openssh-client binary-openssh-server binary-ssh 361.PHONY: binary-openssh-client binary-openssh-server binary-ssh