From c8f4fe8700994b3c92d380c4320a4a04087d69f1 Mon Sep 17 00:00:00 2001 From: Raman Sarda Date: Wed, 12 Feb 2020 11:21:14 +0530 Subject: [PATCH] Merge from Ubuntu Merge-o-Matic --- debian/changelog | 38 ++++++++++++++++++++++++++++++++++++++ debian/compat | 1 - debian/control | 4 ++-- debian/copyright | 4 ++-- debian/upstream/metadata | 7 +++++++ 5 files changed, 49 insertions(+), 5 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index e393846..dec048b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +lxqt-powermanagement (0.14.1-1ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Using debhelper-compat + - Keeping ubuntu-side tweaks of writing depends in one line. + - Updated build deps according to new minimum requirements. + - Added upstream metadata + + -- Raman Sarda Wed, 12 Feb 2020 11:13:49 +0530 + +lxqt-powermanagement (0.14.1-1) unstable; urgency=medium + + * Cherry-picking new upstream version 0.14.1. + * Bumped minimum version liblxqt0-dev (>= 0.14.1~) + + -- Alf Gaida Tue, 26 Feb 2019 02:47:54 +0100 + lxqt-powermanagement (0.14.1-0ubuntu1) disco; urgency=medium * New upstream release. @@ -5,6 +22,19 @@ lxqt-powermanagement (0.14.1-0ubuntu1) disco; urgency=medium -- Simon Quigley Sat, 09 Mar 2019 13:15:31 -0600 +lxqt-powermanagement (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 l10n-package, moved from lxqt-l10n + * Added d/upstream/metadata + + -- Alf Gaida Sun, 27 Jan 2019 18:03:45 +0100 + lxqt-powermanagement (0.14.0-0ubuntu1) disco; urgency=medium * New upstream release. @@ -15,6 +45,13 @@ lxqt-powermanagement (0.14.0-0ubuntu1) disco; urgency=medium -- Simon Quigley Sat, 26 Jan 2019 00:39:28 -0600 +lxqt-powermanagement (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 22:46:32 +0200 + lxqt-powermanagement (0.13.0-0ubuntu1) cosmic; urgency=medium * New upstream release. @@ -177,3 +214,4 @@ lxqt-powermanagement (0.9.0+20150807-1) unstable; urgency=medium * Merging upstream version 0.9.0+20150807. -- Andrew Lee (李健秋) Sun, 16 Aug 2015 19:19:12 +0800 + 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 d737893..2ee4d27 100644 --- a/debian/control +++ b/debian/control @@ -6,11 +6,11 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), libkf5idletime-dev, libkf5solid-dev, libkf5windowsystem-dev, - liblxqt0-dev (>= 0.14.0), + liblxqt0-dev (>= 0.14.1~), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev, diff --git a/debian/copyright b/debian/copyright index 080ebab..6f0b423 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: lxqt-powermanagement Source: https://github.com/lxqt/lxqt-powermanagement Files: * -Copyright: 2013-2018 LXQt team +Copyright: 2013-2019 LXQt team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2018 Alf Gaida +Copyright: 2014-2019 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..0194f40 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,7 @@ +Name: lxqt-powermanagement +Bug-Database: https://github.com/lxqt/lxqt-powermanagement/issues +Bug-Submit: https://github.com/lxqt/lxqt-powermanagement/issues/new +Changelog: https://github.com/lxqt/lxqt-powermanagement/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-powermanagement +Repository-Browser: https://github.com/lxqt/lxqt-powermanagement +