aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/control50
-rw-r--r--debian/lumina-core.install14
-rw-r--r--debian/lumina-desktop.install2
-rwxr-xr-xdebian/rules16
5 files changed, 41 insertions, 48 deletions
diff --git a/debian/changelog b/debian/changelog
index 91b6cf33..a06b640f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-lumina-desktop (0.8.3.371-1nano) unstable; urgency=low
+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
diff --git a/debian/control b/debian/control
index 7101003e..57e2b70a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,10 +11,13 @@ 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-core, lumina-config, lumina-fm,
lumina-open, lumina-screenshot, lumina-search, lumina-info,
- lxpolkit
+ lxpolkit, lumina-data, fluxbox, numlockx, xbacklight, xscreensaver,
+ oxygen-icon-theme
Recommends: qt5-configuration-tool
Description: Lightweight Qt5-based desktop environment
Metapackage depending on all other lumina packages.
@@ -38,23 +41,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 +52,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 +60,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 +69,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 +77,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 +85,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 +93,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-core (= ${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-core.install
deleted file mode 100644
index d1d143e8..00000000
--- a/debian/lumina-core.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/bin/Lumina-DE
-usr/share/pixmaps/Lumina-DE.png
-usr/share/Lumina-DE/colors/
-usr/share/Lumina-DE/themes/
-usr/share/Lumina-DE/defaultapps.conf
-usr/share/Lumina-DE/desktop-background.jpg
-usr/share/Lumina-DE/fluxbox-init-rc
-usr/share/Lumina-DE/fluxbox-keys
-usr/share/Lumina-DE/Login.ogg
-usr/share/Lumina-DE/Logout.ogg
-usr/share/Lumina-DE/luminaDesktop.conf
-usr/share/Lumina-DE/i18n/lumina-desktop*.qm
-usr/share/wallpapers/Lumina-DE/
-usr/share/xsessions/Lumina-DE.desktop
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/rules b/debian/rules
index 2d9d2511..d15b44d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,18 +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
- mv $(CURDIR)/debian/lumina-core/usr/bin/Lumina-DE \
- $(CURDIR)/debian/lumina-core/usr/bin/Lumina-DE.real
+ $(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-core/usr/bin/Lumina-DE
- mkdir -p $(CURDIR)/debian/lumina-core/etc/default
+ $(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-core/etc/default/lumina-qt5ct
+ $(CURDIR)/debian/lumina-desktop/etc/default/lumina-qt5ct
override_dh_auto_install:
INSTALL_ROOT=$(CURDIR)/debian/tmp/ $(MAKE) install
bgstack15