summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-06-08 20:41:29 +0000
committerColin Watson <cjwatson@debian.org>2008-06-08 20:41:29 +0000
commit1e9c9549f143e974d6cce857b3e1af1639265758 (patch)
tree1cac744204b94bd22251d6a99c0d9da7e41590bf
parentc46a9969edd7cde3db2358ec924bd86b0802a78d (diff)
Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index c5206ead6..3c80768b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ openssh (1:4.7p1-13) UNRELEASED; urgency=low
12 (thanks, Frans Pop). 12 (thanks, Frans Pop).
13 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now 13 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
14 takes care of that (thanks, Frans Pop; closes: #484404). 14 takes care of that (thanks, Frans Pop; closes: #484404).
15 * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
15 16
16 -- Colin Watson <cjwatson@debian.org> Fri, 30 May 2008 23:26:25 +0100 17 -- Colin Watson <cjwatson@debian.org> Fri, 30 May 2008 23:26:25 +0100
17 18
diff --git a/debian/rules b/debian/rules
index b5272c4b8..0c48082b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
6# This has to be exported to make some magic below work. 6# This has to be exported to make some magic below work.
7export DH_OPTIONS 7export DH_OPTIONS
8 8
9ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) 9ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
10OPTFLAGS := -O2 10OPTFLAGS := -O2
11else 11else
12OPTFLAGS := -O0 12OPTFLAGS := -O0