[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.1.0-2-1-g3a3b18e

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 3a3b18e4a6604fe390da7579b6826b2e76447861
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jan 9 12:31:21 2012 +0100

    Enable hardened build flags through dpkg-buildflags (Closes: #655140)

diff --git a/debian/changelog b/debian/changelog
index 9371923..db0a3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mldonkey (3.1.0-3) unstable; urgency=low
+
+  * Enable hardened build flags through dpkg-buildflags (Closes: #655140).
+    Thanks to Moritz Muehlenhoff for reporting it and providing a patch.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 09 Jan 2012 12:27:37 +0100
+
 mldonkey (3.1.0-2) unstable; urgency=low
 
   * Remove /var/lib/mldonkey on purge
diff --git a/debian/rules b/debian/rules
index 5d73ec2..c0fed3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,6 @@ else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O0
-else
-        CFLAGS += -O2
-endif
-
 override_dh_auto_clean:
 # Update the PO, as suggested in "man 7 po-debconf"
 	debconf-updatepo
@@ -32,7 +24,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	cd config; autoconf
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(confflags) \
+	./configure $(confflags) $(shell dpkg-buildflags --export=configure) \
 	  --enable-gui=newgui2 \
 	  --enable-directconnect \
           --disable-magic \

-- 
mldonkey packaging