13 changed files with 105 additions and 331 deletions
--- a/debian/bin/gbp-buildpackage
+++ b/debian/bin/gbp-buildpackage
@ -1,31 +0,0 @@
-#!/bin/bash
-#=============================================================================
-# Copyright 2019 Alf Gaida <agaida@siduction.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF 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.
-#=============================================================================
-
-# Usage: gbp-buildpackage
-
-gbp buildpackage
--- a/debian/bin/gbp-import-orig
+++ b/debian/bin/gbp-import-orig
@ -1,31 +0,0 @@
-#!/bin/bash
-#=============================================================================
-# Copyright 2019 Alf Gaida <agaida@siduction.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF 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.
-#=============================================================================
-
-# Usage: gbp-import-orig
-
-gbp import-orig --pristine-tar --uscan
--- a/debian/changelog
+++ b/debian/changelog
@ -1,130 +1,18 @@
-lxqt-build-tools (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-build-tools (0.7.0-0ubuntu1) groovy; urgency=medium

  * New upstream release.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:28 -0600
-
-lxqt-build-tools (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  [ Simon Quigley ]
-  * New upstream release.
-    - Update build and runtime dependencies for Qt 6.
-  * Update debian/copyright.
-  * Bump Standards-version to 4.7.0, no changes needed.
-  * pkg-config -> pkgconf
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 15:58:15 -0500
-
-lxqt-build-tools (0.13.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Remove reverse-applicable cpp17.patch.
+    - Update the upstream signing key.
+  * Bump Standards-version to 4.5.0, no changes needed.
  * Run wrap-and-sort.
-  * Update copyright years.
-  * Update Standards-version to 4.6.2, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 10 May 2023 11:34:02 -0500
-
-lxqt-build-tools (0.12.0-0ubuntu3) lunar; urgency=medium
-
-  * Build using C++17 by default instead of C++14, to be compatible with KDE
-    Frameworks and Qt.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 25 Jan 2023 11:36:17 -0600
-
-lxqt-build-tools (0.12.0-0ubuntu2) lunar; urgency=medium
-
-  * Added 'Rules-Requires-Root: no'.
-  * Overhauled copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 27 Nov 2022 13:48:55 -0600
-
-lxqt-build-tools (0.12.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Actually fix the uscan error. Thanks for the help, arraybolt3!
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Remove upstream-applicable patch.
-  * Brief copyright update.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 17:04:59 -0600
-
-lxqt-build-tools (0.11.0-2) unstable; urgency=medium
-
-  * debian/watch: fix uscan error.
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 22 Oct 2022 18:45:37 +0800
-
-lxqt-build-tools (0.11.0-1) unstable; urgency=medium
-
-  * Team Upload

-  [ Debian Janitor ]
-  * Set upstream metadata fields: Repository, Repository-Browse.
-  * Remove obsolete field Name from debian/upstream/metadata (already present in
-    machine-readable debian/copyright).
-  * Avoid explicitly specifying -Wl,--as-needed linker flag.
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 22:06:40 -0500

-  [ Yao Wei (魏銘廷) ]
-  * debian/patches: Use gdesktopappinfo.h to find gio-unix-2.0
-  * debian/upstream/metadata: Remove Repository-Browser (typoed entry)
-  * debian/control:
-    - Bump Standards-Version to 4.6.1;  No related changes.
-    - Update version dependency of libglib2.0-dev
+lxqt-build-tools (0.6.0-2ubuntu1) disco; urgency=medium

- -- Yao Wei (魏銘廷) <mwei@debian.org>  Sat, 17 Sep 2022 21:17:34 +0800
+  * Merge from Debian testing. Remaining changes:
+    - Update Vcs-* and Maintainer to Lubuntu values.

-lxqt-build-tools (0.11.0-0.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * New upstream release.
-    - Fixes compatibility with GLib ≥ 2.71.1 (closes: #1008416).
-
- -- Dmitry Shachnev <mitya57@debian.org>  Sat, 14 May 2022 16:00:20 +0300
-
-lxqt-build-tools (0.10.0-1) unstable; urgency=medium
-
-  [ Andrew Lee (李健秋) ]
-  * New upstream version 0.10.0
-  * Add debian/salsa-ci.yml file.
-
-  [ Severus Septimius ]
-  * Update debian/changelog
-  * Update debian/copyright
-  * Bump Standards to 4.6.0 (no changes)
-
-  [ Andrew Lee (李健秋) ]
-  * Update debian/copyright.
-  * Added myself as uploader.
-  * Use debhelper-compat = 13, no changes needed.
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 08 Jan 2022 18:01:14 +0800
-
-lxqt-build-tools (0.8.0-1) unstable; urgency=medium
-
-  * Team upload.
-
-  [ Sophie Brun ]
-  * Update the debian/upstream/signing-key.asc
-  * New upstream version 0.8.0
-  * Move the specific lxqt build scripts in usr/share/lxqt-build-tools/bin
-  * Bump Standards-Version to 4.5.1 (no changes)
-  * Update debian/copyright
-
-  [ Raphael Hertzog ]
-  * Drop ${shlib:Depends} as this is an arch all package
-
- -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Dec 2020 09:51:50 +0100
-
-lxqt-build-tools (0.6.0-3) unstable; urgency=medium
-
-  * Switched to gbp
-  * Bumped Standards-Version to 4.4.0, no changes needed
-  * Added debin/bin/gbp-buildpackage - first iteration
-  * Added debian/bin/gbp-import-orig - first iteration
-  * Fixed .gitignore
-
- -- Alf Gaida <agaida@siduction.org>  Mon, 26 Aug 2019 02:31:21 +0200
+ -- Rik Mills <rikmills@kubuntu.org>  Wed, 27 Mar 2019 17:07:06 +0000

 lxqt-build-tools (0.6.0-2) unstable; urgency=medium

@ -143,12 +31,29 @@ 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
--- a/debian/control
+++ b/debian/control
@ -2,32 +2,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>
 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),
+               debhelper-compat (= 12),
               libglib2.0-dev,
-               pkgconf,
-               qt6-base-dev
-Standards-Version: 4.7.0
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging.git
+               pkg-config,
+               qtbase5-dev
+Standards-Version: 4.5.0
+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
 Homepage: https://github.com/lxqt/lxqt-build-tools
-Rules-Requires-Root: no

 Package: lxqt-build-tools
 Architecture: all
 Depends: binutils,
         cmake,
-         libglib2.0-dev (>= 2.73.1),
-         pkgconf,
-         qt6-tools-dev,
-         qt6-tools-dev-tools,
-         ${misc:Depends}
+         libglib2.0-dev (>= 2.5.0),
+         pkg-config,
+         qttools5-dev,
+         qttools5-dev-tools,
+         ${misc:Depends},
+         ${shlibs:Depends}
 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
--- a/debian/copyright
+++ b/debian/copyright
@ -3,59 +3,14 @@ Upstream-Name: lxqt-build-tools
 Source: https://github.com/lxqt/lxqt-build-tools

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

-Files: lxqt-transupdate
-       cmake/find-modules/FindClazy.cmake
-       cmake/find-modules/FindFontconfig.cmake
-       cmake/find-modules/FindUDev.cmake
-       cmake/find-modules/FindXCB.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/ECMFindModuleHelpers.cmake
-       cmake/modules/LXQtCompilerSettings.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/Qt6TranslationLoader.cmake
-Copyright: 2018      Alf Gaida <agaida@siduction.org>
-           2014-2020 Luís Pereira <luis.artur.pereira@gmail.com>
-           2006-2007 Laurent Montel <montel@kde.org>
-           2018      Volker Krause <vkrause@kde.org>
-           2010      Rafael Fernández López <ereslibre@kde.org>
-           2015      Jari Vetoniemi
-           2014      Alex Merry <alex.merry@kde.org>
-           2015      Palo Kisa <palo.kisa@gmail.com>
-           2013      Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-License: BSD-3-Clause
-
 Files: debian/*
-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>
- 2022      Aaron Rainbolt <arraybolt3@ubuntu.com>
- 2022-2024 Simon Quigley <tsimonq2@ubuntu.com>
+Copyright: 2015-2019 Alf Gaida <agaida@siduction.org>
 License: BSD-3-Clause

-Copyright: Alf Gaida <agaida@siduction.org>
-Files: debian/usr/share/lxqt-build-tools/repository.spec.example
-License: WTFPL-2
-
 License: BSD-3-Clause
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@ -80,15 +35,3 @@ 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.
-
-License: WTFPL-2
- Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
- .
- Everyone is permitted to copy and distribute verbatim or modified
- copies of this license document, and changing it is allowed as long
- as the name is changed.
- .
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- .
- 0. You just DO WHAT THE FUCK YOU WANT TO.
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,6 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-compression = xz
-
--- a/debian/install
+++ b/debian/install
@ -1,2 +1,2 @@
-debian/bin/* /usr/share/lxqt-build-tools/bin
+debian/bin/* /usr/bin
 debian/usr/* /usr
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@ -0,0 +1,8 @@
+# Yes, we know
+
+lxqt-build-tools: binary-without-manpage usr/bin/evil
+lxqt-build-tools: binary-without-manpage usr/bin/git-snapshot
+lxqt-build-tools: binary-without-manpage usr/bin/git-versions
+lxqt-build-tools: binary-without-manpage usr/bin/lxqt-transupdate
+lxqt-build-tools: binary-without-manpage usr/bin/mangle
+lxqt-build-tools: binary-without-manpage usr/bin/symmangle
--- a/debian/rules
+++ b/debian/rules
@ -2,6 +2,7 @@
 # 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

 %:
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@ -1,12 +0,0 @@
-# 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
@ -1,6 +1,7 @@
+Name: lxqt-build-tools
 Bug-Database: https://github.com/lxqt/lxqt-build-tools/issues
 Bug-Submit: https://github.com/lxqt/lxqt-build-tools/issues/new
 Changelog: https://github.com/lxqt/lxqt-build-tools/blob/master/CHANGELOG
-Repository: https://github.com/lxqt/lxqt-build-tools.git
-Repository-Browse: https://github.com/lxqt/lxqt-build-tools
+Repository: https://github.com/lxqt/lxqt-build-tools
+Repository-Browser: https://github.com/lxqt/lxqt-build-tools

--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@ -1,5 +1,4 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: Signed by Sophie Brun

 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K
--- a/debian/watch
+++ b/debian/watch
@ -1,5 +1,3 @@
 version=4
-opts="searchmode=plain, \
-pgpsigurlmangle=s/$/.asc/, \
-uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
-  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
+opts="pgpsigurlmangle=s/$/.asc/" \
+https://github.com/lxqt/lxqt-build-tools/releases .*/lxqt-build-tools-([\d\.]+).tar.xz