debian/changelog

@@ -1,116 +1,3 @@
-obconf-qt (0.16.5-0ubuntu3) plucky; urgency=medium
-
-  * Update Standards-Version to 4.7.1, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 17:05:57 -0600
-
-obconf-qt (0.16.5-0ubuntu2) plucky; urgency=medium
-
-  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 04:00:12 -0600
-
-obconf-qt (0.16.5-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-  * Update VCS fields.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:25 -0600
-
-obconf-qt (0.16.4-0ubuntu6) noble; urgency=high
-
-  * No change rebuild against libqt5core5t64, libqt5gui5t64,
-    libqt5widgets5t64.
-
- -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 08 Apr 2024 16:46:32 +0200
-
-obconf-qt (0.16.4-0ubuntu5) noble; urgency=medium
-
-  * No-change rebuild for CVE-2024-3094
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 09:22:03 +0000
-
-obconf-qt (0.16.4-0ubuntu4) noble; urgency=medium
-
-  * No-change rebuild against libqt5core5t64
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 15 Mar 2024 06:05:14 +0000
-
-obconf-qt (0.16.4-0ubuntu3) noble; urgency=medium
-
-  * No-change rebuild against libglib2.0-0t64
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 11 Mar 2024 23:19:11 +0000
-
-obconf-qt (0.16.4-0ubuntu2) noble; urgency=medium
-
-  * No-change rebuild against libglib2.0-0t64
-
- -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 08 Mar 2024 06:23:29 +0000
-
-obconf-qt (0.16.4-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Updated copyright file.
-  * Bumped build dependency versions.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 18 Jan 2024 16:41:20 +0000
-
-obconf-qt (0.16.3-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Overhauled copyright file.
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 08 Nov 2023 17:35:38 -0600
-
-obconf-qt (0.16.2-2ubuntu2) lunar; urgency=medium
-
-  * Revert sync from Debian.
-  * Overhauled copyright file.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Added 'Rules-Requires-Root: no' to debian/control.
-  * Changed binary-without-manpage to no-manual-page in lintian-overrides.
-  * Updated debian/watch file to work with GitHub again.
-  * Removed Repository-Browser field from debian/upstream/metadata.
-  * Removed trailing whitespace from changelog.
-  * Removed obsolete '-Wl,--as-needed' linker flag.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 12 Feb 2023 17:30:26 -0600
-
-obconf-qt (0.16.2-0ubuntu1) kinetic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Drop old Breaks/Replaces, we're past the LTS.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 02 Jun 2022 10:06:15 -0500
-
-obconf-qt (0.16.0-1ubuntu1) hirsute; urgency=medium
-
-  * New upstream version.
-  * Updated debhelper-compat requirement to 12.
-
- -- Raman Sarda <theloudspeaker@ubuntu.com>  Sun, 21 Feb 2021 19:24:37 +0530
-
-obconf-qt (0.16.0-1) unstable; urgency=medium
-
-  [ Alf Gaida ]
-  * Switched to gbp
-  * Bumped Standards-Version to 4.4.0, no changes needed
-
-  [ Debian Janitor ]
-  * debian/copyright: use spaces rather than tabs to start continuation lines.
-  * Set upstream metadata fields: Repository, Repository-Browse.
-  * Remove obsolete field Name from debian/upstream/metadata (already present in
-    machine-readable debian/copyright).
-  * Update standards version to 4.5.0, no changes needed.
-
-  [ Andrew Lee (李健秋) ]
-  * New upstream release. (Closes: #978168)
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 20:01:08 +0800
-
 obconf-qt (0.15.0-0ubuntu1) groovy; urgency=medium
 
   * New upstream release.

debian/control

@@ -1,20 +1,21 @@
 Source: obconf-qt
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Section: utils
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
-               libkf6windowsystem-dev,
-               lxqt-build-tools (>= 2.1.0),
+Build-Depends: debhelper-compat (= 12),
+               libkf5windowsystem-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
+               lxqt-build-tools (>= 0.7.0),
                openbox-dev
-Standards-Version: 4.7.1
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/obconf-qt-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/obconf-qt-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/obconf-qt
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/obconf-qt.git
+Standards-Version: 4.5.0
+Vcs-Browser: https://phab.lubuntu.me/source/obconf-qt/
+Vcs-Git: https://phab.lubuntu.me/source/obconf-qt.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/obconf-qt
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/obconf-qt.git
 Homepage: https://github.com/lxqt/obconf-qt
-Rules-Requires-Root: no
 
 Package: obconf-qt
 Architecture: any
@@ -29,8 +30,8 @@ Package: obconf-qt-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
+Breaks: obconf-qt (<< 0.11.0)
+Replaces: obconf-qt (<< 0.11.0)
 Description: Language package for obconf-qt
- obconf-qt is an utility to configure openbox with a Qt interface.
- .
  This package contains the l10n files needed by the obconf-qt.

debian/copyright

@@ -3,52 +3,14 @@ Upstream-Name: obconf-qt
 Source: https://github.com/lxqt/obconf-qt
 
 Files: *
-Copyright: 2012-2024 LXQt team
-License: GPL-2.0
-
-Files: src/appearance.cpp
-       src/desktops.cpp
-       src/dock.cpp
-       src/fontbutton.cpp
-       src/fontbutton.h
-       src/maindialog.cpp
-       src/maindialog.h
-       src/margins.cpp
-       src/mouse.cpp
-       src/moveresize.cpp
-       src/obconf-qt.cpp
-       src/obconf-qt.h
-       src/preview.c
-       src/preview.h
-       src/theme.cpp
-       src/tree.cpp
-       src/tree.h
-       src/windows.cpp
-Copyright: 2003      Tim Riley
-           2007      Javeed Shaikh
-           2003-2008 Dana Jansens
-           2013      Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+Copyright: 2012-2018 LXQt team
 License: GPL-2.0+
 
 Files: debian/*
 Copyright: 2013-2018 Alf Gaida <agaida@siduction.org>
-           2015	     Andrew Lee (李健秋) <ajqlee@debian.org>
-           2023-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+	   2015	     Andrew Lee (李健秋) <ajqlee@debian.org>
 License: GPL-2.0+
 
-License: GPL-2.0
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
 License: GPL-2.0+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

debian/gbp.conf

@@ -1,6 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-compression = xz
-

debian/lintian-overrides

@@ -1,2 +1,2 @@
 # there will be no manpage in a foreseable future
-obconf-qt: no-manual-page [usr/bin/obconf-qt]
+obconf-qt: binary-without-manpage usr/bin/obconf-qt

debian/obconf-qt.lintian-overrides

@@ -1,3 +0,0 @@
-# This is expected
-obconf-qt: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
-obconf-qt: no-manual-page [usr/bin/*]

debian/rules

@@ -3,6 +3,7 @@
 
 export LC_ALL=C.UTF-8
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
 	dh ${@} --buildsystem cmake

debian/upstream/metadata

@@ -1,5 +1,7 @@
+Name: obconf-qt
 Bug-Database: https://github.com/lxqt/obconf-qt/issues
 Bug-Submit: https://github.com/lxqt/obconf-qt/issues/new
 Changelog: https://github.com/lxqt/obconf-qt/blob/master/CHANGELOG
-Repository: https://github.com/lxqt/obconf-qt.git
-Repository-Browse: https://github.com/lxqt/obconf-qt
+Repository: https://github.com/lxqt/obconf-qt
+Repository-Browser: https://github.com/lxqt/obconf-qt
+

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/obconf-qt/releases .*/obconf-qt-([\d\.]+).tar.xz