[SCM] MSN library packaging branch, master, updated. debian/4.1-1.2-1-g89e54f1

[Pau Garcia i Quiles]

The following commit has been merged in the master branch:
commit 89e54f1a3c98b17f38fd47d20d9b11475e4ea85f
Author: Pau Garcia i Quiles <pgquiles at elpauer.org>
Date:   Sat Feb 19 14:14:39 2011 +0100

    4.1-2, fixes a number of unimportant issues and builds with hardening flags
---
 debian/changelog                   |   13 +++++++++++++
 debian/control                     |    4 ++--
 debian/libmsn0.3.lintian-overrides |    1 +
 debian/rules                       |    6 ++++++
 debian/source/format               |    1 +
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f84e5f..e51d081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libmsn (4.1-2) unstable; urgency=low
+
+  [Martijn van Brummelen]
+  * Add hardening flags thanks to Raphael Geissert (Closes: #568830).
+
+  [Pau Garcia i Quiles]
+  * Explicitly state we use source format 1.0
+  * Update to standards 3.9.1.0
+  * Add lintian override for shlibs-calls-exit (it's in an 3rd-party file,
+    and according to upstream it's a never-used code path)
+
+ -- Pau Garcia i Quiles <pgquiles at elpauer.org>  Sat, 19 Feb 2011 13:32:10 +0100
+
 libmsn (4.1-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index dabeef0..1bba485 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libmsn
 Priority: optional
 Maintainer: Pau Garcia i Quiles <pgquiles at elpauer.org>
-Build-Depends: debhelper (>= 6.0.7), cmake, libssl-dev
-Standards-Version: 3.8.3.0
+Build-Depends: debhelper (>= 6.0.7), cmake, libssl-dev, hardening-wrapper
+Standards-Version: 3.9.1.0
 Section: libs
 Homepage: http://libmsn.sourceforge.net
 
diff --git a/debian/libmsn0.3.lintian-overrides b/debian/libmsn0.3.lintian-overrides
new file mode 100644
index 0000000..56cada2
--- /dev/null
+++ b/debian/libmsn0.3.lintian-overrides
@@ -0,0 +1 @@
+libmsn0.3: shlib-calls-exit usr/lib/libmsn.so.0.3.0
diff --git a/debian/rules b/debian/rules
index da740a4..7867081 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# enable the hardening wrapper
+DEB_BUILD_HARDENING = 1
+# but disable PIE
+DEB_BUILD_HARDENING_PIE = 0
+export DEB_BUILD_HARDENING DEB_BUILD_HARDENING_PIE
+
 builddir/Makefile:
 	dh_testdir
 	mkdir -p builddir
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0

-- 
MSN library packaging