Merge branch 'debian/experimental' into debian/sid

debian/changelog

@@ -1,3 +1,27 @@
+lxqt-session (0.12.0-3) experimental; urgency=medium
+
+  * Added upstream pull request for moving upstream configurations
+    to /usr/share/lxqt (Closes: #883033)
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 01 Dec 2017 21:54:55 +0100
+
+lxqt-session (0.12.0-2) experimental; urgency=medium
+
+  * Added upstream pull request for improved xdg handling (Closes: #883032).
+
+ -- Alf Gaida <agaida@siduction.org>  Fri, 01 Dec 2017 21:53:35 +0100
+
+lxqt-session (0.12.0-1) experimental; urgency=medium
+
+  * Cherry-picking upstream release 0.12.0.
+  * Switched to experimental
+  * Bumped Standards to 4.1.1 - no changes needed
+  * Bumped liblxqt dependency to >= 0.12.0
+  * Breaks and Replaces lxqt-common << 0.12.0
+  * Added dependency to lxqt-themes | lxqt-theme instead
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 24 Oct 2017 21:17:51 +0200
+
 lxqt-session (0.11.1-6) unstable; urgency=medium
 
   * Moved lxqt-qtplugin to dependencies (Closes: #870138)

debian/control

@@ -7,22 +7,22 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper (>= 10),
                libkf5windowsystem-dev,
-               liblxqt0-dev (>= 0.11.1),
+               liblxqt0-dev (>= 0.12.0),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libudev-dev [linux-any],
                libx11-dev,
                xdg-user-dirs
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-session.git/?h=debian/sid
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-session.git/?h=debian/experimental
-Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-session.git -b debian/sid
+Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-session.git -b debian/experimental
 Homepage: https://github.com/lxde/lxqt-session
 
 Package: lxqt-session
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         lxqt-common,
+         lxqt-themes | lxqt-theme,
          lxqt-qtplugin,
          x11-xkb-utils
 Recommends: lxqt-session-l10n,
@@ -36,6 +36,8 @@ Recommends: lxqt-session-l10n,
             qps [linux-any],
             xscreensaver | gnome-screensaver | light-locker | i3lock | suckless-tools
 Provides: x-session-manager
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Description: session manager component for LXQt
  LXQt is an advanced, easy-to-use, and fast desktop environment based on
  Qt technologies.  It has been tailored for users who value simplicity,

debian/patches/pr-114.patch

@@ -0,0 +1,36 @@
+From 3653bb1a1fcfd04da0d1c90dd588c0c067d72db1 Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Wed, 22 Nov 2017 08:06:48 +0100
+Subject: [PATCH] startlxqt: Add /usr/share & /etc into XDG_CONFIG_DIRS
+
+---
+ CMakeLists.txt | 1 +
+ startlxqt.in   | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3cd4112..b9fd3d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -57,6 +57,7 @@ if(NOT("${LXQT_DATA_DIR}" MATCHES "^/usr(/local)?/share$"))
+     set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:${LXQT_DATA_DIR}")
+ endif()
+ set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:/usr/local/share:/usr/share")
++set(PREDEF_XDG_CONFIG_DIRS "/etc:${LXQT_ETC_XDG_DIR}:/usr/share")
+ configure_file(startlxqt.in startlxqt @ONLY)
+ install(PROGRAMS
+     "${CMAKE_CURRENT_BINARY_DIR}/startlxqt"
+diff --git a/startlxqt.in b/startlxqt.in
+index 02ef0c2..ae0569e 100755
+--- a/startlxqt.in
++++ b/startlxqt.in
+@@ -24,7 +24,7 @@ fi
+ export XDG_DATA_DIRS
+ 
+ if [ -z "$XDG_CONFIG_DIRS" ]; then
+-    export XDG_CONFIG_DIRS="@LXQT_ETC_XDG_DIR@"
++    export XDG_CONFIG_DIRS="@PREDEF_XDG_CONFIG_DIRS@"
+ else
+     if ! contains "$XDG_CONFIG_DIRS" '@LXQT_ETC_XDG_DIR@'; then
+         XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@LXQT_ETC_XDG_DIR@"
+

debian/patches/pr-115.patch

@@ -0,0 +1,23 @@
+From ca88cb247bd3856792daefcaf5a04bd0231c036b Mon Sep 17 00:00:00 2001
+From: Alf Gaida <agaida@siduction.org>
+Date: Wed, 29 Nov 2017 00:24:41 +0100
+Subject: [PATCH] install session configs in /usr/share/lxqt
+
+---
+ config/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index caabdf2..4b12525 100644
+--- a/config/CMakeLists.txt
++++ b/config/CMakeLists.txt
+@@ -3,7 +3,7 @@ install(FILES
+     lxqt.conf
+     session.conf
+     windowmanagers.conf
+-    DESTINATION "${LXQT_ETC_XDG_DIR}/lxqt"
++    DESTINATION "${CMAKE_INSTALL_DATADIR}/lxqt"
+     COMPONENT Runtime
+ )
+ install(DIRECTORY openbox
+

debian/patches/series

@@ -0,0 +1,2 @@
+pr-114.patch
+pr-115.patch