Merge from Ubuntu Merge-o-Matic

4 years ago · aeb2dc7e11
parent 7365f14c76
commit aeb2dc7e11
8 changed files with 75 additions and 11 deletions
--- 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 <theloudspeaker@lubuntu.me>  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 <agaida@siduction.org>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <agaida@siduction.org>  Sun, 15 Feb 2015 18:41:53 +0100
+
--- a/debian/compat
+++ b/debian/compat
@ -1 +0,0 @@
-12
--- a/debian/control
+++ b/debian/control
@ -5,11 +5,11 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
           ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 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.
--- 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 <agaida@siduction.org>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/manpages
+++ b/debian/manpages
@ -1 +1 @@
-man/lxqt-runner.1
+usr/share/man/man1/lxqt-runner.1
--- 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
--- a/debian/source/options
+++ b/debian/source/options
@ -1,2 +1 @@
 tar-ignore=.gitignore
-
--- a/debian/upstream/metadata
+++ 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