[pkg-otr-team] [irssi-plugin-otr] 01/01: Imported Debian patch 3.2.1-2

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag debian/3.2.1-2
in repository irssi-plugin-otr.

commit d4e27c8be3fdf6c574c1bdfd78d96dca81d20ded
Author: Thibaut VARENE <varenet at debian.org>
Date:   Thu May 17 17:39:28 2012 -0700

    Imported Debian patch 3.2.1-2
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 debian/rules     | 9 +--------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f789e56..b57cac8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pidgin-otr (3.2.1-2) unstable; urgency=low
+
+  * Enable hardening flags (patch from Felix Geyer) Closes: #673184
+
+ -- Thibaut VARENE <varenet at debian.org>  Thu, 17 May 2012 17:39:28 -0700
+
 pidgin-otr (3.2.1-1) unstable; urgency=critical
 
   * New upstream release
diff --git a/debian/control b/debian/control
index b0d3d41..53e6a3e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pidgin-otr
 Section: net
 Priority: optional
 Maintainer: Thibaut VARENE <varenet at debian.org>
-Build-Depends: debhelper (>= 7), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), pidgin-dev, libotr2-dev (>= 3.1.0), libxml-parser-perl, intltool, autotools-dev
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.16.1~), libgpg-error-dev (>= 1.0), libgcrypt11-dev (>= 1.2.0), libglib2.0-dev (>= 2.4), libgtk2.0-dev (>= 2.4), pidgin-dev, libotr2-dev (>= 3.1.0), libxml-parser-perl, intltool, autotools-dev
 Standards-Version: 3.9.3
 
 Package: pidgin-otr
diff --git a/debian/rules b/debian/rules
index 2bbbca9..da5944c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,14 +12,6 @@
 
 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -34,6 +26,7 @@ configure-stamp:
 		--prefix=/usr\
 		--mandir=\$${prefix}/share/man\
 		--infodir=\$${prefix}/share/info \
+		$(shell dpkg-buildflags --export=configure)
 
 	touch configure-stamp
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-otr/packages/irssi-plugin-otr.git