Sync with Debian version 0.10.0-1.

2 years ago · 057c7dac5c
parent 32624029a8
commit 057c7dac5c
4 changed files with 51 additions and 110 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,17 +1,20 @@
-lxqt-build-tools (0.9.0-0ubuntu1) impish; urgency=medium
+lxqt-build-tools (0.10.0-1) unstable; urgency=medium

-  * New upstream version 0.9.0
-  * Update debian/copyright
-  * Update debian/control to use dephelper-compat (= 13)
-  * Run wrap-and-sort
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Fri, 06 Aug 2021 17:09:12 +0200
+  [ Andrew Lee (李健秋) ]
+  * New upstream version 0.10.0
+  * Add debian/salsa-ci.yml file.

-lxqt-build-tools (0.8.0-1ubuntu1) hirsute; urgency=medium
+  [ Severus Septimius ]
+  * Update debian/changelog
+  * Update debian/copyright
+  * Bump Standards to 4.6.0 (no changes)

-  * Merge from Debian unstable. No other changes.
+  [ Andrew Lee (李健秋) ]
+  * Update debian/copyright.
+  * Added myself as uploader.
+  * Use debhelper-compat = 13, no changes needed.

- -- Raman Sarda <theloudspeaker@ubuntu.com>  Sat, 16 Jan 2021 02:10:00 +0530
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 08 Jan 2022 18:01:14 +0800

 lxqt-build-tools (0.8.0-1) unstable; urgency=medium

@ -29,15 +32,6 @@ lxqt-build-tools (0.8.0-1) unstable; urgency=medium

 -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Dec 2020 09:51:50 +0100

-lxqt-build-tools (0.7.0-0ubuntu1) groovy; urgency=medium
-
-  * New upstream release.
-    - Update the upstream signing key.
-  * Bump Standards-version to 4.5.0, no changes needed.
-  * Run wrap-and-sort.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 22:06:40 -0500
-
 lxqt-build-tools (0.6.0-3) unstable; urgency=medium

  * Switched to gbp
@ -48,13 +42,6 @@ lxqt-build-tools (0.6.0-3) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Mon, 26 Aug 2019 02:31:21 +0200

-lxqt-build-tools (0.6.0-2ubuntu1) disco; urgency=medium
-
-  * Merge from Debian testing. Remaining changes:
-    - Update Vcs-* and Maintainer to Lubuntu values.
-
- -- Rik Mills <rikmills@kubuntu.org>  Wed, 27 Mar 2019 17:07:06 +0000
-
 lxqt-build-tools (0.6.0-2) unstable; urgency=medium

  * Removed libqt5xdg-dev - would introduce a cycle dependency when used
@ -72,29 +59,12 @@ lxqt-build-tools (0.6.0-1) unstable; urgency=medium

 -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 13:11:49 +0100

-lxqt-build-tools (0.6.0-0ubuntu1) disco; urgency=medium
-
-  * New upstream release.
-  * Bump Standards-version to 4.3.0, no changes needed.
-  * Bump debhelper compat to 12, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Jan 2019 22:01:43 -0600
-
 lxqt-build-tools (0.5.0-1) unstable; urgency=medium

  * Cherry-picking new upstream release 0.5.0

 -- Alf Gaida <agaida@siduction.org>  Wed, 23 May 2018 02:50:35 +0200

-lxqt-build-tools (0.5.0-0ubuntu1) cosmic; urgency=medium
-
-  * New upstream release.
-  * Update Vcs-* and Maintainer to Lubuntu values.
-  * Update copyright.
-  * Update build depends.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 21 May 2018 21:42:16 -0500
-
 lxqt-build-tools (0.4.0-7) unstable; urgency=medium

  * Really fixed VCS fields
@ -199,4 +169,3 @@ lxqt-build-tools (0.1.0-1) unstable; urgency=medium
  * Initial release (Closes: #839943)

 -- Alf Gaida <agaida@siduction.org>  Fri, 14 Oct 2016 23:05:03 +0200
-
--- a/debian/control
+++ b/debian/control
@ -1,32 +1,31 @@
 Source: lxqt-build-tools
-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>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>,
           ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 Section: devel
 Priority: optional
-Build-Depends: cmake,
-               debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 13),
+               cmake,
               libglib2.0-dev,
               pkg-config,
               qtbase5-dev
-Standards-Version: 4.5.1
-Vcs-Browser: https://phab.lubuntu.me/source/lxqt-build-tools/
-Vcs-Git: https://phab.lubuntu.me/source/lxqt-build-tools.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git
+Standards-Version: 4.6.0
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
+Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git
 Homepage: https://github.com/lxqt/lxqt-build-tools

 Package: lxqt-build-tools
 Architecture: all
