Sync with Debian version 1.1.0-2.

2 years ago · ea72b6b1bb
parent 25e202e86e
commit ea72b6b1bb
8 changed files with 52 additions and 88 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,29 +1,26 @@
-lxqt-about (1.1.0-0ubuntu1) kinetic; urgency=medium
+lxqt-about (1.1.0-2) experimental; urgency=medium

-  * New upstream release.
-  * Bump liblxqt build dependency.
-  * Drop Breaks/Replaces, since we're past the LTS.
-  * Add the new lxqt-about.svg to the install file.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 14:25:44 -0500
-
-lxqt-about (0.17.0-0ubuntu1) impish; urgency=medium
-
-  * New upstream release 0.17.0
-  * Update debian/control
-    - Bump Standards-Version to 4.5.1
-    - Use liblxqt0-dev 0.17.0
-  * Update debian/copyright
+  * Upstreamed changes from Ubuntu, modifying the following files:
+    - control
+    - copyright
+    - lintian-overrides
+    - lxqt-about.install
+    - rules
+    - upstream/*

- -- apt-ghetto <apt-ghetto@protonmail.com>  Thu, 12 Aug 2021 15:43:16 +0200
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 19:31:47 -0500

-lxqt-about (0.16.0-1ubuntu1) hirsute; urgency=medium
+lxqt-about (1.1.0-1) experimental; urgency=medium

-  * New upstream version.
-  * Bump debhelper-compat to 13.
-  * Update debian/copyright.
+  * Update debian/upstream/signing-key.asc.
+  * New upstream version 1.0.0
+  * Add debian/salsa-ci.yml file.
+  * New upstream version 1.1.0
+  * Build-deps on liblxqt1-dev (>= 1.1.0~).
+  * Drop lxqt-about (<< 0.11.0) from Brakes and Replaces.
+  * debian/lxqt-about.install: ship artwork.

- -- Raman Sarda <theloudspeaker@disroot.org>  Sun, 21 Feb 2021 22:22:25 +0530
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 13 Jul 2022 22:49:44 +0800

 lxqt-about (0.16.0-1) unstable; urgency=medium

@ -37,27 +34,6 @@ lxqt-about (0.16.0-1) unstable; urgency=medium

 -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 15:43:27 +0800

-lxqt-about (0.15.0-0ubuntu1) groovy; urgency=medium
-
-  [ Simon Quigley ]
-  * New upstream release.
-    - Update upstream signing key.
-    - Bump LXQt build dependencies.
-  * Bump Standards-version to 4.5.0, no changes needed.
-  * debhelper -> debhelper-compat.
-
-  [ Dan Simmons ]
-  * Drop breaks: lxqt-about-l10 (<< 0.14.0)
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 00:36:18 -0500
-
-lxqt-about (0.14.1-1ubuntu1) focal; urgency=low
-
-  * Merge from Debian unstable.  Remaining changes:
-    - Updated the control file for new depends.
-
- -- Raman Sarda <theloudspeaker@lubuntu.me>  Sat, 09 Mar 2019 20:44:31 +0000
-
 lxqt-about (0.14.1-1) unstable; urgency=medium

  * Cherry-picking upstream release: 0.14.1.
@ -65,12 +41,6 @@ lxqt-about (0.14.1-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 01:28:48 +0100

-lxqt-about (0.14.1-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 12:45:10 -0600
-
 lxqt-about (0.14.0-1) unstable; urgency=medium

  * Cherry-picking upstream release: 0.14.0.
@ -84,23 +54,6 @@ lxqt-about (0.14.0-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 16:05:00 +0100

-lxqt-about (0.14.0-0ubuntu2) disco; urgency=medium
-
-  * Add Breaks/Replaces on lxqt-about-l10n.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 10:18:48 -0600
-
-lxqt-about (0.14.0-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-  * Bump Standards-version to 4.3.0, no changes needed.
-  * Bump debhelper compat to 12, no changes needed.
-  * Add a lxqt-about-l10n package.
-  * Wraaaaaaap.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Jan 2019 23:52:29 -0600
-
 lxqt-about (0.13.0-1) unstable; urgency=medium

  * Cherry-picking upstream release: 0.13.0.
@ -108,14 +61,6 @@ lxqt-about (0.13.0-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 20:02:55 +0200

-lxqt-about (0.13.0-0ubuntu1) cosmic; urgency=medium
-
-  * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 22 May 2018 23:07:40 -0500
-
 lxqt-about (0.12.0-5) unstable; urgency=medium

  * Bumped Standards to 4.1.4, no changes needed
@ -252,4 +197,3 @@ lxqt-about (0.9.0+20150806-1) unstable; urgency=medium
    lintian warns.

 -- Andrew Lee (李健秋) <ajqlee@debian.org>  Fri, 14 Aug 2015 19:53:50 +0800
-
--- a/debian/control
+++ b/debian/control
@ -1,9 +1,10 @@
 Source: lxqt-about
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
-           Andrew Lee (李健秋) <ajqlee@debian.org>
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@ -12,12 +13,11 @@ Build-Depends: debhelper-compat (= 13),
               libqt5svg5-dev,
               libqt5x11extras5-dev,
               libx11-dev
-Standards-Version: 4.5.1
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-about/
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-about.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-about
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-about.git
+Standards-Version: 4.6.1
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-about
+Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-about.git
 Homepage: https://github.com/lxqt/lxqt-about
+Rules-Requires-Root: no

 Package: lxqt-about
 Architecture: any
@ -34,4 +34,6 @@ Multi-Arch: foreign
 Section: localization
 Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for lxqt-about
+ The about screen for LXQt
+ .
 This package contains the l10n files needed by the lxqt-about.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,13 +3,13 @@ Upstream-Name: lxqt-about
 Source: https://github.com/lxqt/lxqt-about

 Files: *
-Copyright: 2012-2020, LXQt team
+Copyright: 2012-2022, LXQt team
           2010-2012, Razor team
           2010-2014, Petr Vanek <petr@scribus.info>
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2021, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
           2014-2019 Alf Gaida <agaida@siduction.org>
           2015-2021 Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@ -1,2 +1,2 @@
 # lxqt-about will never have a man-page
-lxqt-about: binary-without-manpage usr/bin/lxqt-about
+lxqt-about: no-manual-page [usr/bin/lxqt-about]
--- a/debian/rules
+++ b/debian/rules
@ -2,14 +2,15 @@
 # export DH_VERBOSE=1

 export LC_ALL=C.UTF-8
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 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 \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -0,0 +1,12 @@
+# For more information on what jobs are run see:
+# https://salsa.debian.org/salsa-ci-team/pipeline
+#
+# To enable the jobs, go to your repository (at salsa.debian.org)
+# and click over Settings > CI/CD > Expand (in General pipelines).
+# In "Custom CI config path" write debian/salsa-ci.yml and click
+# in "Save Changes". The CI tests will run after the next commit.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -0,0 +1,5 @@
+Name: lxqt-about
+Bug-Database: https://github.com/lxqt/lxqt-about/issues
+Bug-Submit: https://github.com/lxqt/lxqt-about/issues/new
+Changelog: https://github.com/lxqt/lxqt-about/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-about
--- a/debian/watch
+++ b/debian/watch
@ -1,3 +1,3 @@
 version=4
 opts="pgpsigurlmangle=s/$/.asc/" \
-    https://github.com/lxqt/lxqt-about/releases .*/lxqt-about-([\d\.]+).tar.xz
+https://github.com/lxqt/lxqt-about/releases .*/lxqt-about-([\d\.]+).tar.xz