Merge remote-tracking branch 'upstream/master' into fmNumbers

7 files changed, 68 insertions, 30 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..a06b640f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+lumina-desktop (0.8.3.372-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
+    - add lumina-data arch-indep package containing data files
+    - drop lumina-core package
+    - change lumina-desktop from arch-any to arch-indep
+    - make lumina-desktop what lumina-core was before (keeping dependencies
+      on all lumina-* packages)
+
+ -- 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..fda9e4c0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,17 @@ 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
 
 Package: lumina-desktop
-Architecture: all
-Depends: libluminautils1, lumina-core, lumina-config, lumina-fm,
+Architecture: any
+Replaces: lumina-core (<< 0.8.3.372)
+Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}),
+         libluminautils1, lumina-config, lumina-fm, oxygen-icon-theme,
          lumina-open, lumina-screenshot, lumina-search, lumina-info,
-         lxpolkit
+         lxpolkit, lumina-data, fluxbox, numlockx, xbacklight, xscreensaver
 Recommends: qt5-configuration-tool
 Description: Lightweight Qt5-based desktop environment
  Metapackage depending on all other lumina packages.
@@ -38,23 +40,10 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils-dev (= ${binary:Vers
 Description: Debugging symbols for lumina desktop environment
  Debugging symbols for libluminautils1
 
-Package: lumina-core
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}),
-        fluxbox, numlockx, xbacklight, xscreensaver, oxygen-icon-theme
-Description: Core package for the lumina desktop environment
- This package provides the basic components of lumina
- - session manager
- - panel with plugins
- - wallpaper setter
- - fluxbox configurator
- - desktop icon manager and menu
- - wallpapers
-
 Package: lumina-config
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: Configuration utility for the lumina desktop environment
  lumina-config allows to change various aspects of lumina and fluxbox, like the
  wallpaper beeing used, startup-applications, desktop-menu and more.
@@ -62,7 +51,7 @@ Description: Configuration utility for the lumina desktop environment
 Package: lumina-fm
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: Filemanager for the lumina desktop environment
  Simple filemanager for lumina with support for multiple view modes and
  integrated slideshow-based picture viewer.
@@ -70,7 +59,7 @@ Description: Filemanager for the lumina desktop environment
 Package: lumina-open
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: xdg-open like utilityfor the lumina desktop environment
  lumina-open handles opening of files and urls according to the system wide
  mime type association. It also provides an optional selector if more than one
@@ -79,7 +68,7 @@ Description: xdg-open like utilityfor the lumina desktop environment
 Package: lumina-screenshot
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: Screenshot utility for the lumina desktop environment
  Simple screenshot utility that allows to snapshot the whole desktop or a single
  window after a configurable delay.
@@ -87,7 +76,7 @@ Description: Screenshot utility for the lumina desktop environment
 Package: lumina-search
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: Search utility for the lumina desktop environment
  Simple search utility that allows to search for applications or files and
  directories in the user's HOME directory.
@@ -95,7 +84,7 @@ Description: Search utility for the lumina desktop environment
 Package: lumina-info
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: Basic information utility for Lumina
  lumina-info display various information about the Lumina installation,
  like paths or version.
@@ -103,7 +92,17 @@ Description: Basic information utility for Lumina
 Package: lumina-xconfig
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version})
-Replaces: lumina-core (<< 0.8.2)
+Replaces: lumina-core (<< 0.8.3.372)
 Description: Display configuration tool for the lumina desktop environment
- lumina-info display various information about the Lumina installation,
- like paths or version.
+ Simple multi-head aware display configuration tool for Lumina
+
+Package: lumina-data
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}), lumina-desktop (= ${binary:Version})
+Replaces: lumina-core (<< 0.8.3.372)
+Description: Data files for the lumina Desktop environment
+ - Lumina Wallpapers
+ - Lumina Themes
+ - Lumina Translations
+ - Lumina Sounds
+ - Fallback fluxbox configuration
diff --git a/debian/lumina-core.install b/debian/lumina-data.install
index d1d143e8..cbf45f34 100644
--- a/debian/lumina-core.install
+++ b/debian/lumina-data.install
@@ -1,4 +1,3 @@
-usr/bin/Lumina-DE
 usr/share/pixmaps/Lumina-DE.png
 usr/share/Lumina-DE/colors/
 usr/share/Lumina-DE/themes/
diff --git a/debian/lumina-desktop.install b/debian/lumina-desktop.install
new file mode 100644
index 00000000..748ddff0
--- /dev/null
+++ b/debian/lumina-desktop.install
@@ -0,0 +1,2 @@
+usr/bin/Lumina-DE
+
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..d15b44d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,11 +38,18 @@ override_dh_strip:
 
 override_dh_install:
 	dh_install --fail-missing
-	mkdir $(CURDIR)/debian/lumina-core/etc/
+	mkdir $(CURDIR)/debian/lumina-desktop/etc/
 	install -m644 $(CURDIR)/debian/luminaDesktop.conf \
-		$(CURDIR)/debian/lumina-core/etc/luminaDesktop.conf
+		$(CURDIR)/debian/lumina-desktop/etc/luminaDesktop.conf
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/lxpolkit" > \
-		$(CURDIR)/debian/lumina-core/etc/luminaStartapps
+		$(CURDIR)/debian/lumina-desktop/etc/luminaStartapps
+	mv $(CURDIR)/debian/lumina-desktop/usr/bin/Lumina-DE \
+		$(CURDIR)/debian/lumina-desktop/usr/bin/Lumina-DE.real
+	install -m755 $(CURDIR)/debian/Lumina-DE \
+		$(CURDIR)/debian/lumina-desktop/usr/bin/Lumina-DE
+	mkdir -p $(CURDIR)/debian/lumina-desktop/etc/default
+	install -m644 $(CURDIR)/debian/lumina-qt5ct \
+		$(CURDIR)/debian/lumina-desktop/etc/default/lumina-qt5ct
 
 override_dh_auto_install:
 	INSTALL_ROOT=$(CURDIR)/debian/tmp/ $(MAKE) install