[SCM] libmm-qt packaging branch, master, updated. debian/0.5.1-1-13-g6cb0ce7

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit fddf05b3748034880b2b0415b42bfeb35587fe86
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 3 10:18:56 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 94cdcb8..9c53d93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libmm-qt (1.0.1-1~) UNRELEASED; urgency=medium
   * Import ubuntu symbols file.
   * Bump library package soversion.
   * Aesthetic change, further reduce rules file.
+  * New patch: do_not_override_cflags
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 02 Mar 2014 18:47:03 +0100
 
diff --git a/debian/patches/do_not_override_cflags b/debian/patches/do_not_override_cflags
new file mode 100644
index 0000000..4b36c9d
--- /dev/null
+++ b/debian/patches/do_not_override_cflags
@@ -0,0 +1,13 @@
+Index: libmm-qt/CMakeLists.txt
+===================================================================
+--- libmm-qt.orig/CMakeLists.txt	2014-03-03 10:15:18.103706269 +0100
++++ libmm-qt/CMakeLists.txt	2014-03-03 10:17:32.798769146 +0100
+@@ -24,7 +24,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
index 2714877..9b830ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 kubuntu_bump_soversion.diff
+do_not_override_cflags

-- 
libmm-qt packaging