Sync with Debian version 0.6.0-1.

debian/changelog

@@ -1,36 +1,15 @@
-lxqt-archiver (0.6.0-0ubuntu1) kinetic; urgency=medium
+lxqt-archiver (0.6.0-1) experimental; urgency=medium
 
   * New upstream release.
-  * Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 14:50:29 -0500
-
-lxqt-archiver (0.4.0-0ubuntu1) impish; 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
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Wed, 11 Aug 2021 11:03:08 +0200
-
-lxqt-archiver (0.3.0-2ubuntu1) hirsute; 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).
-
- -- Thomas Ward <teward@ubuntu.com>  Sun, 21 Feb 2021 17:20:04 -0500
+  * 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,9 +1,10 @@
 Source: lxqt-archiver
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+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,
@@ -13,10 +14,11 @@ Build-Depends: cmake,
                libmagic-dev,
                libqt5x11extras5-dev,
                lxqt-build-tools (>= 0.11.0)
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 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

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

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/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