reorder

[debhelper.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9bf728aff09ddb474a4dd6eca618f5c8550b3714..c20d5b241e4818bdf06e07b766334a903944335d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 debhelper (8.1.7) UNRELEASED; urgency=low
 
-  * Fix example. Closes: #627534
-  * Fix error message. Closes: #628053
-  * dh_movefiles: Optimise use of xargs. Closes: #627737
   * dh: In v9, any standard rules file targets, including build-arch,
     build-indep, build, install, etc, can be defined in debian/rules
     without needing to explicitly tell make the dependencies between
@@ -12,10 +9,14 @@ debhelper (8.1.7) UNRELEASED; urgency=low
     in --libexecdir when using autoconf. Closes: #541458
   * dh_auto_build, dh_auto_configure, dh: Set environment variables
     listed by dpkg-buildflags --export. Any environment variables that
-    are already set to other values will not be changed.
+    are already set to other values will not be changed unless
+    appropriate DEB_${flag}_{APPEND,SET} environment variables are also
+    set (see dpkg-buildflags(1)).
     Closes: #544844
-  * Also, support DEB_BUILD_OPTIONS=noopt, by changing -O2 to -O0
-    in any variables listed by dpkg-buildflags.
+  * dh_movefiles: Optimise use of xargs. Closes: #627737
+  * Correct docs about multiarch and v9. Closes: #630826
+  * Fix example. Closes: #627534
+  * Fix error message. Closes: #628053
 
  -- Joey Hess <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400