summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-06-12 19:40:27 +0000
committerColin Watson <cjwatson@debian.org>2007-06-12 19:40:27 +0000
commit5d5465841da06208cf918ecb5a3c61f31c12c8c5 (patch)
treee848d4d5fb212e420abea4203a6d23b9b61bef6a
parent378742206f9e50ecec3f5871b1ce9658a5e8c889 (diff)
credit Ubuntu where appropriate
-rw-r--r--debian/changelog15
1 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index dcb30fc30..5aafdfff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,17 +56,18 @@ openssh (1:4.6p1-1) UNRELEASED; urgency=low
56 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch; 56 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
57 install ChangeLog.gssapi. 57 install ChangeLog.gssapi.
58 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295). 58 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
59 * Use LSB functions in init scripts, and add an LSB-style header (thanks, 59 * Use LSB functions in init scripts, and add an LSB-style header (partly
60 Christian Perrier; closes: #389038). 60 from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
61 * Move init script start links to S16, and remove stop links altogether 61 * Move init script start links to S16, and remove stop links altogether
62 (closes: #122188). 62 (the latter from Ubuntu; closes: #122188).
63 * Emit a slightly more informative message from the init script if 63 * Emit a slightly more informative message from the init script if
64 /dev/null has somehow become not a character device (closes: #369964). 64 /dev/null has somehow become not a character device (closes: #369964).
65 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447). 65 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
66 * Build position-independent executables (only for debs, not for udebs) to 66 * Merge from Ubuntu:
67 take advantage of address space layout randomisation. 67 - Build position-independent executables (only for debs, not for udebs)
68 * If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to the 68 to take advantage of address space layout randomisation.
69 default path. 69 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
70 the default path.
70 71
71 -- Colin Watson <cjwatson@ubuntu.com> Tue, 12 Jun 2007 14:31:01 +0100 72 -- Colin Watson <cjwatson@ubuntu.com> Tue, 12 Jun 2007 14:31:01 +0100
72 73