-Depends: binutils,
+Depends: ${misc:Depends},
+         binutils,
         cmake,
         libglib2.0-dev (>= 2.5.0),
         pkg-config,
         qttools5-dev,
-         qttools5-dev-tools,
-         ${misc:Depends}
-Recommends: git, lintian
+         qttools5-dev-tools
+Recommends: git,
+            lintian
 Description: Build tools for the LXQt desktop environment
 LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt
 technologies. It has been tailored for users who value simplicity, speed, and
--- a/debian/copyright
+++ b/debian/copyright
@ -3,65 +3,25 @@ Upstream-Name: lxqt-build-tools
 Source: https://github.com/lxqt/lxqt-build-tools

 Files: *
-Copyright: 2012-2019 LXQt team
+Copyright: 2012-2021 LXQt team
           2010-2012 Razor team
 License: BSD-3-Clause

-Files: lxqt-transupdate
-Copyright: 2018, Alf Gaida <agaida@siduction.org>
-License: BSD-3-Clause
-
-Files: cmake/find-modules/FindClazy.cmake
-       cmake/find-modules/FindXdgEmail.cmake
-       cmake/find-modules/FindXdgMime.cmake
-       cmake/find-modules/FindXdgOpen.cmake
-       cmake/find-modules/FindXdgScreensaver.cmake
-       cmake/find-modules/FindXdgSettings.cmake
-       cmake/find-modules/FindXdgUserDirs.cmake
-       cmake/find-modules/FindXKBCommon.cmake
-       cmake/find-modules/FindXTerm.cmake
-       cmake/modules/LXQtCreatePkgConfigFile.cmake
-       cmake/modules/LXQtCreatePortableHeaders.cmake
-       cmake/modules/LXQtPreventInSourceBuilds.cmake
-       cmake/modules/LXQtTranslate.cmake
-       cmake/modules/LXQtTranslateTs.cmake.in
-       cmake/modules/LXQtTranslationLoader.cmake
-       cmake/modules/Qt5TranslationLoader.cmake
-Copyright: 2014-2015, 2017-2020, Luís Pereira <luis.artur.pereira@gmail.com>
-License: BSD-3-Clause
-
-Files: cmake/find-modules/FindFontconfig.cmake
-Copyright: 2018, Volker Krause <vkrause@kde.org>
-           2006, 2007, Laurent Montel <montel@kde.org>
-License: BSD-3-Clause
-
-Files: cmake/find-modules/FindGLIB.cmake
-Copyright: 2016, Luís Pereira <luis.artur.pereira@gmail.com>
-           2012, Raphael Kubo da Costa <rakuco@webkit.org>
-License: BSD-3-Clause
-
-Files: cmake/find-modules/FindUDev.cmake
-Copyright: 2016, Luís Pereira <luis.artur.pereira@gmail.com>
-           2010, Rafael Fernández López <ereslibre@kde.org>
-License: BSD-3-Clause
-
-Files: cmake/find-modules/FindXCB.cmake
-Copyright: 2015, Jari Vetoniemi
-License: BSD-3-Clause
-
-Files: cmake/modules/ECMFindModuleHelpers.cmake
-Copyright: 2014, Alex Merry <alex.merry@kde.org>
-License: BSD-3-Clause
-
-Files: cmake/modules/LXQtCompilerSettings.cmake
-Copyright: 2015, Luís Pereira <luis.artur.pereira@gmail.com>
-           2015, Palo Kisa <palo.kisa@gmail.com>
-           2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Files: cmake/find-modules/FindXdgEmail.cmake
+ cmake/find-modules/FindXdgMime.cmake cmake/find-modules/FindXdgOpen.cmake
+ cmake/find-modules/FindXdgScreensaver.cmake
+ cmake/find-modules/FindXdgSettings.cmake
+Copyright: 2019, Luís Pereira <luis.artur.pereira@gmail.com>
 License: BSD-3-Clause

 Files: debian/*
-Copyright: 2021, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2015-2019 Alf Gaida <agaida@siduction.org>
+Copyright:
+ 2015-2019 Alf Gaida <agaida@siduction.org>
+ 2016      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+ 2020      Sophie Brun <sophie@offensive-security.com>
+ 2020      Raphaël Hertzog <raphael@offensive-security.com>
+ 2022      Andrew Lee (李健秋) <ajqlee@debian.org>
+ 2022      Severus Septimius <severusseptimius7@gmail.com>
 License: BSD-3-Clause

 License: BSD-3-Clause
@ -88,3 +48,4 @@ License: BSD-3-Clause
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
--- 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
+