debian packaging:

- new upstream snapshot
- add qt5-configuration-tool wrapper for Lumina-DE (use qt5ct QT_QPA_PLATFORMTHEME if /usr/bin/qt5ct exists and LUMINA_USE_QT5CT is TRUE in /etc/defaul/lumina-qt5ct)

5 files changed, 34 insertions, 1 deletions

diff --git a/debian/Lumina-DE b/debian/Lumina-DE
new file mode 100755
index 00000000..96e6832a
--- /dev/null
+++ b/debian/Lumina-DE
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. /etc/default/lumina-qt5ct
+
+if test -f /usr/bin/qt5ct && test ${LUMINA_USE_QT5CT} = TRUE; then
+	export QT_QPA_PLATFORMTHEME=qt5ct
+fi
+
+/usr/bin/Lumina-DE.real
diff --git a/debian/changelog b/debian/changelog
index b9d3b36c..91b6cf33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lumina-desktop (0.8.3.371-1nano) unstable; urgency=low
+
+  * new GIT snapshot
+    - add build dependency on libxcb-image0-dev
+    - add Lumina-DE startup wrapper. If qt5-configuration-tool exists
+      and LUMINA_USE_QT5CT is set to TRUE in /etc/default/lumina-qt5ct,
+      then export QT_QPA_PLATFORMTHEME=qt5ct, so that it works in Lumina
+
+ -- Christopher Roy Bratusek <nano@jpberlin.de>  Thu, 12 Mar 2015 18:11:17 +0100
+
 lumina-desktop (0.8.3.347-1nano) unstable; urgency=low
 
   * new GIT snapshot
diff --git a/debian/control b/debian/control
index 14bce48d..7101003e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, qtmultimedia5-dev,
                libxcb1-dev, libx11-xcb-dev, libxcb-ewmh-dev, make, g++,
                libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev,
                libxcb-icccm4-dev, libxcb-damage0-dev, libxcb-util0-dev,
-               libqt5x11extras5-dev, qttools5-dev-tools
+               libqt5x11extras5-dev, qttools5-dev-tools, libxcb-image0-dev
 Standards-Version: 3.9.5
 Homepage: https://github.com/pcbsd/lumina
 
diff --git a/debian/lumina-qt5ct b/debian/lumina-qt5ct
new file mode 100644
index 00000000..9553f94c
--- /dev/null
+++ b/debian/lumina-qt5ct
@@ -0,0 +1,7 @@
+#
+# if LUMINA_USE_QT5CT is TRUE Lumina Desktop
+# will use qt5-configuration-tool for theming
+# Qt. Please note that this will override some
+# of the Lumina settings in 'lumina-config'
+
+LUMINA_USE_QT5CT=FALSE
diff --git a/debian/rules b/debian/rules
index f86bf5e3..2d9d2511 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,13 @@ override_dh_install:
 		$(CURDIR)/debian/lumina-core/etc/luminaDesktop.conf
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/lxpolkit" > \
 		$(CURDIR)/debian/lumina-core/etc/luminaStartapps
+	mv $(CURDIR)/debian/lumina-core/usr/bin/Lumina-DE \
+		$(CURDIR)/debian/lumina-core/usr/bin/Lumina-DE.real
+	install -m755 $(CURDIR)/debian/Lumina-DE \
+		$(CURDIR)/debian/lumina-core/usr/bin/Lumina-DE
+	mkdir -p $(CURDIR)/debian/lumina-core/etc/default
+	install -m644 $(CURDIR)/debian/lumina-qt5ct \
+		$(CURDIR)/debian/lumina-core/etc/default/lumina-qt5ct
 
 override_dh_auto_install:
 	INSTALL_ROOT=$(CURDIR)/debian/tmp/ $(MAKE) install