[SCM] libutempter library packaging branch, master, updated. debian/1.1.5-4-9-g7cd5ffe

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libutempter.git;a=commitdiff;h=0c9716a

The following commit has been merged in the master branch:
commit 0c9716add3ac80355696d883b157ff7e639dc639
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu May 28 18:39:41 2015 +0200

    Don't overwrite build flags from the environment in the Makefile.
    
    * Don't overwrite build flags from the environment in the Makefile.
      - Add Add keep_env_build_flags.diff
---
 debian/changelog                         |  2 ++
 debian/patches/keep_env_build_flags.diff | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ab373e..eccd3d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libutempter (1.1.5-5) UNRELEASED; urgency=medium
 
   * Switch to debhelper compat level 9.
     - Exports build flags.
+  * Don't overwrite build flags from the environment in the Makefile.
+    - Add Add keep_env_build_flags.diff
 
  -- Felix Geyer <fgeyer at debian.org>  Thu, 28 May 2015 18:23:38 +0200
 
diff --git a/debian/patches/keep_env_build_flags.diff b/debian/patches/keep_env_build_flags.diff
new file mode 100644
index 0000000..680ae3a
--- /dev/null
+++ b/debian/patches/keep_env_build_flags.diff
@@ -0,0 +1,16 @@
+Description: Don't overwrite build flags from the environment.
+Author: Felix Geyer <fgeyer at debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -42,8 +42,8 @@
+ 	-Wmissing-format-attribute -Wmissing-noreturn \
+ 	-Wmissing-prototypes -Wpointer-arith -Wredundant-decls \
+ 	-Wshadow -Wstrict-prototypes -Wwrite-strings
+-CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\"
+-CFLAGS = $(RPM_OPT_FLAGS)
++CPPFLAGS += -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\"
++CFLAGS += $(RPM_OPT_FLAGS)
+ LDLIBS =
+ 
+ all: $(TARGETS)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2502990
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+keep_env_build_flags.diff

-- 
libutempter library packaging