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
     http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
     install ChangeLog.gssapi.
   * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
-  * Use LSB functions in init scripts, and add an LSB-style header (thanks,
-    Christian Perrier; closes: #389038).
+  * Use LSB functions in init scripts, and add an LSB-style header (partly
+    from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
   * Move init script start links to S16, and remove stop links altogether
-    (closes: #122188).
+    (the latter from Ubuntu; closes: #122188).
   * Emit a slightly more informative message from the init script if
     /dev/null has somehow become not a character device (closes: #369964).
   * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
-  * Build position-independent executables (only for debs, not for udebs) to
-    take advantage of address space layout randomisation.
-  * If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to the
-    default path.
+  * Merge from Ubuntu:
+    - Build position-independent executables (only for debs, not for udebs)
+      to take advantage of address space layout randomisation.
+    - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
+      the default path.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Tue, 12 Jun 2007 14:31:01 +0100