[med-svn] [SCM] praat branch, master, updated. debian/5.3.14-1-7-ga05b863

[Andreas Tille]

The following commit has been merged in the master branch:
commit a05b863136d8f419f8a440a0cf1f97127187e821
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 17 21:11:55 2012 +0200

    Enable propagation of hardening flags

diff --git a/debian/changelog b/debian/changelog
index 0115204..f54711b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,11 @@ praat (5.3.15-1) unstable; urgency=low
   * Bump to debhelper compat level 9
   * Imported Upstream version 5.3.15
 
- -- Rafael Laboissiere <rafael at laboissiere.net>  Thu, 17 May 2012 08:50:30 +0200
+  [ Andreas Tille ]
+  * debian/patches/use-dpkg-buildflags.patch: Make sure build flags will
+    propagate to makefile
+
+ -- Andreas Tille <tille at debian.org>  Thu, 17 May 2012 21:09:52 +0200
 
 praat (5.3.14-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 045570c..6fe2c55 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: praat
 Section: science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+ Rafael Laboissiere <rafael at laboissiere.net>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9), libasound2-dev, quilt, libgtk2.0-dev
 Standards-Version: 3.9.3
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a7b179a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-dpkg-buildflags.patch
diff --git a/debian/patches/use-dpkg-buildflags.patch b/debian/patches/use-dpkg-buildflags.patch
new file mode 100644
index 0000000..96d3c36
--- /dev/null
+++ b/debian/patches/use-dpkg-buildflags.patch
@@ -0,0 +1,14 @@
+--- praat.orig/makefiles/makefile.defs.linux
++++ praat/makefiles/makefile.defs.linux
+@@ -7,9 +7,9 @@
+ 
+ CXX = g++
+ 
+-CFLAGS = -DUNIX -Dlinux `pkg-config --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O
++CFLAGS += -DUNIX -Dlinux `pkg-config --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O
+ 
+-CXXFLAGS = $(CFLAGS) -Wshadow
++CXXFLAGS += $(CFLAGS) -Wshadow $(LDFLAGS)
+ 
+ LINK = g++
+ 

-- 
Debian packaging for Praat