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

The following commit has been merged in the master branch:
commit 7acfd5c20de0f50892858ff378223cad281e953f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Mar 2 18:49:05 2014 +0100

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

diff --git a/debian/changelog b/debian/changelog
index b345519..cfa0f63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libmm-qt (1.0.1-1~) UNRELEASED; urgency=medium
   * New upstream release.
   * Update build dependencies.
   * Change package priority.
+  * Remove patch: libdir.diff, applied upstream
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 02 Mar 2014 18:47:03 +0100
 
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
deleted file mode 100644
index ef3dc28..0000000
--- a/debian/patches/libdir.diff
+++ /dev/null
@@ -1,50 +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: no
-
-Index: libmm-qt/CMakeLists.txt
-===================================================================
---- libmm-qt.orig/CMakeLists.txt	2013-11-19 12:50:07.743656025 +0100
-+++ libmm-qt/CMakeLists.txt	2013-11-19 12:55:03.487747058 +0100
-@@ -7,6 +7,10 @@
- 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")
- 
- find_package(Qt4 REQUIRED)
- 
-@@ -83,7 +87,7 @@
- add_library(ModemManagerQt SHARED ${ModemManagerQt_MOC} ${ModemManagerQt_SRCS} ${DBUS_INTERFACES_FILES})
- 
- target_link_libraries(ModemManagerQt ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
--install(TARGETS ModemManagerQt DESTINATION lib${LIB_SUFFIX})
-+install(TARGETS ModemManagerQt DESTINATION ${LIB_DESTINATION})
- 
- install( FILES
- ${ModemManagerQt_HEADERS}
-@@ -96,4 +100,5 @@
- 
- message(STATUS "Writing pkg-config file...")
- configure_file(${CMAKE_SOURCE_DIR}/ModemManagerQt.pc.cmake ${CMAKE_BINARY_DIR}/ModemManagerQt.pc @ONLY)
--install(FILES ${CMAKE_BINARY_DIR}/ModemManagerQt.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/")
-+install(FILES ${CMAKE_BINARY_DIR}/ModemManagerQt.pc DESTINATION
-+    "${PKGCONFIG_INSTALL_PREFIX}")
-Index: libmm-qt/ModemManagerQt.pc.cmake
-===================================================================
---- libmm-qt.orig/ModemManagerQt.pc.cmake	2013-11-19 12:50:07.743656025 +0100
-+++ libmm-qt/ModemManagerQt.pc.cmake	2013-11-19 12:56:20.872631349 +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: ModemManagerQt
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

-- 
libmm-qt packaging