debian/changelog

@@ -1,69 +1,8 @@
-lxqt-build-tools (0.13.0-0ubuntu1) mantic; urgency=medium
+lxqt-build-tools (0.10.0-1ubuntu1) jammy; urgency=medium
 
-  * New upstream release.
+  * Add a patch to support GLib ≥ 2.71.1.
-  * 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
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 19 Mar 2022 20:15:43 +0300
-
-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.
-
-  [ 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
-
- -- Yao Wei (魏銘廷) <mwei@debian.org>  Sat, 17 Sep 2022 21:17:34 +0800
-
-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
 

debian/control

@@ -1,34 +1,32 @@
 Source: lxqt-build-tools
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@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,
+Build-Depends: debhelper-compat (= 13),
-               debhelper-compat (= 13),
+               cmake,
                libglib2.0-dev,
                pkg-config,
                qtbase5-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.6.0
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging.git
+Vcs-Git: https://salsa.debian.org/lxqt-team/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,
+Depends: ${misc:Depends},
+         binutils,
          cmake,
-         libglib2.0-dev (>= 2.73.1),
+         libglib2.0-dev (>= 2.5.0),
          pkg-config,
          qttools5-dev,
-         qttools5-dev-tools,
+         qttools5-dev-tools
-         ${misc:Depends}
+Recommends: git,
-Recommends: git, lintian
+            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

@@ -7,37 +7,11 @@ Copyright: 2012-2021 LXQt team
            2010-2012 Razor team
 License: BSD-3-Clause
 
-Files: lxqt-transupdate
+Files: cmake/find-modules/FindXdgEmail.cmake
-       cmake/find-modules/FindClazy.cmake
+ cmake/find-modules/FindXdgMime.cmake cmake/find-modules/FindXdgOpen.cmake
-       cmake/find-modules/FindFontconfig.cmake
+ cmake/find-modules/FindXdgScreensaver.cmake
-       cmake/find-modules/FindUDev.cmake
+ cmake/find-modules/FindXdgSettings.cmake
-       cmake/find-modules/FindXCB.cmake
+Copyright: 2019, Luís Pereira <luis.artur.pereira@gmail.com>
-       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/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>
-           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/*
@@ -48,14 +22,8 @@ Copyright:
  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-2023 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
-
 License: BSD-3-Clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -81,14 +49,3 @@ License: BSD-3-Clause
  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.

debian/patches/gio-unix-include-dir.patch

@@ -0,0 +1,25 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Sat, 19 Mar 2022 20:01:20 +0300
+Subject: Replace gunixconnection.h file in gio-unix include dir check
+
+That file was moved from gio-unix to gio in GLib 2.71.1:
+https://gitlab.gnome.org/GNOME/glib/-/commit/83d45c4f35dc87ba
+
+Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/74
+---
+ cmake/find-modules/FindGLIB.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake
+index 0564b8d..bb2336a 100644
+--- a/cmake/find-modules/FindGLIB.cmake
++++ b/cmake/find-modules/FindGLIB.cmake
+@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS})
+     elseif (${_component} STREQUAL "gio-unix")
+         pkg_check_modules(GIO_UNIX gio-unix-2.0)
+         find_path(GLIB_GIO_UNIX_INCLUDE_DIR
+-                  NAMES gio/gunixconnection.h
++                  NAMES gio/gunixfdlist.h
+                   HINTS ${GIO_UNIX_INCLUDEDIR}
+                   PATH_SUFFIXES gio-unix-2.0)
+ 

debian/patches/series

@@ -0,0 +1 @@
+gio-unix-include-dir.patch

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
 
 %:

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: https://github.com/lxqt/lxqt-build-tools
-Repository-Browse: https://github.com/lxqt/lxqt-build-tools
+Repository-Browser: https://github.com/lxqt/lxqt-build-tools
 

debian/watch

@@ -1,5 +1,3 @@
 version=4
-opts="searchmode=plain, \
+opts="pgpsigurlmangle=s/$/.asc/" \
-pgpsigurlmangle=s/$/.asc/, \
+https://github.com/lxqt/lxqt-build-tools/releases .*/lxqt-build-tools-([\d\.]+).tar.xz
-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