Merge branch 'ubuntu/hirsute' into ci/stable

Added missing files to lxqt-archiver.install

debian/changelog

@@ -1,39 +1,15 @@
-lxqt-archiver (0.8.0-0ubuntu1) mantic; urgency=medium
+lxqt-archiver (0.3.0-2ubuntu1) hirsute; urgency=medium
 
-  * New upstream release.
-  * Bump build dependencies.
-  * Bump Standards-version to 4.6.2, no changes needed.
-  * Update copyright years.
+  * 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).
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:49:36 -0500
-
-lxqt-archiver (0.7.0-0ubuntu2) lunar; urgency=medium
-
-  * No-change rebuild against libfm-qt 1.2.1.
-
- -- 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
+ -- Thomas Ward <teward@ubuntu.com>  Sun, 21 Feb 2021 17:20:04 -0500
 
 lxqt-archiver (0.3.0-2) unstable; urgency=medium
 

debian/control

@@ -1,32 +1,34 @@
 Source: lxqt-archiver
-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>,
            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.3.0),
+Build-Depends: debhelper-compat (= 12),
+               cmake,
+               libfm-qt-dev (>= 0.16.0),
                libjson-glib-dev,
                libmagic-dev,
+               lxqt-build-tools,
                libqt5x11extras5-dev,
-               lxqt-build-tools (>= 0.13.0)
-Standards-Version: 4.6.1
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-archiver-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-archiver-packaging.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-archiver
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-archiver.git
+Standards-Version: 4.4.0
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-archiver
+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
-Depends: bzip2, p7zip-full, ${misc:Depends}, ${shlibs:Depends}
-Recommends: gvfs, lxqt-archiver-l10n, unzip, xz-utils, zip
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         bzip2,
+         p7zip-full
+Recommends: gvfs,
+            lxqt-archiver-l10n,
+            unzip,
+            xz-utils,
+            zip
 Suggests: arj,
           binutils,
           cpio,
@@ -43,7 +45,7 @@ Suggests: arj,
           unalz,
           unrar-free | unar | unrar | p7zip-rar,
           zoo
-Description: Archive Manager for LXQt
+Description: Archiv Manager for LXQt
  LXQt Archiver is an archive manager for the LXQt environment.
  It allows you to:
   * Create and modify archives.
@@ -73,7 +75,8 @@ Package: lxqt-archiver-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qttranslations5-l10n, ${misc:Depends}
+Depends: ${misc:Depends},
+         qttranslations5-l10n
 Description: Language package for lxqt-archiver
  LXQt Archiver is an archive manager for the LXQt environment.
  .

debian/copyright

@@ -3,45 +3,18 @@ Upstream-Name: lxqt-archiver
 Source: https://github.com/lxqt/lxqt-archiver
 
 Files: *
-Copyright: 2018-2023 LXQt team
+Copyright: 2018 The LXQt team
+License: GPL-2+
+
+Files: src/main.cpp
+Copyright: 2018 The LXQt team
+           2001, 2003 Free Software Foundation, Inc.
 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-2023, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2018,      Alf Gaida <agaida@siduction.org>
+Copyright: 2018 Alf Gaida <agaida@siduction.org>
 License: LGPL-2.1+
 
 License: GPL-2+

debian/lintian-overrides

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

debian/lxqt-archiver.install

@@ -1,3 +1,4 @@
-usr/bin/lxqt-archiver
 usr/share/applications/lxqt-archiver.desktop
 usr/share/icons/hicolor/scalable/apps/lxqt-archiver.svg
+usr/libexec/lxqt-archiver/isoinfo.sh
+usr/bin/lxqt-archiver

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

debian/salsa-ci.yml

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

debian/upstream/metadata

@@ -1,5 +0,0 @@
-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,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/lxqt-archiver/releases .*/lxqt-archiver-([\d\.]+).tar.xz