Update build deps

This reverts commit f8db30cbfb5a9564c7511c2f3837ad9633577070.

debian/changelog

@@ -1,17 +1,81 @@
-lximage-qt (1.2.0-2) unstable; urgency=medium
+lximage-qt (2.2.0-0ubuntu1) questing; urgency=medium
-
-  * Merge to unstable.
-
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Fri, 02 Dec 2022 13:16:18 +0800
-
-lximage-qt (1.2.0-1) experimental; urgency=medium
 
   * New upstream release.
-  * Remove unnecessary patch.
+    - Update build dependencies.
-  * Fix d/watch for GitHub.
+  * Update copyright file.
-  * Sort d/copyright.
+  * Update Standards-Version to 4.7.2, no changes needed.
 
- -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Wed, 30 Nov 2022 22:07:50 +0800
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 13 Aug 2025 12:06:33 -0500
+
+lximage-qt (2.1.1-0ubuntu2) plucky; urgency=medium
+
+  * Update Standards-Version to 4.7.1, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 17:03:55 -0600
+
+lximage-qt (2.1.1-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 04 Feb 2025 15:27:05 -0600
+
+lximage-qt (2.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:14 -0600
+
+lximage-qt (2.0.1-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Adjust dependencies.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:51:12 -0500
+
+lximage-qt (1.4.0-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Updated copyright file.
+  * Bumped build dependency versions.
+  * Ran wrap-and-sort.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 12 Nov 2023 17:36:16 -0600
+
+lximage-qt (1.3.0-0ubuntu1) mantic; urgency=medium
+
+  * New upstream release.
+  * Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:48:31 -0500
+
+lximage-qt (1.2.0-2ubuntu1) lunar; urgency=medium
+
+  * Revert a sync from Debian.
+  * Bumped build dependencies.
+  * Added 'Rules-Requires-Root: no' to debian/control.
+  * Bumped Standards-Version to 4.6.2, no changes necessary.
+  * Overhauled copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 10 Feb 2023 14:19:56 -0600
+
+lximage-qt (1.2.0-0ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild against libfm-qt 1.2.1.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 27 Jan 2023 15:46:45 -0600
+
+lximage-qt (1.2.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Bump build dependencies in debian/control.
+  * Remove reverse-applicable patch.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 17:52:27 -0600
 
 lximage-qt (1.1.0-2) unstable; urgency=medium
 
@@ -61,24 +125,11 @@ lximage-qt (1.1.0-1) experimental; urgency=medium
 
 lximage-qt (1.0.0-1) unstable; urgency=medium
 
-  [ S. 7 ]
   * New upstream release
   * Bumped Standards-Version to 4.6.0, no changes needed
   * Update debian/copyright
 
-  [ Aaron Rainbolt ]
+ -- S. 7 <severusseptimius7@gmail.com>  Thu, 25 Nov 2021 18:19:55 +0200
-  * New upstream release.
-  * Removed trailing whitespace from changelog.
-  * Upstreamed packaging changes from Ubuntu, modifying the following files:
-    - control
-    - copyright
-    - lintian-overrides
-    - lximage-qt.install
-    - rules
-    - upstream/*
-    - patches directory
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 13 Jul 2022 19:06:28 -0500
 
 lximage-qt (0.16.0-1) unstable; urgency=medium
 

debian/control

@@ -1,32 +1,57 @@
 Source: lximage-qt
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
-           Andrew Lee (李健秋) <ajqlee@debian.org>,
+           Andrew Lee (李健秋) <ajqlee@debian.org>
-           Simon Quigley <tsimonq2@debian.org>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libexif-dev,
-               libfm-qt-dev (>= 1.2.0-3~),
+               libfm-qt6-dev (>= 2.2.0),
-               libkf5windowsystem-dev,
-               libqt5svg5-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
+               libxcb-composite0-dev,
+               libxcb-cursor-dev,
+               libxcb-damage0-dev,
+               libxcb-dpms0-dev,
+               libxcb-dri2-0-dev,
+               libxcb-dri3-dev,
+               libxcb-ewmh-dev,
+               libxcb-glx0-dev,
+               libxcb-icccm4-dev,
+               libxcb-keysyms1-dev,
+               libxcb-present-dev,
+               libxcb-record0-dev,
+               libxcb-render0-dev,
+               libxcb-res0-dev,
+               libxcb-screensaver0-dev,
+               libxcb-shape0-dev,
+               libxcb-shm0-dev,
+               libxcb-util-dev,
+               libxcb-xf86dri0-dev,
+               libxcb-xfixes0-dev,
+               libxcb-xinerama0-dev,
+               libxcb-xinput-dev,
+               libxcb-xkb-dev,
+               libxcb-xtest0-dev,
+               libxcb-xv0-dev,
+               libxcb-xvmc0-dev,
                libxfixes-dev,
-               lxqt-build-tools (>= 0.12.0~),
+               libxkbcommon-dev (>= 0.5.0),
-Standards-Version: 4.6.1
+               lxqt-build-tools (>= 2.2.0),
-Vcs-Browser: https://salsa.debian.org/lxqt-team/lximage-qt
+               qt6-svg-dev (>= 6.6.0)
-Vcs-Git: https://salsa.debian.org/lxqt-team/lximage-qt.git
+Standards-Version: 4.7.2
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-about
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-about.git
 Homepage: https://github.com/lxqt/lximage-qt
 Rules-Requires-Root: no
 
 Package: lximage-qt
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends}
-         ${shlibs:Depends}
+Recommends: lximage-qt-l10n, qt6-image-formats-plugins
-Recommends: lximage-qt-l10n, qt5-image-formats-plugins
 Description: Image viewer for LXQt
  A simple image viewer for LXQt. Additional file formats can be processed if
  one install qt5-image-formats-plugins.
@@ -37,10 +62,9 @@ Package: lximage-qt-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: ${misc:Depends},
+Depends: qt6-translations-l10n, ${misc:Depends}
-         qttranslations5-l10n
 Description: Language-package for lximage-qt
  A simple image viewer for LXQt. Additional file formats can be processed if
- one install qt5-image-formats-plugins.
+ one install qt6-image-formats-plugins.
  .
  This package contains the l10n files needed by the lximage-qt.

debian/copyright

@@ -4,43 +4,38 @@ Source: https://github.com/lxqt/lximage-qt
 
 Files: *
 Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2013-2022 LXQt team
+           2013-2025 LXQt team
 License: GPL-2+ and LGPL-2.1+
 
 Files: src/application.*
+       src/graphicsscene.*
+       src/imageview.cpp
        src/loadimagejob.*
+       src/lximage-qt.*
        src/mainwindow.*
        src/modelfilter.*
+       src/mrumenu.*
        src/preferencesdialog.*
+       src/resizeimagedialog.*
        src/saveimagejob.*
+       src/screenshotdialog.*
+       src/screenshotselectarea.*
+       src/screenshotselectareagraphicsview.*
        src/settings.*
-Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+       src/statusbar.*
-License: GPL-2+
+       src/upload/*
-
-Files: src/mrumenu.cpp
-Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-           2018 Nathan Osman <nathan@quickmediasolutions.com>
-License: GPL-2+
-
-Files: src/resizeimagedialog.cpp
-       src/resizeimagedialog.h
-Copyright: 2020 Andrea Diamantini <adjam@protonmail.com>
-           2010 Aurélien Gâteau <agateau@kde.org>
-           2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-License: GPL-2+
-
-Files: src/statusbar.cpp
-       src/statusbar.h
 Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
            2013 Pedram Pourang <tsujan2000@gmail.com>
+           2017 Nathan Osman <nathan@quickmediasolutions.com>
+           2010 Aurélien Gâteau <agateau@kde.org>
+           2018 Nathan Osman <nathan@quickmediasolutions.com>
+           2020 Andrea Diamantini <adjam@protonmail.com>
 License: GPL-2+
 
-Files: src/upload/imgbbprovider.cpp
+Files: src/upload/uploaddialog.ui
-       src/upload/imgbbprovider.h
+Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>  ?
-       src/upload/imgbbupload.cpp
+           2013-2022 LXQt team
-       src/upload/imgbbupload.h
+License: GPL-2+ and LGPL-2.1+
-Copyright: 2017 Nathan Osman <nathan@quickmediasolutions.com>
-License: GPL-2+
 
 Files: data/lximage-qt.metainfo.xml
 Copyright: 2022 LXQt team
@@ -49,8 +44,9 @@ License: CC-BY-4.0
 Files: debian/*
 Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
            2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
-           2015-2022 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2015      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2022      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2023-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2025      Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1+
 
 License: LGPL-2.1+

debian/lximage-qt.lintian-overrides

@@ -0,0 +1,4 @@
+# This is expected
+lximage-qt: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
+lximage-qt: appstream-metadata-validation-failed *
+lximage-qt: no-manual-page [usr/bin/*]

debian/upstream/metadata

@@ -4,3 +4,4 @@ Bug-Submit: https://github.com/lxqt/lximage-qt/issues/new
 Changelog: https://github.com/lxqt/lximage-qt/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lximage-qt
 Repository-Browse: https://github.com/lxqt/lximage-qt
+

debian/watch

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