diff --git a/debian/changelog b/debian/changelog index 2aaeecf..de2aa5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,52 @@ -lxqt-globalkeys (0.14.2-0ubuntu1) eoan; urgency=medium +lxqt-globalkeys (0.14.3-1ubuntu1) focal; urgency=low - * New upstream release - * Update years in copyright file - * Bump standards-version + * Merge from Debian unstable. Remaining changes: + - Modified lxqt-globalkeys.install to include ubuntu specific changes. + The changes install default config file to another location so that distribution specific config files provided via xdg take precedence. + - new dependencies in control file. + - Translations from debian for following: + 1. config/translations/lxqt-config-globalkeyshortcuts_cs.ts + 2. config/translations/lxqt-config-globalkeyshortcuts_da.ts + 3. config/translations/lxqt-config-globalkeyshortcuts_de.ts + 4. config/translations/lxqt-config-globalkeyshortcuts_el.ts + 5. config/translations/lxqt-config-globalkeyshortcuts_gl.ts + 6. config/translations/lxqt-config-globalkeyshortcuts_gl.ts + 7. config/translations/lxqt-config-globalkeyshortcuts_ja.ts + 8. config/translations/lxqt-config-globalkeyshortcuts_it.ts + 9. config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts + 10. config/translations/lxqt-config-globalkeyshortcuts_pt.ts + 11. config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts + - Removed an unncessary patch. - -- apt-ghetto Sat, 12 Oct 2019 14:38:25 +0200 + -- Raman Sarda Tue, 07 Jan 2020 19:26:41 +0530 -lxqt-globalkeys (0.14.1-0ubuntu5) eoan; urgency=medium +lxqt-globalkeys (0.14.3-1) unstable; urgency=medium - * Drop patches move-config.patch and use-xdg-hierarchy.patch + * New upstream version 0.14.3 (Closes: #883035) - -- apt-ghetto Sun, 29 Sep 2019 11:56:57 +0200 + -- Alf Gaida Wed, 16 Oct 2019 23:33:20 +0200 + +lxqt-globalkeys (0.14.2-1) unstable; urgency=medium + + * Imported new upstream release 0.14.2. + * Switched to gbp + * Bumped Standards-Version to 4.4.1, no changes needed + * Fixed installation path for globalkeyshortcuts.conf to /usr/share/lxqt + + -- Alf Gaida Thu, 10 Oct 2019 23:34:49 +0200 + +lxqt-globalkeys (0.14.1+git20190923-0ubuntu1) eoan; urgency=medium + + * Picked the latest git. + + -- Raman Sarda Tue, 08 Oct 2019 03:27:38 +0530 +lxqt-globalkeys (0.14.1-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.14.1. + * Bumped minimum version liblxqt0-dev (>= 0.14.1~) + * Extended the long descriptions a bit + + -- Alf Gaida Sun, 24 Feb 2019 21:28:30 +0100 lxqt-globalkeys (0.14.1-0ubuntu4) eoan; urgency=medium @@ -36,6 +72,20 @@ lxqt-globalkeys (0.14.1-0ubuntu1) disco; urgency=medium * New upstream release. -- Simon Quigley Sat, 09 Mar 2019 13:06:02 -0600 +lxqt-globalkeys (0.14.0-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.14.0. + * Bumped Standards to 4.3.0, no changes needed + * Dropped d/compat, use debhelper-compat = 12, no changes needed + * Fixed years in d/copyright + * Bumped minimum version liblxqt0-dev (>= 0.14.0~) + * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure + * Added Build-Depends-Package fields to symbols + * Added l10n-package, moved from lxqt-l10n + * Added build dependency xserver-xorg-input-libinput-dev + * Added d/upstream/metadata + + -- Alf Gaida Sun, 27 Jan 2019 17:37:07 +0100 lxqt-globalkeys (0.14.0-0ubuntu1) disco; urgency=medium @@ -46,6 +96,12 @@ lxqt-globalkeys (0.14.0-0ubuntu1) disco; urgency=medium * Add a lxqt-globalkeys-l10n package. -- Simon Quigley Sat, 26 Jan 2019 00:15:52 -0600 +lxqt-globalkeys (0.13.0-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.13.0. + * Bumped build dependency liblxqt0-dev to >= 0.13.0~ + + -- Alf Gaida Thu, 24 May 2018 21:23:58 +0200 lxqt-globalkeys (0.13.0-0ubuntu2) cosmic; urgency=medium diff --git a/debian/control b/debian/control index a418773..b18e356 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,9 @@ Build-Depends: debhelper (>= 12), liblxqt0-dev (>= 0.14.0), libqt5svg5-dev, libqt5x11extras5-dev, - libx11-dev -Standards-Version: 4.4.1.1 + libx11-dev, + xserver-xorg-input-libinput-dev, +Standards-Version: 4.4.1 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-globalkeys/ Vcs-Git: https://phab.lubuntu.me/source/lxqt-globalkeys.git XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-globalkeys diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..9552c6c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz diff --git a/debian/patches/complete-config-file.patch b/debian/patches/complete-config-file.patch deleted file mode 100644 index bd368b3..0000000 --- a/debian/patches/complete-config-file.patch +++ /dev/null @@ -1,215 +0,0 @@ -Description: Provide a more complete configuration file. -Author: Walter Lapchynski -Last-Update: 2018-10-06 ---- a/xdg/globalkeyshortcuts.conf -+++ b/xdg/globalkeyshortcuts.conf -@@ -1,46 +1,187 @@ -+[General] -+AllowGrabBaseKeypad=true -+AllowGrabBaseSpecial=false -+AllowGrabLocks=false -+AllowGrabMiscKeypad=true -+AllowGrabMiscSpecial=true -+MultipleActionsBehaviour=first - --[Control%2BAlt%2BT.1] --Comment=QTerminal -+[.20] -+Comment=Switch to desktop 7 - Enabled=true --Exec=qterminal -+path=/panel/desktopswitch/desktop_7 - --[Shift%2BControl%2BF6.2] --Comment=\x2600 \x2193 -+[.23] -+Comment=Switch to desktop 10 - Enabled=true --Exec=lxqt-config-brightness, -d -+path=/panel/desktopswitch/desktop_10 - --[Shift%2BControl%2BF7.3] --Comment=\x2600 \x2191 -+[.24] -+Comment=Switch to desktop 11 - Enabled=true --Exec=lxqt-config-brightness, -i -+path=/panel/desktopswitch/desktop_11 - --[XF86MonBrightnessDown.4] --Comment=\x2600 \x2193 -+[.36] -+Comment=Show/hide runner dialog - Enabled=true --Exec=lxqt-config-brightness, -d -+path=/runner/show_hide_dialog - --[XF86MonBrightnessUp.5] --Comment=\x2600 \x2191 -+[Control%2BAlt%2BD.10] -+Comment=Show desktop - Enabled=true --Exec=lxqt-config-brightness, -i -+path=/panel/showdesktop/show_hide - -- --[Control%2BAlt%2BE.6] -+[Control%2BAlt%2BE.1] - Comment=Pcmanfm - Enabled=true - Exec=pcmanfm-qt - --[Control%2BAlt%2BI.7] -+[Control%2BAlt%2BI.2] - Comment=Web browser - Enabled=true - Exec=xdg-open, about:blank - --[Print.8] -+[Control%2BAlt%2BL.3] -+Comment=lockscreen -+Enabled=true -+Exec=xdg-screensaver, lock -+ -+[Control%2BF1.14] -+Comment=Switch to desktop 1 -+Enabled=true -+path=/panel/desktopswitch/desktop_1 -+ -+[Control%2BF12.25] -+Comment=Switch to desktop 12 -+Enabled=true -+path=/panel/desktopswitch/desktop_12 -+ -+[Control%2BF2.15] -+Comment=Switch to desktop 2 -+Enabled=true -+path=/panel/desktopswitch/desktop_2 -+ -+[Control%2BF3.16] -+Comment=Switch to desktop 3 -+Enabled=true -+path=/panel/desktopswitch/desktop_3 -+ -+[Control%2BF4.17] -+Comment=Switch to desktop 4 -+Enabled=true -+path=/panel/desktopswitch/desktop_4 -+ -+[Control%2BF5.18] -+Comment=Switch to desktop 5 -+Enabled=true -+path=/panel/desktopswitch/desktop_5 -+ -+[Control%2BF6.19] -+Comment=Switch to desktop 6 -+Enabled=true -+path=/panel/desktopswitch/desktop_6 -+ -+[Control%2BF8.21] -+Comment=Switch to desktop 8 -+Enabled=true -+path=/panel/desktopswitch/desktop_8 -+ -+[Control%2BF9.22] -+Comment=Switch to desktop 9 -+Enabled=true -+path=/panel/desktopswitch/desktop_9 -+ -+[Meta%2B0.35] -+Comment=Activate task 10 -+Enabled=true -+path=/panel/taskbar/task_10 -+ -+[Meta%2B1.26] -+Comment=Activate task 1 -+Enabled=true -+path=/panel/taskbar/task_1 -+ -+[Meta%2B2.27] -+Comment=Activate task 2 -+Enabled=true -+path=/panel/taskbar/task_2 -+ -+[Meta%2B3.28] -+Comment=Activate task 3 -+Enabled=true -+path=/panel/taskbar/task_3 -+ -+[Meta%2B4.29] -+Comment=Activate task 4 -+Enabled=true -+path=/panel/taskbar/task_4 -+ -+[Meta%2B5.30] -+Comment=Activate task 5 -+Enabled=true -+path=/panel/taskbar/task_5 -+ -+[Meta%2B6.31] -+Comment=Activate task 6 -+Enabled=true -+path=/panel/taskbar/task_6 -+ -+[Meta%2B7.32] -+Comment=Activate task 7 -+Enabled=true -+path=/panel/taskbar/task_7 -+ -+[Meta%2B8.33] -+Comment=Activate task 8 -+Enabled=true -+path=/panel/taskbar/task_8 -+ -+[Meta%2B9.34] -+Comment=Activate task 9 -+Enabled=true -+path=/panel/taskbar/task_9 -+ -+[Print.4] - Comment=screen shot - Enabled=true - Exec=lximage-qt, -s - --[Control%2BAlt%2BL.30] --Comment=lockscreen -+[Shift%2BControl%2BF6.5] -+Comment=\x2600 \x2193 - Enabled=true --Exec=xdg-screensaver, lock -+Exec=lxqt-config-brightness, -d -+ -+[Shift%2BControl%2BF7.6] -+Comment=\x2600 \x2191 -+Enabled=true -+Exec=lxqt-config-brightness, -i -+ -+[Super_L.9] -+Comment=Show/hide main menu -+Enabled=true -+path=/panel/mainmenu/show_hide -+ -+[XF86AudioLowerVolume.12] -+Comment=Decrease sound volume -+Enabled=true -+path=/panel/volume/down -+ -+[XF86AudioMute.13] -+Comment=Mute/unmute sound volume -+Enabled=true -+path=/panel/volume/mute -+ -+[XF86AudioRaiseVolume.11] -+Comment=Increase sound volume -+Enabled=true -+path=/panel/volume/up -+ -+[XF86MonBrightnessDown.7] -+Comment=\x2600 \x2193 -+Enabled=true -+Exec=lxqt-config-brightness, -d -+ -+[XF86MonBrightnessUp.8] -+Comment=\x2600 \x2191 -+Enabled=true -+Exec=lxqt-config-brightness, -i diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 696c5fa..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -complete-config-file.patch