summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-14 17:25:24 -0400
committerJoey Hess <joey@kitenet.net>2011-06-14 17:25:24 -0400
commit0f2969a41c07f0435ddac202a858ab914fd7eff7 (patch)
tree291b7141ef78eb101ee72000d8d9aa329bd0fd21 /debian
parentc64ed6af2930e40666aa3069d4e40a7dcd1bc1dd (diff)
parente8c799129672d5b7dbac58a06fadd175cffaa7ed (diff)
Merge branch 'master' into smarter-targets
Conflicts: dh
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d22e50ea..9bf728af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ debhelper (8.1.7) UNRELEASED; urgency=low
(Thanks, Roger Leigh)
* dh_auto_configure: In v9, does not include the source package name
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.
+ Closes: #544844
+ * Also, support DEB_BUILD_OPTIONS=noopt, by changing -O2 to -O0
+ in any variables listed by dpkg-buildflags.
-- Joey Hess <joeyh@debian.org> Sat, 21 May 2011 15:24:19 -0400