Compare commits

...

14 Commits

Author SHA1 Message Date
29b81aa920 Update Standards-Version to 4.7.1, no changes needed. 2025-02-21 17:12:21 -06:00
e683c35d7a No-change rebuild for lxqt-build-tools C++17 -> C++20. 2025-02-21 17:00:03 -06:00
da7f4bf63a Upload to Plucky 2024-11-15 15:34:45 -06:00
4a9ba26b37 Make Lintian happy 2024-11-05 19:19:16 -06:00
2fa547d112 Bump build dependencies. 2024-11-05 19:15:10 -06:00
5ca00c8af6 New upstream release. 2024-11-05 18:47:17 -06:00
Aaron Rainbolt
9808f555be Release to Oracular 2024-08-15 16:49:12 -05:00
Aaron Rainbolt
5c0d50d7ca PPA build 2024-06-28 00:04:14 -05:00
Aaron Rainbolt
0834913de6 Adjust deps 2024-06-28 00:01:15 -05:00
Aaron Rainbolt
3d775bbe88 Bump Standards-Version 2024-06-27 23:58:35 -05:00
Aaron Rainbolt
4f3ccc3d00 Bump version for new upstream release 2024-06-27 23:52:26 -05:00
5569f0226e Remove obsolete patch 2024-02-23 14:37:54 -06:00
e3acc2ae3d Update copyright file 2024-02-23 14:36:41 -06:00
2b6e0abfd6 Bump version for new upstream release 2024-02-23 14:35:12 -06:00
6 changed files with 97 additions and 68 deletions

35
debian/changelog vendored
View File

@ -1,3 +1,38 @@
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)

69
debian/control vendored
View File

@ -1,6 +1,6 @@
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>,
@ -8,18 +8,44 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
Aaron Rainbolt <arraybolt3@gmail.com>
Section: x11
Priority: optional
Build-Depends: cmake,
debhelper-compat (= 13),
libfm-qt-dev (>= 1.4.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.13.0)
Standards-Version: 4.6.2
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
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
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
@ -73,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.

4
debian/copyright vendored
View File

@ -3,7 +3,7 @@ Upstream-Name: lxqt-archiver
Source: https://github.com/lxqt/lxqt-archiver
Files: *
Copyright: 2018-2023 LXQt team
Copyright: 2018-2024 LXQt team
License: GPL-2+
Comment: Some of the source code is derived from Engrampa and File
Roller
@ -40,7 +40,7 @@ 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>
Copyright: 2021-2025, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
2018, Alf Gaida <agaida@siduction.org>
License: LGPL-2.1+

View File

@ -1,54 +0,0 @@
From ec90b9e40bb1e50faf9f4ce59e58261e888d4f7e Mon Sep 17 00:00:00 2001
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Sun, 11 Feb 2024 18:47:52 +0000
Subject: [PATCH] Support use of 7zip
Debian and Ubuntu are now using 7zip instead of p7zip. With 7zip the
archieve creation fails as it does not support '-l'.
This change will disable '-l' if anyone defines USE_7Z in the build flags.
Other builds who have not defined 'USE_7Z' are not affected.
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Origin: upstream, https://github.com/lxqt/lxqt-archiver/commit/ad850a5af053bbd5e6d4c73b0e699f4a76a1f9cb
Bug: https://github.com/lxqt/lxqt-archiver/issues/379
Bug-Ubuntu: https://launchpad.net/bugs/2052880
Last-Update: 2024-02-11
---
CMakeLists.txt | 4 ++++
src/core/fr-command-7z.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0680105..50532d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@ project(lxqt-archiver)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+option(USE_7Z "Building with 7z" OFF)
+if(USE_7Z)
+ add_definitions(-DUSE_7Z)
+endif()
set(GLIB_MINIMUM_VERSION "2.50.0")
set(LIBFMQT_MINIMUM_VERSION "1.4.0")
diff --git a/src/core/fr-command-7z.c b/src/core/fr-command-7z.c
index 504f1e2..887fbcd 100644
--- a/src/core/fr-command-7z.c
+++ b/src/core/fr-command-7z.c
@@ -345,7 +345,10 @@ fr_command_7z_add (FrCommand *comm,
if (spd_support) fr_process_add_arg (comm->process, "-spd");
fr_process_add_arg (comm->process, "-bd");
fr_process_add_arg (comm->process, "-y");
+#ifndef USE_7Z
+ /* Unlike p7zip, 7zip does not support '-l'. Define USE_7Z to disable '-l'. */
fr_process_add_arg (comm->process, "-l");
+#endif
add_password_arg (comm, comm->password, FALSE);
if ((comm->password != NULL)
&& (*comm->password != 0)
--
2.39.2

View File

@ -1 +0,0 @@
0001-Support-use-of-7zip.patch

2
debian/source/lintian-overrides vendored Normal file
View File

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