Package: razorqt Version: 0.5.2-2 Followup-For: Bug #730899 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu trusty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * Add patch to look for lightdm-qt-3 in addition to versions 2 and 1. This patch should be fairly self-explanatory. ... Adam -- System Information: Debian Release: wheezy/sid APT prefers trusty-updates APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty'), (500, 'saucy-updates') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.11.0-13-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru razorqt-0.5.2/debian/changelog razorqt-0.5.2/debian/changelog diff -Nru razorqt-0.5.2/debian/patches/lightdm3.patch razorqt-0.5.2/debian/patches/lightdm3.patch --- razorqt-0.5.2/debian/patches/lightdm3.patch 1969-12-31 17:00:00.000000000 -0700 +++ razorqt-0.5.2/debian/patches/lightdm3.patch 2013-05-24 01:24:57.000000000 -0600 @@ -0,0 +1,26 @@ +Description: look for lightdm-qt-3 in addition to versions 2 and 1. +Author: Adam Conrad <adcon...@ubuntu.com> +Forwarded: no +Last-Update: 2013-05-24 + +--- razorqt-0.5.2.orig/razorqt-lightdm-greeter/CMakeLists.txt ++++ razorqt-0.5.2/razorqt-lightdm-greeter/CMakeLists.txt +@@ -24,11 +24,15 @@ include ( ${QT_USE_FILE} ) + # check for new version + include(FindPkgConfig) + message(STATUS "Checking for lightdm-qt...") +-pkg_check_modules(LIGHTDM_QT liblightdm-qt-2) ++pkg_check_modules(LIGHTDM_QT liblightdm-qt-3) + # or lightdm v1 if the version 2 is not found + if (NOT LIGHTDM_QT_FOUND) +- message(STATUS "lightdm2 for Qt is not found. Trying to find v1") +- pkg_check_modules(LIGHTDM_QT liblightdm-qt-1) ++ message(STATUS "lightdm3 for Qt is not found. Trying to find v2") ++ pkg_check_modules(LIGHTDM_QT liblightdm-qt-2) ++ if (NOT LIGHTDM_QT_FOUND) ++ message(STATUS "lightdm2 for Qt is not found. Trying to find v1") ++ pkg_check_modules(LIGHTDM_QT liblightdm-qt-1) ++ endif() + endif() + # decision for version. It needs to be separated as the cmake can + # be run more times. And the LIGHTDM_QT_FOUND is cached so it's diff -Nru razorqt-0.5.2/debian/patches/series razorqt-0.5.2/debian/patches/series --- razorqt-0.5.2/debian/patches/series 2013-03-30 09:25:03.000000000 -0600 +++ razorqt-0.5.2/debian/patches/series 2013-05-24 01:24:20.000000000 -0600 @@ -0,0 +1 @@ +lightdm3.patch