diff --git a/debian/changelog b/debian/changelog index b9ef54f..93ae86c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +lxqt-globalkeys (0.12.0-1) experimental; urgency=medium + + * Cherry-picking upstream release 0.12.0. + * Switched to experimental + * Bumped liblxqt0-dev to >= 0.12.0 + * Bumped Standards to 4.1.1 +Vcs-Browser: + * Added Breaks/Replaces for lxqt-common << 0.12.0 + * Added override_dh_missing + * Added autostart things to install + + -- Alf Gaida Tue, 24 Oct 2017 17:24:29 +0200 + lxqt-globalkeys (0.11.1-2) unstable; urgency=medium * Bump Standards to 4.0.0 - no changes needed diff --git a/debian/control b/debian/control index 0155d29..1b61c3e 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,13 @@ Section: x11 Priority: optional Build-Depends: debhelper (>= 10), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.11.1), + liblxqt0-dev (>= 0.12.0), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev -Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-globalkeys.git -b debian/sid +Standards-Version: 4.1.1 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git/?h=debian/experimental +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-globalkeys.git -b debian/experimental Homepage: https://github.com/lxde/lxqt-globalkeys Package: lxqt-globalkeys @@ -24,6 +24,8 @@ Recommends: lxqt-globalkeys-l10n, lxqt-qtplugin, lxqt-session Suggests: lxqt | lxqt-core +Breaks: lxqt-common (<< 0.12.0) +Replaces: lxqt-common (<< 0.12.0) Description: daemon used to register global keyboard shortcuts (appl.) Daemon used to register global keyboard shortcuts. . diff --git a/debian/gbp.conf b/debian/gbp.conf index 7a9f00a..ffe50a8 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = debian/experimental upstream-branch = upstream/latest pristine-tar = True diff --git a/debian/lxqt-globalkeys.install b/debian/lxqt-globalkeys.install index 72190d7..6984d6d 100644 --- a/debian/lxqt-globalkeys.install +++ b/debian/lxqt-globalkeys.install @@ -4,3 +4,7 @@ usr/bin/lxqt-globalkeysd #shortcuts usr/bin/lxqt-config-globalkeyshortcuts usr/share/applications/lxqt-config-globalkeyshortcuts.desktop + +# configuration and autostart from lxqt-common +etc/xdg/lxqt/globalkeyshortcuts.conf +etc/xdg/autostart/lxqt-globalkeyshortcuts.desktop diff --git a/debian/rules b/debian/rules index f85fee0..981aa07 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake \ - --fail-missing + dh ${@} --buildsystem cmake + +override_dh_missing: + dh_missing --fail-missing override_dh_auto_configure: dh_auto_configure -- \