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
This commit is contained in:
parent
4ef0632ba2
commit
b03e9d7595
11
debian/changelog
vendored
11
debian/changelog
vendored
@ -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 <theloudspeaker@lubuntu.me> Sun, 09 Feb 2020 11:29:09 +0530
|
||||||
|
|
||||||
lxqt-panel (0.14.1-1ubuntu1) focal; urgency=low
|
lxqt-panel (0.14.1-1ubuntu1) focal; urgency=low
|
||||||
|
|
||||||
* Merge from Debian unstable. Remaining changes:
|
* Merge from Debian unstable. Remaining changes:
|
||||||
|
1
debian/compat
vendored
1
debian/compat
vendored
@ -1 +0,0 @@
|
|||||||
12
|
|
4
debian/control
vendored
4
debian/control
vendored
@ -4,7 +4,7 @@ XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debia
|
|||||||
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
|
Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
|
||||||
Section: x11
|
Section: x11
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Build-Depends: debhelper (>= 12),
|
Build-Depends: debhelper-compat (= 12),
|
||||||
libasound2-dev,
|
libasound2-dev,
|
||||||
libdbusmenu-qt5-dev,
|
libdbusmenu-qt5-dev,
|
||||||
libglib2.0-dev,
|
libglib2.0-dev,
|
||||||
@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 12),
|
|||||||
libqt5x11extras5-dev,
|
libqt5x11extras5-dev,
|
||||||
libsensors4-dev [!hurd-any],
|
libsensors4-dev [!hurd-any],
|
||||||
libstatgrab-dev [linux-any],
|
libstatgrab-dev [linux-any],
|
||||||
libsysstat-qt5-0-dev (>= 0.4.2),
|
libsysstat-qt5-0-dev (>= 0.4.2~),
|
||||||
libx11-dev,
|
libx11-dev,
|
||||||
libxcb-damage0-dev,
|
libxcb-damage0-dev,
|
||||||
libxcb-util0-dev,
|
libxcb-util0-dev,
|
||||||
|
4
debian/copyright
vendored
4
debian/copyright
vendored
@ -1,9 +1,9 @@
|
|||||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
Upstream-Name: lxqt-panel
|
Upstream-Name: lxqt-panel
|
||||||
Source: https://github.com/lxde/lxqt-panel
|
Source: https://github.com/lxqt/lxqt-panel
|
||||||
|
|
||||||
Files: *
|
Files: *
|
||||||
Copyright: 2012-2018 LXQt team
|
Copyright: 2012-2019 LXQt team
|
||||||
2010-2012 Razor team
|
2010-2012 Razor team
|
||||||
License: LGPL-2.1+
|
License: LGPL-2.1+
|
||||||
|
|
||||||
|
6
debian/upstream/metadata
vendored
Normal file
6
debian/upstream/metadata
vendored
Normal file
@ -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
|
2
debian/watch
vendored
2
debian/watch
vendored
@ -1,3 +1,3 @@
|
|||||||
version=4
|
version=4
|
||||||
opts="pgpsigurlmangle=s/$/.asc/" \
|
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user