[SCM] libnm-qt packaging branch, master, updated. debian/0.9.0.1-1-11-gf6bb5bd

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libnm-qt.git;a=commitdiff;h=b31b8a5

The following commit has been merged in the master branch:
commit b31b8a5522559c6d752041d86f83a133517f89b1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 3 11:01:28 2014 +0100

    New patch: do_not_override_cflags
---
 debian/changelog                      |  1 +
 debian/patches/do_not_override_cflags | 13 +++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 85ae34b..5458b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libnm-qt (0.9.8.1-1) UNRELEASED; urgency=medium
   * Remove patch: libdir.diff, applied upstream.
   * Aesthetic change, further reduce rules file.
   * Update build dependencies.
+  * New patch: do_not_override_cflags
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 03 Mar 2014 10:42:56 +0100
 
diff --git a/debian/patches/do_not_override_cflags b/debian/patches/do_not_override_cflags
new file mode 100644
index 0000000..167375c
--- /dev/null
+++ b/debian/patches/do_not_override_cflags
@@ -0,0 +1,13 @@
+Index: libnm-qt/CMakeLists.txt
+===================================================================
+--- libnm-qt.orig/CMakeLists.txt	2014-03-03 10:42:12.604751333 +0100
++++ libnm-qt/CMakeLists.txt	2014-03-03 11:01:00.846811289 +0100
+@@ -36,7 +36,7 @@
+ include(CheckCXXCompilerFlag)
+ check_cxx_compiler_flag("-Werror=return-type" HAVE_GCC_ERROR_RETURN_TYPE)
+ if (HAVE_GCC_ERROR_RETURN_TYPE)
+-    set(CMAKE_CXX_FLAGS "-Werror=return-type")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
+ endif()
+ 
+ include_directories(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8a1d637
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+do_not_override_cflags

-- 
libnm-qt packaging