From aeb2dc7e11a3f79ebd53b44e0d3b0c663d38b418 Mon Sep 17 00:00:00 2001 From: Raman Sarda Date: Wed, 12 Feb 2020 11:53:34 +0530 Subject: [PATCH] Merge from Ubuntu Merge-o-Matic --- debian/changelog | 55 ++++++++++++++++++++++++++++++++++++++++ debian/compat | 1 - debian/control | 16 +++++++----- debian/copyright | 4 +-- debian/manpages | 2 +- debian/rules | 1 + debian/source/options | 1 - debian/upstream/metadata | 6 +++++ 8 files changed, 75 insertions(+), 11 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 6119bd9..02c6bb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +lxqt-runner (0.14.1-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Using debhelper-compat. + - Bump miminum requirements in build deps. + - Updated manpages. + - Removed whitespace in debian/source/options. + - Added upstream metadata. + - keeping ubutu-side tweaks of writing some build deps in one line. + - Updated copyright. + - Updated debian/rules. + + -- Raman Sarda Wed, 12 Feb 2020 11:43:52 +0530 + +lxqt-runner (0.14.1-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.14.1. + * Bumped minimum versions: + - liblxqt0-dev (>= 0.14.1~) + - liblxqt-globalkeys0-dev (>= 0.14.1~) + - liblxqt-globalkeys-ui0-dev (>= 0.14.1~) + * Improve the description for l10n a bit + + -- Alf Gaida Mon, 25 Feb 2019 01:07:36 +0100 + lxqt-runner (0.14.1-0ubuntu1) disco; urgency=medium * New upstream release. @@ -5,6 +30,23 @@ lxqt-runner (0.14.1-0ubuntu1) disco; urgency=medium -- Simon Quigley Sat, 09 Mar 2019 13:29:08 -0600 +lxqt-runner (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 versions: + - liblxqt0-dev (>= 0.14.0~) + - liblxqt-globalkeys0-dev (>= 0.14.0~) + - liblxqt-globalkeys-ui0-dev (>= 0.14.0~) + * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure + * Added l10n-package, moved from lxqt-l10n + * Fixed d/manpages + * Added d/upstream/metadata + + -- Alf Gaida Sun, 27 Jan 2019 23:37:58 +0100 + lxqt-runner (0.14.0-0ubuntu1) disco; urgency=medium * New upstream release. @@ -15,6 +57,18 @@ lxqt-runner (0.14.0-0ubuntu1) disco; urgency=medium -- Simon Quigley Sat, 26 Jan 2019 01:24:46 -0600 +lxqt-runner (0.13.0-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.13.0. + * Bumped build dependencies: + - liblxqt0-dev to >= 0.13.0~ + - liblxqt-globalkeys0-dev to >= 0.13.0~ + - liblxqt-globalkeys-ui0-dev to >= 0.13.0~ + * Removed not used build dependency qtbase5-private-dev + * Moved debian/.gitignore to ./.gitignore + + -- Alf Gaida Fri, 25 May 2018 00:30:26 +0200 + lxqt-runner (0.13.0-0ubuntu1) cosmic; urgency=medium * New upstream release. @@ -201,3 +255,4 @@ lxqt-runner (0.9.0+20150831-1) experimental; urgency=medium * Adding upstream version 0.9.0. -- Alf Gaida Sun, 15 Feb 2015 18:41:53 +0100 + diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 39f7422..60c151f 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) Section: x11 Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), libkf5windowsystem-dev, - liblxqt-globalkeys-ui0-dev (>= 0.14.0), - liblxqt-globalkeys0-dev (>= 0.14.0), - liblxqt0-dev (>= 0.14.0), + liblxqt0-dev (>= 0.14.1~), + liblxqt-globalkeys0-dev (>= 0.14.1~), + liblxqt-globalkeys-ui0-dev (>= 0.14.1~), libmuparser-dev, libqt5svg5-dev, libqt5x11extras5-dev, @@ -30,7 +30,8 @@ Suggests: lxqt | lxqt-core Breaks: lxqt-common (<< 0.12.0) Replaces: lxqt-common (<< 0.12.0) Description: LXQt program launcher - Tool used to launch programs quickly by typing their names + The LXQt runner provides a GUI that comes up on the desktop and allows for + launching applications, doing some math or shutting down the system. . This package contain LXQt runner. @@ -42,4 +43,7 @@ Depends: qttranslations5-l10n, ${misc:Depends} Breaks: lxqt-runner (<< 0.11.0) Replaces: lxqt-runner (<< 0.11.0) Description: Language package for lxqt-runner - This package contains the l10n files needed by lxqt-runner. + The LXQt runner provides a GUI that comes up on the desktop and allows for + launching applications, doing some math or shutting down the system. + . + This package contains the l10n files needed by the lxqt-runner. diff --git a/debian/copyright b/debian/copyright index 25f635c..bbadc4f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-runner Source: https://github.com/lxqt/lxqt-runner Files: * -Copyright: 2012-2018 LXQt team +Copyright: 2012-2019 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2018 Alf Gaida +Copyright: 2014-2019 Alf Gaida License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/debian/manpages b/debian/manpages index 22916f1..4574af3 100644 --- a/debian/manpages +++ b/debian/manpages @@ -1 +1 @@ -man/lxqt-runner.1 +usr/share/man/man1/lxqt-runner.1 diff --git a/debian/rules b/debian/rules index 34aa51e..6862d2b 100755 --- a/debian/rules +++ b/debian/rules @@ -13,4 +13,5 @@ override_dh_auto_configure: -DPULL_TRANSLATIONS=OFF \ -DUPDATE_TRANSLATIONS=OFF \ -DUSE_MENU_CACHE=OFF \ + -DRUNNER_MATH=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/source/options b/debian/source/options index be5dabe..112dfc8 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1 @@ tar-ignore=.gitignore - diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..719fb1e --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +Name: lxqt-runner +Bug-Database: https://github.com/lxqt/lxqt-runner/issues +Bug-Submit: https://github.com/lxqt/lxqt-runner/issues/new +Changelog: https://github.com/lxqt/lxqt-runner/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-runner +Repository-Browser: https://github.com/lxqt/lxqt-runner