[SCM] gsequencer/master: moved compiler flags to debian/rules

[jkraehemann-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b51e988afa8b3bb841bc06ba8c98f770fabe6324
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Mon Oct 12 14:21:46 2015 +0200

    moved compiler flags to debian/rules

diff --git a/debian/patches/fixed-compiler-flag.diff b/debian/patches/fixed-compiler-flag.diff
index e6c837d..7ced031 100644
--- a/debian/patches/fixed-compiler-flag.diff
+++ b/debian/patches/fixed-compiler-flag.diff
@@ -1,13 +1,15 @@
 Index: gsequencer/Makefile.am
 ===================================================================
---- gsequencer.orig/Makefile.am	2015-10-11 00:31:08.276653863 +0200
-+++ gsequencer/Makefile.am	2015-10-11 16:49:38.790270481 +0200
-@@ -4,7 +4,7 @@
+--- gsequencer.orig/Makefile.am	2015-10-12 14:18:43.996746100 +0200
++++ gsequencer/Makefile.am	2015-10-12 14:19:28.090742766 +0200
+@@ -4,8 +4,8 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src -DDESTDIR=\"$(DESTDIR)$(datadir)\" -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -D_FORTIFY_SOURCE=2
  
  # what flags you want to pass to the C compiler & linker
 -CFLAGS = -g -O9 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -ftrapv
-+CFLAGS = -g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -ftrapv
- LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
+-LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
++CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
  
  # this lists the binaries to produce, the (non-PHONY, binary) targets in
+ # the previous manual Makefile
diff --git a/debian/rules b/debian/rules
index 4f4fc66..de0bd96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/dpkg/default.mk
 override_dh_auto_build:
 	xsltproc --nonet --param make.year.ranges 1 --param make.single.year.ranges 1 --param man.charmap.use.subset 0 -o debian/ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl debian/midi2xml.1.xml
 	xsltproc --nonet --param make.year.ranges 1 --param make.single.year.ranges 1 --param man.charmap.use.subset 0 -o debian/ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl debian/gsequencer.1.xml
-	dh_auto_build
+	dh_auto_build -- CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_install:
 	dh_auto_install

-- 
gsequencer packaging