diff --git a/debian/.gitignore b/debian/.gitignore index 414eb83..5d22e03 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -5,5 +5,3 @@ /lxqt-session/ /lxqt-session-dbg/ -/lxqt-session-qt5/ -/lxqt-session-qt5-dbg/ diff --git a/debian/changelog b/debian/changelog index e805d42..2a675aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +lxqt-session (0.9.0+20150807-2) unstable; urgency=medium + + * rename lxqt-session.manpages to manpages + * allow build on non-linux platforms (Thanks Pino Toscano) + (Closes: #803656) + * Added lintian-overrides for invalid category + * Fix some wording of debian/copyright + * Fixed some copyright dates + + -- Alf Gaida Thu, 12 Nov 2015 20:11:50 +0100 + lxqt-session (0.9.0+20150807-1) unstable; urgency=low * Initial release (Closes: #747608) diff --git a/debian/control b/debian/control index 93ebebf..2ec8c25 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), liblxqt0-dev, libqt5x11extras5-dev, libqt5xdg-dev, - libudev-dev, + libudev-dev [linux-any], libx11-dev, pkg-config, qttools5-dev, diff --git a/debian/copyright b/debian/copyright index e0685c0..fd28f79 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,15 +3,15 @@ Upstream-Name: lxqt-session Source: https://github.com/lxde/lxqt-session Files: * -Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2014 LXQt team +Copyright: 2010-2012 Razor team + 2012-2015 LXQt team License: LGPL-2.1+ Files: lxqt-config-session/autostartedit.* lxqt-config-session/autostartitem.* lxqt-config-session/autostartpage.* lxqt-config-session/modulemodel.* -Copyright: Copyright (C) 2011-2012 Alec Moskvin +Copyright: 2011-2012 Alec Moskvin License: LGPL-2.1+ Files: lxqt-config-session/basicsettings.* @@ -19,7 +19,7 @@ Files: lxqt-config-session/basicsettings.* lxqt-config-session/environmentpage.* lxqt-config-session/main.cpp lxqt-config-session/sessionconfigwindow.* -Copyright: Copyright 2010-2012 LxQt team +Copyright: 2010-2015 LXQt team License: LGPL-2.1+ Files: lxqt-leave/leavedialog.* @@ -31,11 +31,11 @@ Files: lxqt-session/src/UdevNotifier.* lxqt-session/src/sessiondbusadaptor.h lxqt-session/src/windowmanager.* lxqt-session/src/wmselectdialog.* -Copyright: Copyright: 2010-2015 LXQt team +Copyright: 2010-2015 LXQt team License: LGPL-2.1+ Files: lxqt-session/src/sessionapplication.* -Copyright: Copyright (C) 2014 Hong Jen Yee (PCMan) +Copyright: 2014 Hong Jen Yee (PCMan) License: LGPL-2.1+ Files: debian/* diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..fb4937b --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1,2 @@ +# category LXQt in not yet in freedesktop specs - no bug +lxqt-session: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-*.desktop diff --git a/debian/lxqt-session.manpages b/debian/manpages similarity index 100% rename from debian/lxqt-session.manpages rename to debian/manpages diff --git a/debian/rules b/debian/rules index 0477ba7..da3186c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,19 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +ifneq ($(DEB_HOST_ARCH_OS),linux) + CMAKE_ARGS += -DLIBUDEV_MONITOR=OFF +endif + %: dh ${@} --buildsystem cmake --parallel +override_dh_auto_configure: + dh_auto_configure -- $(CMAKE_ARGS) + override_dh_auto_install: dh_auto_install -- DESTDIR=$(CURDIR)/debian/lxqt-session