diff --git a/debian/changelog b/debian/changelog index 2f5ffb5..8220593 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,5 @@ -lxqt-session (0.8.0-1) unstable; urgency=medium - - * Upstream version 0.8.0 - * Min liblxqt-qt5-0-dev version 0.8.0 - * Min Qt version 5.3.2 - * bump standards to 3.9.6 - * modify debian/rules to provide LIB_SUFFIX - * lintian-overrides for missed manpages and invalid category - * short descriptions and descriptions fixed - - -- Alf Gaida Sun, 19 Oct 2014 18:06:19 +0200 - -lxqt-session (0.7.96-1) unstable; urgency=low +lxqt-session (0.9.0-1) unstable; urgency=low * Initial release (Closes: #747608) - -- Alf Gaida Mon, 24 Feb 2014 23:41:30 +0100 + -- Alf Gaida Sun, 15 Feb 2015 13:43:18 +0100 diff --git a/debian/control b/debian/control index 09544a2..c46bb30 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,16 @@ Source: lxqt-session Section: x11 Priority: optional -Maintainer: Alf Gaida +Maintainer: Debian LXQt Maintainers +Uploaders: + Alf Gaida Build-Depends: - cmake, + cmake (>= 3.0.2), debhelper (>= 9), libx11-dev, pkg-config, - liblxqt-qt5-0-dev (>= 0.8.0), + libkf5windowsystem-dev (>= 5.5.0), + liblxqt0-dev (>= 0.9.0), libqt5x11extras5-dev (>= 5.3.2), libqt5xdg-dev (>= 1.0.0), qttools5-dev (>= 5.3.2), @@ -17,15 +20,19 @@ Homepage: https://github.com/lxde/lxqt-session #Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-session.git #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-session.git;a=summary -Package: lxqt-session-qt5 +Package: lxqt-session Provides: x-session-manager Architecture: any Breaks: - lxqt-session, + lxqt-session-qt5 (<< 0.9.0), + lxqt-power (<< 0.9.0), + lxqt-appswitcher (<< 0.9.0), Replaces: - lxqt-session, -Pre-Depends: - lxqt-common-qt5, + lxqt-session-qt5 (<< 0.9.0), + lxqt-power (<< 0.9.0), + lxqt-appswitcher (<< 0.9.0), +Pre-Depends: + lxqt-common, Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -37,17 +44,37 @@ Description: Session manager component for LXQt . This package contain the session manager component. -Package: lxqt-session-qt5-dbg +Package: lxqt-session-dbg Architecture: any Section: debug Priority: extra +Breaks: lxqt-session-qt5-dbg (<< 0.9.0) +Replaces: lxqt-session-qt5-dbg (<< 0.9.0) Depends: ${misc:Depends}, - lxqt-session-qt5 (= ${binary:Version}), -Description: Session manager component for LXQt(debug symbols) + lxqt-session (= ${binary:Version}), +Description: Session manager component for LXQt (debug symbols) LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt technologies. It has been tailored for users who value simplicity, speed, and an intuitive interface. Unlike most desktop environments, LXQt also works fine with less powerful machines. . This package contain the debugging symbols. + +# ---- to be removed in 2016 ---- + +Package: lxqt-session-qt5 +Depends: lxqt-session, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-session transitional package + Empty package to facilitate upgrades, can be safely removed. + +Package: lxqt-session-qt5-dbg +Depends: lxqt-session-dbg, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: lxqt-session transitional package + Empty package to facilitate upgrades, can be safely removed. diff --git a/debian/copyright b/debian/copyright index ea0c51f..af0540f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-session Source: https://github.com/lxde/lxqt-session Files: * -Copyright: 2012-2014 LXQt team +Copyright: 2012-2015 LXQt team 2010-2012 Razor team License: GPL-2.0+ and LGPL-2.1+ Files: debian/* -Copyright: 2014 Alf Gaida +Copyright: 2014-2015 Alf Gaida License: LGPL-2.1+ License: GPL-2.0+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 6a5ed2a..d07ec07 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,7 +1,7 @@ # there will be no man pages for a foreseable future -lxqt-session-qt5: binary-without-manpage usr/bin/lxqt-config-session -lxqt-session-qt5: binary-without-manpage usr/bin/lxqt-session +lxqt-session: binary-without-manpage usr/bin/lxqt-config-session +lxqt-session: binary-without-manpage usr/bin/lxqt-session # LXQt category isn't in freedesktop specs right now -lxqt-session-qt5: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-session.desktop +lxqt-session: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-session.desktop diff --git a/debian/preinst b/debian/preinst index 1130433..0797277 100644 --- a/debian/preinst +++ b/debian/preinst @@ -3,7 +3,8 @@ set -e if [ "$1" = upgrade ]; then - update-alternatives --remove x-window-manager /usr/bin/startlxqt + + [ -f /usr/bin/startlxqt ] && update-alternatives --remove x-window-manager /usr/bin/startlxqt fi #DEBHELPER# diff --git a/debian/rules b/debian/rules index a9df73a..9f72d3c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,10 +1,9 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 -export USE_QT5=1 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) + %: dh ${@} --buildsystem cmake --parallel @@ -12,9 +11,8 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) override_dh_auto_configure: dh_auto_configure -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" - override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-session-qt5 + dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-session override_dh_strip: - dh_strip --dbg-package=lxqt-session-qt5-dbg + dh_strip --dbg-package=lxqt-session-dbg diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..be5dabe --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +tar-ignore=.gitignore +