From edd9b463016b2b8fc1a548e35b5861f76f122ddf Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Sat, 9 Mar 2019 12:51:45 -0600 Subject: [PATCH] Merge in latest archive upload. --- debian/changelog | 14 ++++++++++++++ debian/compat | 1 - debian/control | 2 +- debian/copyright | 4 ++-- debian/rules | 6 ++++-- debian/source/options | 1 - debian/upstream/metadata | 6 ++++++ 7 files changed, 27 insertions(+), 7 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index d031244..6eeb4cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +lxqt-admin (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 + * Removed fix-duplicated-key.patch, applied upstream + * Added d/upstream/metadata + + -- Alf Gaida Sun, 27 Jan 2019 16:17:25 +0100 + lxqt-admin (0.14.0-0ubuntu1) disco; urgency=medium * New upstream release. 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 7d4e7cb..f98fad6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), libkf5windowsystem-dev, liblxqt0-dev (>= 0.14.0), libpolkit-qt5-1-dev, diff --git a/debian/copyright b/debian/copyright index 2d8931a..4463db7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,12 @@ Upstream-Name: lxqt-admin Source: https://github.com/lxqt/lxqt-admin Files: * -Copyright: 2014-2018 LXQt team +Copyright: 2014-2019 LXQt team 2014 Hong Jen Yee (PCMan) 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/rules b/debian/rules index 9dbedc2..b8fdf4e 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,10 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh ${@} --buildsystem cmake +override_dh_missing: + dh_missing --fail-missing + override_dh_auto_configure: dh_auto_configure -- \ - -DPULL_TRANSLATIONS=OFF\ - -DUPDATE_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/source/options b/debian/source/options index 5234f79..112dfc8 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1 @@ tar-ignore=.gitignore -tar-ignore=lxqt-admin.kdev4 diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..7c8ae81 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,6 @@ +Name: lxqt-admin +Bug-Database: https://github.com/lxqt/lxqt-admin/issues +Bug-Submit: https://github.com/lxqt/lxqt-admin/issues/new +Changelog: https://github.com/lxqt/lxqt-admin/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-admin +Repository-Browser: https://github.com/lxqt/lxqt-admin