* debian/rules:

  - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right
    CXXFLAGS.

diff --git a/debian/changelog b/debian/changelog
index bd328fd081a1a770c728369e8d009060b23e5057..483fff9c3ad42e0ee10b5210f80377a95b84e18a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
   * Italian translation update. Closes: #581742
 
   [ Martin Pitt ]
+  * debian/rules:
+    - Make DEB_BUILD_OPTIONS=noopt actually work by passing the right
+      CXXFLAGS.
   * apt-pkg/contrib/fileutl.{h,cc}:
     - Add support for transparent reading of gzipped files.
     - Link against zlib (in apt-pkg/makefile) and add zlib build dependency.

diff --git a/debian/rules b/debian/rules
index 7677708b25b9988aad7d545c9282a01bc02dea41..450f3e0f6e09061fe99e9c8399d857047be130af 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ build/configure-stamp: configure
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright
-       cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
+       cd build && CXXFLAGS="$(CXXFLAGS)" ../configure $(confflags)
        touch $@
 
 build/build-stamp: build/configure-stamp