From b03e9d7595f39fcfb40ff72e1049f58df233c3f5 Mon Sep 17 00:00:00 2001 From: Raman Sarda Date: Sun, 9 Feb 2020 12:10:28 +0530 Subject: [PATCH] Correctly Merge from Merge-o-Matic Summary: * Bumped minimum requirements in control file * Copyright updates. * Updated debian/watch to point to correct source. * Updated debian/upstream/metadata Test Plan: Lookout if anything breaks due to the update. Also check about debhelper and debhelper-compat. Reviewers: rikmills, wxl Differential Revision: https://phab.lubuntu.me/D81 --- debian/changelog | 11 +++++++++++ debian/compat | 1 - debian/control | 4 ++-- debian/copyright | 4 ++-- debian/upstream/metadata | 6 ++++++ debian/watch | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index 2321417..84aeabb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +lxqt-panel (0.14.1-1ubuntu2) focal; urgency=medium + + * Correct merge from Ubuntu Merge-oMatic + * Bumped minimum requirements in control file + * Copyright updates. + * Updated debian/watch to point to correct source. + * Updated debian/upstream/metadata + * using debhelper-compat instead of debhelper and d/compat + + -- Raman Sarda Sun, 09 Feb 2020 11:29:09 +0530 + lxqt-panel (0.14.1-1ubuntu1) focal; urgency=low * Merge from Debian unstable. Remaining changes: 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 363e8a2..ebcf98f 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ XSBC-Original-Maintainer: LXQt Packaging Team Section: x11 Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), libasound2-dev, libdbusmenu-qt5-dev, libglib2.0-dev, @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 12), libqt5x11extras5-dev, libsensors4-dev [!hurd-any], libstatgrab-dev [linux-any], - libsysstat-qt5-0-dev (>= 0.4.2), + libsysstat-qt5-0-dev (>= 0.4.2~), libx11-dev, libxcb-damage0-dev, libxcb-util0-dev, diff --git a/debian/copyright b/debian/copyright index 8913b32..380eef7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-panel -Source: https://github.com/lxde/lxqt-panel +Source: https://github.com/lxqt/lxqt-panel Files: * -Copyright: 2012-2018 LXQt team +Copyright: 2012-2019 LXQt team 2010-2012 Razor team License: LGPL-2.1+ diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..5026336 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +Name: lxqt-panel +Bug-Database: https://github.com/lxqt/lxqt-panel/issues +Bug-Submit: https://github.com/lxqt/lxqt-panel/issues/new +Changelog: https://github.com/lxqt/lxqt-panel/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-panel +Repository-Browser: https://github.com/lxqt/lxqt-panel diff --git a/debian/watch b/debian/watch index fefb4ad..7691da5 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz + https://github.com/lxqt/lxqt-panel/releases .*/lxqt-panel-([\d\.]+).tar.xz