Update Standards-Version to 4.7.1, no changes needed.

debian/changelog

@@ -1,36 +1,88 @@
-lxqt-archiver (0.6.0-0ubuntu1) kinetic; urgency=medium
+lxqt-archiver (1.1.0-0ubuntu3) plucky; urgency=medium
+
+  * Update Standards-Version to 4.7.1, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 17:00:08 -0600
+
+lxqt-archiver (1.1.0-0ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:55:26 -0600
+
+lxqt-archiver (1.1.0-0ubuntu1) plucky; urgency=medium
+
+  * New upstream release.
+    - Bump build dependencies.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:25 -0600
+
+lxqt-archiver (1.0.0-0ubuntu1) oracular; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.7.0, no changes necessary.
+  * Adjust dependencies.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:49:03 -0500
+
+lxqt-archiver (0.9.1-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+  * Update copyright file.
+  * Remove 0001-Support-use-of-7zip.patch, now included in upstream code
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 23 Feb 2024 14:34:49 -0600
+
+lxqt-archiver (0.9.0-0ubuntu2) noble; urgency=medium
+
+  * Fix invalid argument use of 7z. (LP: #2052880)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sun, 11 Feb 2024 21:59:12 +0000
+
+lxqt-archiver (0.9.0-0ubuntu1) noble; urgency=medium
 
   * New upstream release.
   * Bump build dependencies.
+  * Bump Standards-version to 4.6.2, no changes needed.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 14:50:29 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 18:08:55 -0600
 
-lxqt-archiver (0.4.0-0ubuntu1) impish; urgency=medium
+lxqt-archiver (0.8.0-0ubuntu1) mantic; urgency=medium
 
-  * New upstream release 0.4.0
-  * Update debian/control
-    - Use dephelper-compat 13
-    - Use libfm-qt-dev 0.17.1
-    - Use lxqt-build-tools 0.9.0
-    - Bump Standards-Version to 4.5.1
-  * Run wrap-and-sort
-  * Update upstream signing key
-  * Update debian/lxqt-archiver.install
+  * New upstream release.
+  * Bump build dependencies.
+  * Bump Standards-version to 4.6.2, no changes needed.
+  * Update copyright years.
 
- -- apt-ghetto <apt-ghetto@protonmail.com>  Wed, 11 Aug 2021 11:03:08 +0200
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:49:36 -0500
 
-lxqt-archiver (0.3.0-2ubuntu1) hirsute; urgency=medium
+lxqt-archiver (0.7.0-0ubuntu2) lunar; urgency=medium
 
-  * d/control: Build-depend with version on libfm-qt-dev (>= 0.16.0)
-    (Requested by Lubuntu Team, to force proper qt dependency versions)
-  * This upload fixes the FTBFS introduced by 0.3.0-2 caused by the version 
-    of libfm-qt-dev not being 0.16.0 at the time of initial build after auto-
-    sync.
-  * This will block autosync as well in the future, permitting this package
-    to be merged and not automatically superseded (as needed by the Lubuntu 
-    Team for other libraries' compatibilities).
+  * No-change rebuild against libfm-qt 1.2.1.
 
- -- Thomas Ward <teward@ubuntu.com>  Sun, 21 Feb 2021 17:20:04 -0500
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 27 Jan 2023 15:49:34 -0600
+
+lxqt-archiver (0.7.0-0ubuntu1) lunar; urgency=medium
+
+  * New upstream version.
+  * Fix the watch file, for real this time.
+  * Lubuntuify the package slightly, to make debhelper happy.
+  * Bump build dependencies in debian/control.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 22:12:24 -0600
+
+lxqt-archiver (0.6.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Upstreamed compatible changes from Ubuntu, modifying the following files:
+    - control
+    - copyright
+    - lintian-overrides
+    - rules
+    - upstream/*
+    - lxqt-archiver.install
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Tue, 12 Jul 2022 17:15:16 -0500
 
 lxqt-archiver (0.3.0-2) unstable; urgency=medium
 

debian/control

@@ -1,22 +1,53 @@
 Source: lxqt-archiver
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
-           Yao Wei (魏銘廷) <mwei@debian.org>
+           Yao Wei (魏銘廷) <mwei@debian.org>,
+           Simon Quigley <tsimonq2@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 Section: x11
 Priority: optional
-Build-Depends: cmake,
-               debhelper-compat (= 13),
-               libfm-qt-dev (>= 1.1.0),
+Build-Depends: debhelper-compat (= 13),
+               cmake (>= 3.18),
+               libfm-qt6-dev (>= 2.1.0),
                libjson-glib-dev,
                libmagic-dev,
-               libqt5x11extras5-dev,
-               lxqt-build-tools (>= 0.11.0)
-Standards-Version: 4.5.1
-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-archiver
-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-archiver.git
+               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,
+               libxkbcommon-dev (>= 0.5.0),
+               lxqt-build-tools (>= 2.1.0)
+Standards-Version: 4.7.1
+Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-archiver-packaging
+Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-archiver-packaging.git
+Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-archiver
+Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-archiver.git
 Homepage: https://github.com/lxqt/lxqt-archiver
+Rules-Requires-Root: no
 
 Package: lxqt-archiver
 Architecture: any
@@ -38,7 +69,7 @@ Suggests: arj,
           unalz,
           unrar-free | unar | unrar | p7zip-rar,
           zoo
-Description: Archiv Manager for LXQt
+Description: Archive Manager for LXQt
  LXQt Archiver is an archive manager for the LXQt environment.
  It allows you to:
   * Create and modify archives.
@@ -68,8 +99,29 @@ Package: lxqt-archiver-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: qt6-translations-l10n, ${misc:Depends}
 Description: Language package for lxqt-archiver
  LXQt Archiver is an archive manager for the LXQt environment.
+ It allows you to:
+  * Create and modify archives.
+  * View the content of an archive.
+  * View a file contained in an archive.
+  * Extract files from the archive.
  .
- This package contains the l10n files needed by the lxqt-archiver.
+ LXQt Archiver supports the following formats:
+  * Tar (.tar) archives, including those compressed with
+    gzip (.tar.gz, .tgz), bzip (.tar.bz, .tbz), bzip2 (.tar.bz2, .tbz2),
+    compress (.tar.Z, .taz), lzip (.tar.lz, .tlz), lzop (.tar.lzo, .tzo),
+    lzma (.tar.lzma) and xz (.tar.xz)
+  * Zip archives (.zip)
+  * Jar archives (.jar, .ear, .war)
+  * 7z archives (.7z)
+  * iso9660 CD images (.iso)
+  * Lha archives (.lzh)
+  * Single files compressed with gzip (.gz), bzip (.bz), bzip2 (.bz2),
+    compress (.Z), lzip (.lz), lzop (.lzo), lzma (.lzma) and xz (.xz)
+ .
+ LXQt Archiver doesn't perform archive operations by itself, but relies on
+ standard tools for this.
+ .
+ This package contains the l10n files needed by lxqt-archiver.

debian/copyright

@@ -3,15 +3,45 @@ Upstream-Name: lxqt-archiver
 Source: https://github.com/lxqt/lxqt-archiver
 
 Files: *
-Copyright: 2018 The LXQt team
-           2001-2008, 2010-2012, Free Software Foundation, Inc.
+Copyright: 2018-2024 LXQt team
 License: GPL-2+
 Comment: Some of the source code is derived from Engrampa and File
  Roller
 
+Files: src/passworddialog.cpp
+       src/passworddialog.h
+Copyright: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+License: GPL-2+
+
+Files: src/main.cpp
+       src/core/*
+Copyright: 2018-2022 LXQt team
+           2001-2012 Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: src/core/CMakeLists.txt
+       src/core/config.h
+       src/core/tr-wrapper.c
+       src/core/tr-wrapper.h
+       src/core/sh/isoinfo.sh
+Copyright: 2018-2022 LXQt team
+License: GPL-2+
+
+Files: src/core/fr-command-lrzip.c
+       src/core/fr-command-lrzip.h
+Copyright: 2010 Alexander Saprykin
+License: GPL-2+
+
+Files: src/core/fr-enum-types.c
+       src/core/fr-enum-types.h
+       src/core/fr-marshal.c
+       src/core/fr-marshal.h
+Copyright: Unknown, possibly Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+License: GPL-2+
+
 Files: debian/*
-Copyright: 2021, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2018, Alf Gaida <agaida@siduction.org>
+Copyright: 2021-2025, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2018,      Alf Gaida <agaida@siduction.org>
 License: LGPL-2.1+
 
 License: GPL-2+

debian/lintian-overrides

@@ -0,0 +1 @@
+lxqt-archiver: no-manual-page [usr/bin/lxqt-archiver]

debian/rules

@@ -2,7 +2,6 @@
 # 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,-format
 
 %:
@@ -14,4 +13,5 @@ override_dh_missing:
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DUPDATE_TRANSLATIONS=OFF \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DUSE_7Z=ON

debian/salsa-ci.yml

@@ -0,0 +1,12 @@
+# 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
+

debian/source/lintian-overrides

@@ -0,0 +1,2 @@
+# This is expected
+lxqt-archiver source: very-long-line-length-in-source-file * > 512 [src/lxqt-archiver.desktop.in:*]

debian/upstream/metadata

@@ -0,0 +1,5 @@
+Name: lxqt-archiver
+Bug-Database: https://github.com/lxqt/lxqt-archiver/issues
+Bug-Submit: https://github.com/lxqt/lxqt-archiver/issues/new
+Changelog: https://github.com/lxqt/lxqt-archiver/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/lxqt-archiver

debian/watch

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