From 3eb696e135f213359ae7439d1d2565d0a7c437cc Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Thu, 26 Mar 2015 21:30:24 +0100 Subject: - updated debian/changelog - checksums for LuminaOS-Debian and LuminaOS-Linux - capacity for LuminaOS-Debian --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a06b640f..57f13dba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lumina-desktop (0.8.3.427-1nano) unstable; urgency=low + + * New git snapshot + + -- Christopher Roy Bratusek Thu, 26 Mar 2015 21:29:34 +0100 + lumina-desktop (0.8.3.372-1nano) unstable; urgency=low * new GIT snapshot -- cgit From 99bf7d119b797eeb03f5932650f294a8d317ac33 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 28 Mar 2015 18:40:24 +0100 Subject: debian/changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 57f13dba..621a911f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lumina-desktop (0.8.3.440-1nano) unstable; urgency=low + + * New git snapshot + + -- Christopher Roy Bratusek Sat, 28 Mar 2015 18:38:13 +0100 + lumina-desktop (0.8.3.427-1nano) unstable; urgency=low * New git snapshot -- cgit From 170b5fd3efb2d472228ebb4652d314b1414fffb8 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 28 Mar 2015 18:46:32 +0100 Subject: debian: new build dependency on libxcb-composite0-dev debian: new dependency on usbmount --- debian/changelog | 3 +++ debian/control | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 621a911f..b12b8d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ lumina-desktop (0.8.3.440-1nano) unstable; urgency=low * New git snapshot + * add build dependency on libxcb-composite0-dev + * add dependency on usbmount (tool for automagic mounting + of external devices) -- Christopher Roy Bratusek Sat, 28 Mar 2015 18:38:13 +0100 diff --git a/debian/control b/debian/control index fda9e4c0..72a9a679 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ 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, libxcb-image0-dev + libqt5x11extras5-dev, qttools5-dev-tools, libxcb-image0-dev, + libxcb-composite0-dev Standards-Version: 3.9.5 Homepage: https://github.com/pcbsd/lumina @@ -16,7 +17,8 @@ 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, lumina-data, fluxbox, numlockx, xbacklight, xscreensaver + lxpolkit, lumina-data, fluxbox, numlockx, xbacklight, xscreensaver, + usbmount Recommends: qt5-configuration-tool Description: Lightweight Qt5-based desktop environment Metapackage depending on all other lumina packages. -- cgit From d606cd9cf443b2ef0a1cf2dd701dfe42313d4172 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 28 Mar 2015 19:19:49 +0100 Subject: Debian: package dependency fixes Will fix the following source package issues: E: lumina-desktop source: depends-on-build-essential-package-without-using-version make [build-depends: make] E: lumina-desktop source: depends-on-build-essential-package-without-using-version g++ [build-depends: g++] E: lumina-desktop source: not-binnmuable-all-depends-any lumina-data -> libluminautils1 E: lumina-desktop source: not-binnmuable-all-depends-any lumina-data -> lumina-desktop --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index fda9e4c0..7e7832b2 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Christopher Roy Bratusek Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, qtmultimedia5-dev, - libxcb1-dev, libx11-xcb-dev, libxcb-ewmh-dev, make, g++, + libxcb1-dev, libx11-xcb-dev, libxcb-ewmh-dev, libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libxcb-icccm4-dev, libxcb-damage0-dev, libxcb-util0-dev, libqt5x11extras5-dev, qttools5-dev-tools, libxcb-image0-dev @@ -98,7 +98,7 @@ Description: Display configuration tool for the lumina desktop environment Package: lumina-data Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}), lumina-desktop (= ${binary:Version}) +Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1, lumina-desktop Replaces: lumina-core (<< 0.8.3.372) Description: Data files for the lumina Desktop environment - Lumina Wallpapers -- cgit From 219995113afec8db1cb12dfba069c68874bfefbe Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 28 Mar 2015 19:25:12 +0100 Subject: don't return error after running dh_auto_clean Fix for `W: lumina-desktop source: debian-rules-ignores-make-clean-error line 32` --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index d15b44d9..372da293 100755 --- a/debian/rules +++ b/debian/rules @@ -29,8 +29,8 @@ override_dh_auto_configure: for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake $(USER_QMAKE_FLAGS)); done override_dh_auto_clean: - -$(MAKE) distclean - -find $(CURDIR) -name *.qm | xargs rm + dh_auto_clean + -find $(CURDIR) -name *.qm -delete -sed -e 's/LuminaOS-Debian/LuminaOS-Linux/g' -i libLumina/libLumina.pro override_dh_strip: -- cgit From e5a9b8e8a53a4066ea4f52caf4a53bbaee0c5d0c Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 28 Mar 2015 19:34:00 +0100 Subject: Debian: missing dependency libxcb-composite0-dev --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 7e7832b2..e354c150 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Christopher Roy Bratusek Build-Depends: debhelper (>= 9), qt5-qmake, qtbase5-dev, qtmultimedia5-dev, - libxcb1-dev, libx11-xcb-dev, libxcb-ewmh-dev, + libxcb1-dev, libx11-xcb-dev, libxcb-composite0-dev, libxcb-ewmh-dev, libx11-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libxcb-icccm4-dev, libxcb-damage0-dev, libxcb-util0-dev, libqt5x11extras5-dev, qttools5-dev-tools, libxcb-image0-dev -- cgit From cb447fec92588dc590bc2d51459818d220d54468 Mon Sep 17 00:00:00 2001 From: Marshall Banana Date: Sat, 28 Mar 2015 21:07:02 +0100 Subject: Debian: package descriptions and substituion variables --- debian/control | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e354c150..f6912ccc 100644 --- a/debian/control +++ b/debian/control @@ -23,20 +23,24 @@ Description: Lightweight Qt5-based desktop environment Package: libluminautils1 Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} Description: Library for the lumina desktop environment Utility library for the lumina desktop environment Package: libluminautils-dev Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}) +Section: libdevel +Depends: ${misc:Depends}, libluminautils1 (= ${binary:Version}) Description: Development files for lumina desktop environment - Files needed to develop plugins or extensions for the lumina desktop environment, - or using libluminautils1 in projects. + Files needed to develop plugins or extensions for the lumina desktop + environment, or using libluminautils1 in projects. Package: libluminautils-dbg Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils-dev (= ${binary:Version}) +Section: debug +Priority: extra +Depends: ${misc:Depends}, libluminautils1 (= ${binary:Version}) Description: Debugging symbols for lumina desktop environment Debugging symbols for libluminautils1 @@ -45,8 +49,8 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}) 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. + lumina-config allows one to change various aspects of lumina and fluxbox, like + the wallpaper beeing used, startup-applications, desktop-menu and more. Package: lumina-fm Architecture: any @@ -70,15 +74,15 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}) 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. + Simple screenshot utility that allows one to snapshot the whole desktop or a + single window after a configurable delay. Package: lumina-search Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1 (= ${binary:Version}) 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 + Simple search utility that allows one to search for applications or files and directories in the user's HOME directory. Package: lumina-info @@ -98,11 +102,12 @@ Description: Display configuration tool for the lumina desktop environment Package: lumina-data Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends}, libluminautils1, lumina-desktop +Depends: ${misc:Depends}, libluminautils1, lumina-desktop 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 + This package provides + * Lumina Wallpapers + * Lumina Themes + * Lumina Translations + * Lumina Sounds + * Fallback fluxbox configuration -- cgit From 815ddd06cec720d94268e03082243a12a0ad072c Mon Sep 17 00:00:00 2001 From: Marshall Banana Date: Sat, 28 Mar 2015 21:11:19 +0100 Subject: Debian: pass buildflags to qmake, fix debug package creation, recude code --- debian/lumina-desktop.install | 3 ++- debian/rules | 40 +++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'debian') diff --git a/debian/lumina-desktop.install b/debian/lumina-desktop.install index 748ddff0..fe539844 100644 --- a/debian/lumina-desktop.install +++ b/debian/lumina-desktop.install @@ -1,2 +1,3 @@ usr/bin/Lumina-DE - +debian/luminaDesktop.conf /etc +debian/lumina-qt5ct /etc diff --git a/debian/rules b/debian/rules index 372da293..877c4cbb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,17 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +QMAKE = /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -USER_QMAKE_FLAGS = PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_HOST_MULTIARCH) QT5LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 +USER_QMAKE_FLAGS = \ + PREFIX=/usr \ + LIBPREFIX=/usr/lib/$(DEB_HOST_MULTIARCH) \ + QT5LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5 \ + QMAKE_CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" \ + QMAKE_LFLAGS="$(LDFLAGS) -Wl,--as-needed" + QMAKE_EXTRA_DIRS = libLumina \ lumina-config \ lumina-desktop \ @@ -21,36 +27,32 @@ QMAKE_EXTRA_DIRS = libLumina \ lumina-xconfig %: - dh $@ + dh $@ --parallel override_dh_auto_configure: sed -e 's/LuminaOS-Linux/LuminaOS-Debian/g' -i libLumina/libLumina.pro - /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake $(USER_QMAKE_FLAGS) - for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake $(USER_QMAKE_FLAGS)); done + $(QMAKE) $(USER_QMAKE_FLAGS) + for d in $(QMAKE_EXTRA_DIRS) ; do (cd $$d && $(QMAKE) $(USER_QMAKE_FLAGS)); done override_dh_auto_clean: dh_auto_clean -find $(CURDIR) -name *.qm -delete -sed -e 's/LuminaOS-Debian/LuminaOS-Linux/g' -i libLumina/libLumina.pro -override_dh_strip: - dh_strip -a --dbg-package=libluminautils-dbg - override_dh_install: - dh_install --fail-missing - mkdir $(CURDIR)/debian/lumina-desktop/etc/ - install -m644 $(CURDIR)/debian/luminaDesktop.conf \ - $(CURDIR)/debian/lumina-desktop/etc/luminaDesktop.conf + dh_install --list-missing echo "/usr/lib/$(DEB_HOST_MULTIARCH)/lxpolkit" > \ $(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 + # make install / dh_auto_install will automatically strip the library. + # This is a work-around to preserve the debug symbols for the debug package. + install -m644 libLumina/libLuminaUtils.so.1.0.0 \ + $(CURDIR)/debian/libluminautils1/usr/lib/$(DEB_HOST_MULTIARCH) + +override_dh_strip: + dh_strip -plibluminautils1 --dbg-package=libluminautils-dbg + dh_strip --remaining-packages -override_dh_auto_install: - INSTALL_ROOT=$(CURDIR)/debian/tmp/ $(MAKE) install - -rm -rf $(CURDIR)/debian/tmp/usr/etc/ -- cgit From 66fa3fc98d157cce8f956eca1ede55e3dcc4be29 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 28 Mar 2015 21:19:54 +0100 Subject: install lumina-qt5ct in /etc/default --- debian/lumina-desktop.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/lumina-desktop.install b/debian/lumina-desktop.install index fe539844..9a51ec4e 100644 --- a/debian/lumina-desktop.install +++ b/debian/lumina-desktop.install @@ -1,3 +1,3 @@ usr/bin/Lumina-DE debian/luminaDesktop.conf /etc -debian/lumina-qt5ct /etc +debian/lumina-qt5ct /etc/default -- cgit