debian/changelog

@@ -1,36 +1,3 @@
-lxqt-build-tools (2.1.0-0ubuntu2) plucky; urgency=medium
-
-  * Bump the minimum C++ standard to 20.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 01:49:22 -0600
-
-lxqt-build-tools (2.1.0-0ubuntu1) plucky; 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.
-  * 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

debian/control

@@ -6,12 +6,12 @@ Uploaders: Alf Gaida <agaida@siduction.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,
-               pkgconf,
-               qt6-base-dev
-Standards-Version: 4.7.0
+               pkg-config,
+               qtbase5-dev
+Standards-Version: 4.6.1
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
@@ -21,14 +21,15 @@ Rules-Requires-Root: no
 
 Package: lxqt-build-tools
 Architecture: all
-Depends: binutils,
+Depends: ${misc:Depends},
+         binutils,
          cmake,
          libglib2.0-dev (>= 2.73.1),
-         pkgconf,
-         qt6-tools-dev,
-         qt6-tools-dev-tools,
-         ${misc:Depends}
-Recommends: git, lintian
+         pkg-config,
+         qttools5-dev,
+         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

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-build-tools
 Source: https://github.com/lxqt/lxqt-build-tools
 
 Files: *
-Copyright: 2012-2023 LXQt team
+Copyright: 2012-2021 LXQt team
            2010-2012 Razor team
 License: BSD-3-Clause
 
@@ -28,7 +28,7 @@ Files: lxqt-transupdate
        cmake/modules/LXQtTranslate.cmake
        cmake/modules/LXQtTranslateTs.cmake.in
        cmake/modules/LXQtTranslationLoader.cmake
-       cmake/modules/Qt6TranslationLoader.cmake
+       cmake/modules/Qt5TranslationLoader.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>
@@ -49,10 +49,9 @@ Copyright:
  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>
+ 2022      Simon Quigley <tsimonq2@ubuntu.com>
 License: BSD-3-Clause
 
-Copyright: Alf Gaida <agaida@siduction.org>
 Files: debian/usr/share/lxqt-build-tools/repository.spec.example
 License: WTFPL-2
 

debian/patches/cpp17.patch

@@ -0,0 +1,24 @@
+Description: Bump the minimum compatibility level to C++17
+Author: Simon Quigley <tsimonq2@lubuntu.me>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1029611
+Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/83
+Last-Update: 2023-01-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/cmake/modules/LXQtCompilerSettings.cmake
++++ b/cmake/modules/LXQtCompilerSettings.cmake
+@@ -181,11 +181,11 @@ endif()
+ 
+ 
+ #-----------------------------------------------------------------------------
+-# CXX14 requirements - no checks, we just set it
++# CXX17 requirements - no checks, we just set it
+ #-----------------------------------------------------------------------------
+ set(CMAKE_CXX_STANDARD_REQUIRED True)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+-set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ ISO Standard")
++set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ ISO Standard")
+ 
+ 
+ #-----------------------------------------------------------------------------

debian/patches/cpp20.patch

@@ -1,26 +0,0 @@
-Description: Bump the minimum compatibility level to C++20
- This pull request is very similar to
- https://github.com/lxqt/lxqt-build-tools/pull/83, except this is proactive
- rather than reactive.
-Author: Simon Quigley <tsimonq2@ubuntu.com>
-Origin: upstream
-Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/102
-Last-Update: 2025-01-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cmake/modules/LXQtCompilerSettings.cmake
-+++ b/cmake/modules/LXQtCompilerSettings.cmake
-@@ -181,11 +181,11 @@ endif()
- 
- 
- #-----------------------------------------------------------------------------
--# CXX17 requirements - no checks, we just set it
-+# CXX20 requirements - no checks, we just set it
- #-----------------------------------------------------------------------------
- set(CMAKE_CXX_STANDARD_REQUIRED True)
- set(CMAKE_CXX_EXTENSIONS OFF)
--set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ ISO Standard")
-+set(CMAKE_CXX_STANDARD 20 CACHE STRING "C++ ISO Standard")
- 
- 
- #-----------------------------------------------------------------------------

debian/patches/series

@@ -1 +1 @@
-cpp20.patch
+cpp17.patch