diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 43 | ||||
| -rw-r--r-- | debian/lumina-desktop.install | 3 | ||||
| -rwxr-xr-x | debian/rules | 44 |
4 files changed, 59 insertions, 40 deletions
diff --git a/debian/changelog b/debian/changelog index 57f13dba..b12b8d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 <nano@jpberlin.de> Sat, 28 Mar 2015 18:38:13 +0100 + lumina-desktop (0.8.3.427-1nano) unstable; urgency=low * New git snapshot diff --git a/debian/control b/debian/control index fda9e4c0..2ef40b6a 100644 --- a/debian/control +++ b/debian/control @@ -3,10 +3,11 @@ Section: x11 Priority: optional Maintainer: Christopher Roy Bratusek <nano@jpberlin.de> 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-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 + libqt5x11extras5-dev, qttools5-dev-tools, libxcb-image0-dev, + libxcb-composite0-dev Standards-Version: 3.9.5 Homepage: https://github.com/pcbsd/lumina @@ -16,27 +17,32 @@ 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. 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 +51,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 +76,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 +104,12 @@ 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}, 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 diff --git a/debian/lumina-desktop.install b/debian/lumina-desktop.install index 748ddff0..9a51ec4e 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/default diff --git a/debian/rules b/debian/rules index d15b44d9..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: - -$(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: - 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/ |