[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=bbf3b9e

The following commit has been merged in the master branch:
commit bbf3b9e35659f215934eb73739826641ae44e741
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 14 16:15:18 2014 +0100

    Remove patch: libdir.diff, applied upstream.
---
 debian/changelog           |  1 +
 debian/patches/libdir.diff | 53 ----------------------------------------------
 debian/patches/series      |  1 -
 3 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79d408b..3a8139b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libnm-qt (0.9.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patch: libdir.diff, applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 14 Feb 2014 15:56:26 +0100
 
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
deleted file mode 100644
index 8cbe2e3..0000000
--- a/debian/patches/libdir.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: Maximiliano Curia <maxy at debian.org>
-Description: Use the LIB_DESTINATION cmake variable
- Use the LIB_DESTINATION in install() calls, instead of hardcoding lib$SUFFIX.
-Last-Update: 2013-11-19
-Forwarded: https://bugs.kde.org/show_bug.cgi?id=327811
-
-Index: libnm-qt/CMakeLists.txt
-===================================================================
---- libnm-qt.orig/CMakeLists.txt	2013-11-19 17:44:24.415249334 +0100
-+++ libnm-qt/CMakeLists.txt	2013-11-19 17:47:22.708028609 +0100
-@@ -5,6 +5,10 @@
- set(VERSION 0.9.0.1)
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
- set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
-+set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING
-+    "Library directory name")
-+set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/" CACHE STRING
-+    "Base directory for pkgconfig files")
- 
- if (NOT CMAKE_BUILD_TYPE)
-     set(CMAKE_BUILD_TYPE Debug)
-@@ -216,7 +220,7 @@
- add_library(NetworkManagerQt SHARED ${NetworkManagerQt_PART_SRCS} ${DBUS_INTERFACE_SRCS} ${CONNECTIONS_SETTINGS_SRCS} ${NetworkManagerQt_MOC} )
- 
- target_link_libraries(NetworkManagerQt ModemManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTNETWORK_LIBRARY})
--install(TARGETS NetworkManagerQt DESTINATION lib${LIB_SUFFIX})
-+install(TARGETS NetworkManagerQt DESTINATION ${LIB_DESTINATION})
- 
- install( FILES
-    ${NetworkManagerQt_HEADERS}
-@@ -234,7 +238,8 @@
- 
- message(STATUS "Writing pkg-config file...")
- configure_file(${CMAKE_SOURCE_DIR}/NetworkManagerQt.pc.cmake ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc @ONLY)
--install(FILES ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/")
-+install(FILES ${CMAKE_BINARY_DIR}/NetworkManagerQt.pc DESTINATION
-+    "${PKGCONFIG_INSTALL_PREFIX}")
- 
- add_subdirectory(include)
- 
-Index: libnm-qt/NetworkManagerQt.pc.cmake
-===================================================================
---- libnm-qt.orig/NetworkManagerQt.pc.cmake	2013-11-19 17:41:54.377327621 +0100
-+++ libnm-qt/NetworkManagerQt.pc.cmake	2013-11-19 17:49:23.167151395 +0100
-@@ -18,7 +18,7 @@
- 
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=@CMAKE_INSTALL_PREFIX@/lib at LIB_SUFFIX@
-+libdir=@LIB_DESTINATION@
- includedir=${prefix}/include
- 
- Name: NetworkManagerQt
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b7e163a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-libdir.diff

-- 
libnm-qt packaging