diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:43:02 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-01-24 21:43:02 +0000 |
| commit | 07d905b406c4ab64ea2f10a22f4f8f0d595269f6 (patch) | |
| tree | 34566caa7dd8e31ff7aeb10dd076a54e2267cf31 | |
| parent | d637873cdfabe0317cb362f2466c5aeb60febddf (diff) | |
fix gssapi merge instructions
| -rw-r--r-- | debian/README.source | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/README.source b/debian/README.source index 6ec7578f8..919b04f36 100644 --- a/debian/README.source +++ b/debian/README.source | |||
| @@ -133,7 +133,7 @@ http://www.sxw.org.uk/computing/patches/openssh.html; of course such a patch | |||
| 133 | needs to exist first! To do this, run this in the gssapi branch: | 133 | needs to exist first! To do this, run this in the gssapi branch: |
| 134 | 134 | ||
| 135 | bzr merge /path/to/openssh/tarball/branch | 135 | bzr merge /path/to/openssh/tarball/branch |
| 136 | bzr revert -rrevno:-1:/path/to/openssh/tarball/branch | 136 | bzr revert -rrevno:-1:/path/to/openssh/tarball/branch . |
| 137 | patch -p1 </path/to/openssh/gssapi/patch | 137 | patch -p1 </path/to/openssh/gssapi/patch |
| 138 | bzr add --file-ids-from=/path/to/openssh/debian/trunk | 138 | bzr add --file-ids-from=/path/to/openssh/debian/trunk |
| 139 | # you may need to deal with applying configure.ac changes to configure | 139 | # you may need to deal with applying configure.ac changes to configure |