Revert a sync from Debian.

This reverts commit f4d40a1f5f164c92b8104d9b2eb5dea15a2d9d94.

debian/changelog

@@ -1,26 +1,23 @@
-obconf-qt (0.16.2-2) unstable; urgency=medium
+obconf-qt (0.16.2-2ubuntu1) lunar; urgency=medium
 
-  * Merge to unstable.
+  * Revert sync from Debian.
-  * Update d/watch for GitHub.
-  * Bump Standards-Version to 4.6.2.
 
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Thu, 05 Jan 2023 13:12:24 +0800
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 23:08:44 -0600
 
-obconf-qt (0.16.2-1) experimental; urgency=medium
+obconf-qt (0.16.2-0ubuntu1) kinetic; urgency=medium
 
-  * New upstream release 0.16.2.
+  * New upstream release.
-  * Removed obsolete debian/compat file.
+  * Bump build dependencies.
-  * Switched to GBP.
+  * Drop old Breaks/Replaces, we're past the LTS.
-  * Upstreamed non-Ubuntu-specific packaging changes from Ubuntu, modifying
-    the following files:
-    - control
-    - copyright
-    - lintian-overrides
-    - *.install
-    - rules
-    - upstream/*
 
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 10 Jul 2022 02:53:45 -0500
+ -- 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
 
@@ -40,6 +37,22 @@ obconf-qt (0.16.0-1) unstable; urgency=medium
 
  -- 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.
+    - Update upstream signing key.
+    - Update LXQt build dependencies.
+  * Update Standards-version to 4.5.0, no changes needed.
+  * Run wrap-and-sort.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 14:38:45 -0500
+
+obconf-qt (0.14.1-1ubuntu1) disco; urgency=medium
+
+  * Lubuntuify the package.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 09:56:22 -0600
+
 obconf-qt (0.14.1-1) unstable; urgency=medium
 
   * Cherry-picked upstream release 0.14.1.
@@ -205,3 +218,4 @@ obconf-qt (0.9.0+20150723-1) unstable; urgency=medium
   * Removing whitespaces at EOL and EOF.
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Fri, 14 Aug 2015 17:39:21 +0800
+

debian/control

@@ -1,10 +1,7 @@
 Source: obconf-qt
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Uploaders: Alf Gaida <agaida@siduction.org>,
+XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
-           Andrew Lee (李健秋) <ajqlee@debian.org>,
-           Simon Quigley <tsimonq2@debian.org>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: utils
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
@@ -13,11 +10,12 @@ Build-Depends: debhelper-compat (= 13),
                libqt5x11extras5-dev,
                lxqt-build-tools (>= 0.11.0),
                openbox-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.5.0
-Vcs-Browser: https://salsa.debian.org/lxqt-team/obconf-qt
+Vcs-Browser: https://phab.lubuntu.me/source/obconf-qt/
-Vcs-Git: https://salsa.debian.org/lxqt-team/obconf-qt.git
+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
@@ -32,7 +30,6 @@ Package: obconf-qt-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: ${misc:Depends},
+Depends: qttranslations5-l10n, ${misc:Depends}
-         qttranslations5-l10n
 Description: Language package for obconf-qt
  This package contains the l10n files needed by the obconf-qt.

debian/copyright

@@ -3,57 +3,12 @@ Upstream-Name: obconf-qt
 Source: https://github.com/lxqt/obconf-qt
 
 Files: *
-Copyright: 2012-2022 LXQt team
+Copyright: 2012-2018 LXQt team
-License: GPL-2.0+
-
-Files: src/appearance.cpp
-       src/desktops.cpp
-       src/dock.cpp
-       src/maindialog.cpp
-       src/margins.cpp
-       src/mouse.cpp
-       src/moveresize.cpp
-       src/obconf-qt.cpp
-       src/windows.cpp
-Copyright: 2013      Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2003-2008 Dana Jansens
-           2003      Tim Riley
-License: GPL-2.0+
-
-Files: src/fontbutton.cpp
-       src/fontbutton.h
-Copyright: 2013      Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-License: GPL-2.0+
-
-Files: src/maindialog.h
-Copyright: 2013      Unknown, possibly Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-License: GPL-2.0+
-
-Files: src/obconf-qt.h
-       src/tree.cpp
-       src/tree.h
-Copyright: 2003-2007 Dana Jansens
-License: GPL-2.0+
-
-Files: src/preview.c
-Copyright: 2007      Javeed Shaikh
-           2007      Dana Jansens
-License: GPL-2.0+
-
-Files: src/preview.h
-Copyright: 2007      Javeed Shaikh
-License: GPL-2.0+
-
-Files: src/theme.cpp
-Copyright: 2003-2007 Dana Jansens
-           2003      Tim Riley
 License: GPL-2.0+
 
 Files: debian/*
 Copyright: 2013-2018 Alf Gaida <agaida@siduction.org>
            2015	     Andrew Lee (李健秋) <ajqlee@debian.org>
-           2022      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2023      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: GPL-2.0+
 
 License: GPL-2.0+

debian/gbp.conf

@@ -3,3 +3,4 @@ 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/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/salsa-ci.yml

@@ -1,14 +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
-
-variables:
-  RELEASE: 'experimental'

debian/upstream/metadata

@@ -3,3 +3,5 @@ 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-Browser: https://github.com/lxqt/obconf-qt
+

debian/upstream/signing-key.asc

@@ -50,55 +50,3 @@ NLJtd3SsRjc7ICtGdCvej59IvCDTjxtkhx5okF03APi1aXpHQrE18/arFD7BpoGO
 sw==
 =gSIv
 -----END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-sw==
-=gSIv
------END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -1,6 +1,3 @@
 version=4
-
+opts="pgpsigurlmangle=s/$/.asc/" \
-# See https://davesteele.github.io/development/2015/05/02/debian-watch-file-format-for-signed-github-source-tars/ for GitHub workaround for releases page.
+https://github.com/lxqt/obconf-qt/releases .*/obconf-qt-([\d\.]+).tar.xz
-
-opts="downloadurlmangle=s/archive\/refs\/tags\/@ANY_VERSION@@ARCHIVE_EXT@/releases\/download\/$1\/@PACKAGE@-$1\.tar\.xz/,filenamemangle=s/@ANY_VERSION@@ARCHIVE_EXT@/@PACKAGE@-$1\.tar\.xz/,pgpsigurlmangle=s/$/.asc/" \
-https://github.com/lxqt/@PACKAGE@/tags .*/@ANY_VERSION@@ARCHIVE_EXT@