[SCM] lightdm-kde packaging branch, master, updated. debian/0.3.2.1-1-5-gdbe755d

[Ralf Jung]

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

The following commit has been merged in the master branch:
commit fba8f9598bb4a83cc48b12959b4fd2c8efcb7415
Author: Ralf Jung <post at ralfj.de>
Date:   Wed Dec 4 20:28:48 2013 +0100

    Add patch from upstream to make it compile with latest liblightdqm-qt (Closes: #730930)
---
 ...M.cmake-Search-for-new-liblightdm-qt-3-as.patch | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/0001-FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch b/debian/patches/0001-FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch
new file mode 100644
index 0000000..a657dc7
--- /dev/null
+++ b/debian/patches/0001-FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch
@@ -0,0 +1,45 @@
+From: Iain Lane <iain.lane at canonical.com>
+Date: Thu, 1 Aug 2013 21:37:48 +1000
+Subject: FindQLightDM.cmake: Search for new liblightdm-qt-3 as well as old
+ liblightdm-qt-2
+
+Forwarded: Taken from upstream (dacd25fc)
+---
+ cmake/modules/FindQLightDM.cmake | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQLightDM.cmake b/cmake/modules/FindQLightDM.cmake
+index c055c61..f901cf6 100644
+--- a/cmake/modules/FindQLightDM.cmake
++++ b/cmake/modules/FindQLightDM.cmake
+@@ -19,10 +19,19 @@ set(QLIGHTDM_LIBRARIES_FIND_REQUIRED ${QLightDM_FIND_REQUIRED})
+ find_package(PkgConfig)
+ if(PKG_CONFIG_FOUND)
+     if (QLIGHTDM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
++        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION})
+     else (QLIGHTDM_MIN_VERSION)
+-        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
++        PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3)
+     endif (QLIGHTDM_MIN_VERSION)
++    SET (QLIGHTDM_API 3)
++    if (NOT PC_QLIGHTDM_FOUND)
++        if (QLIGHTDM_MIN_VERSION)
++            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION})
++        else (QLIGHTDM_MIN_VERSION)
++            PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2)
++        endif (QLIGHTDM_MIN_VERSION)
++        SET (QLIGHTDM_API 2)
++    endif (NOT PC_QLIGHTDM_FOUND)
+ endif(PKG_CONFIG_FOUND)
+ 
+ 
+@@ -34,7 +43,7 @@ find_path(QLIGHTDM_INCLUDE_DIR
+ )
+ 
+ find_library(QLIGHTDM_LIBRARIES
+-             NAMES lightdm-qt-2
++             NAMES lightdm-qt-${QLIGHTDM_API}
+              HINTS
+              ${PC_QLIGHTDM_LIBDIR}
+              ${PC_QLIGHTDM_LIBRARY_DIRS}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..90d5b79
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-FindQLightDM.cmake-Search-for-new-liblightdm-qt-3-as.patch

-- 
lightdm-kde packaging