[SCM] libnm-qt packaging branch, master, updated. debian/0.9.8.1-3-3-gaa6ccfa

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 527ccfb79b36aa31291198cde3aa9b68d958b8df
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 17 12:47:47 2014 +0200

    Remove patches applied upstream
---
 debian/changelog                           |  2 ++
 debian/patches/do_not_override_cflags      | 13 -------------
 debian/patches/kubuntu_bump_soversion.diff | 13 -------------
 debian/patches/series                      |  2 --
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f70ec7c..325f625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libnm-qt (0.9.8.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patch: do_not_override_cflags, applied upstream.
+  * Remove patch: kubuntu_bump_soversion.diff, applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 12:58:32 +0200
 
diff --git a/debian/patches/do_not_override_cflags b/debian/patches/do_not_override_cflags
deleted file mode 100644
index 167375c..0000000
--- a/debian/patches/do_not_override_cflags
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kubuntu_bump_soversion.diff b/debian/patches/kubuntu_bump_soversion.diff
deleted file mode 100644
index 0c99500..0000000
--- a/debian/patches/kubuntu_bump_soversion.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libnm-qt-0.9.8.1/CMakeLists.txt
-===================================================================
---- libnm-qt-0.9.8.1.orig/CMakeLists.txt	2014-02-14 20:01:05.000000000 +0000
-+++ libnm-qt-0.9.8.1/CMakeLists.txt	2014-02-17 15:52:18.938750872 +0000
-@@ -249,7 +249,7 @@
- 
- set_property(TARGET NetworkManagerQt PROPERTY COMPILE_DEFINITIONS MAKE_NETWORKMANAGERQT_LIB)
- set_property(TARGET NetworkManagerQt PROPERTY VERSION ${VERSION})
--set_property(TARGET NetworkManagerQt PROPERTY SOVERSION 0)
-+set_property(TARGET NetworkManagerQt PROPERTY SOVERSION 1)
- 
- message(STATUS "Writing pkg-config file...")
- configure_file(${CMAKE_SOURCE_DIR}/NetworkManagerQt.pc.cmake ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc @ONLY)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e2c8ea0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-do_not_override_cflags
-kubuntu_bump_soversion.diff

-- 
libnm-qt packaging