From a3c7cb2f94993374fdc570ecdf23170268957e15 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 28 Apr 2020 18:33:03 -0500 Subject: [PATCH] Run wrap-and-sort. --- debian/changelog | 1 + debian/control | 34 ++++++++++------------- debian/liblxqt-globalkeys-ui0-dev.install | 10 +++---- debian/liblxqt-globalkeys0-dev.install | 7 ++--- debian/lxqt-globalkeys.install | 8 ++---- 5 files changed, 25 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9bf3092..53f3dd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ lxqt-globalkeys (0.15.0-0ubuntu1) UNRELEASED; urgency=medium - Update upstream signing key. * Bump Standards-version to 4.5.0, no changes needed. * debhelper -> debhelper-compat. + * Run wrap-and-sort. -- Simon Quigley Tue, 28 Apr 2020 18:29:03 -0500 diff --git a/debian/control b/debian/control index 08b72b9..acdc85f 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 12), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev, - xserver-xorg-input-libinput-dev, + xserver-xorg-input-libinput-dev Standards-Version: 4.5.0 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-globalkeys/ Vcs-Git: https://phab.lubuntu.me/source/lxqt-globalkeys.git @@ -22,11 +22,8 @@ Homepage: https://github.com/lxqt/lxqt-globalkeys Package: lxqt-globalkeys Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends} -Recommends: lxqt-globalkeys-l10n, - lxqt-qtplugin, - lxqt-session +Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: lxqt-globalkeys-l10n, lxqt-qtplugin, lxqt-session Suggests: lxqt | lxqt-core Breaks: lxqt-common (<< 0.12.0) Replaces: lxqt-common (<< 0.12.0) @@ -39,9 +36,7 @@ Package: liblxqt-globalkeys0 Architecture: any Multi-Arch: same Section: libs -Depends: ${misc:Pre-Depends}, - ${misc:Depends}, - ${shlibs:Depends} +Depends: ${misc:Depends}, ${misc:Pre-Depends}, ${shlibs:Depends} Description: daemon used to register global keyboard shortcuts (shared libs) Daemon used to register global keyboard shortcuts. . @@ -50,9 +45,9 @@ Description: daemon used to register global keyboard shortcuts (shared libs) Package: liblxqt-globalkeys0-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, - ${shlibs:Depends}, - liblxqt-globalkeys0 (= ${binary:Version}) +Depends: liblxqt-globalkeys0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} Description: daemon used to register global keyboard shortcuts (dev files) Daemon used to register global keyboard shortcuts. . @@ -62,10 +57,10 @@ Package: liblxqt-globalkeys-ui0 Architecture: any Multi-Arch: same Section: libs -Depends: ${misc:Pre-Depends}, +Depends: liblxqt-globalkeys0 (= ${binary:Version}), ${misc:Depends}, - ${shlibs:Depends}, - liblxqt-globalkeys0 (= ${binary:Version}) + ${misc:Pre-Depends}, + ${shlibs:Depends} Description: daemon used to register global keyboard shortcuts (ui files) Daemon used to register global keyboard shortcuts. . @@ -74,9 +69,9 @@ Description: daemon used to register global keyboard shortcuts (ui files) Package: liblxqt-globalkeys-ui0-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, - ${shlibs:Depends}, - liblxqt-globalkeys-ui0 (= ${binary:Version}) +Depends: liblxqt-globalkeys-ui0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} Description: daemon used to register global keyboard shortcuts (ui dev files) Daemon used to register global keyboard shortcuts. . @@ -86,8 +81,7 @@ Package: lxqt-globalkeys-l10n Architecture: all Multi-Arch: foreign Section: localization -Depends: ${misc:Depends}, - qttranslations5-l10n +Depends: qttranslations5-l10n, ${misc:Depends} Breaks: lxqt-globalkeys (<< 0.11.0) Replaces: lxqt-globalkeys (<< 0.11.0) Description: Language package for lxqt-globalkeys diff --git a/debian/liblxqt-globalkeys-ui0-dev.install b/debian/liblxqt-globalkeys-ui0-dev.install index 0eb0bdc..76bfc3b 100644 --- a/debian/liblxqt-globalkeys-ui0-dev.install +++ b/debian/liblxqt-globalkeys-ui0-dev.install @@ -1,11 +1,9 @@ -usr/include/lxqt-globalkeys-ui/shortcutselector.h -usr/include/lxqt-globalkeys-ui/shortcut_selector.h usr/include/lxqt-globalkeys-ui/LXQtGlobalKeysUi/ShortcutSelector - +usr/include/lxqt-globalkeys-ui/shortcut_selector.h +usr/include/lxqt-globalkeys-ui/shortcutselector.h usr/lib/*/liblxqt-globalkeys-ui.so usr/lib/*/pkgconfig/lxqt-globalkeys-ui.pc - -usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config.cmake usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config-version.cmake -usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config.cmake usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets-relwithdebinfo.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets.cmake diff --git a/debian/liblxqt-globalkeys0-dev.install b/debian/liblxqt-globalkeys0-dev.install index d81d4bc..22d8026 100644 --- a/debian/liblxqt-globalkeys0-dev.install +++ b/debian/liblxqt-globalkeys0-dev.install @@ -1,8 +1,7 @@ usr/include/lxqt-globalkeys/ -usr/lib/*/pkgconfig/lxqt-globalkeys.pc usr/lib/*/liblxqt-globalkeys.so - -usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake +usr/lib/*/pkgconfig/lxqt-globalkeys.pc usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config-version.cmake -usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets.cmake +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets-relwithdebinfo.cmake +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets.cmake diff --git a/debian/lxqt-globalkeys.install b/debian/lxqt-globalkeys.install index 407b8ba..f657304 100644 --- a/debian/lxqt-globalkeys.install +++ b/debian/lxqt-globalkeys.install @@ -1,10 +1,8 @@ +# configuration and autostart from lxqt-common #daemon -usr/bin/lxqt-globalkeysd - #shortcuts +etc/xdg/autostart/lxqt-globalkeyshortcuts.desktop usr/bin/lxqt-config-globalkeyshortcuts +usr/bin/lxqt-globalkeysd usr/share/applications/lxqt-config-globalkeyshortcuts.desktop - -# configuration and autostart from lxqt-common usr/share/lxqt/globalkeyshortcuts.conf etc/xdg/lxqt/globalkeyshortcuts.conf -etc/xdg/autostart/lxqt-globalkeyshortcuts.desktop