From 353ce826ee8958d29711a8bfdc397b6c3e59a5fa Mon Sep 17 00:00:00 2001 From: Dan Simmons Date: Sun, 21 Feb 2021 21:42:16 -0500 Subject: [PATCH] Sync from archive. --- debian/changelog | 38 ++++++++++++++++++-- debian/control | 68 ++++++++++++++++++++++++------------ debian/copyright | 49 ++++++++++++++++++-------- debian/docs/docs | 1 + debian/gbp.conf | 6 ++++ debian/lxqt-archiver.install | 4 ++- debian/rules | 8 ++--- debian/source/options | 1 + debian/watch | 3 +- 9 files changed, 132 insertions(+), 46 deletions(-) create mode 100644 debian/docs/docs create mode 100644 debian/gbp.conf mode change 100755 => 100644 debian/rules create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index 1328ddf..8798677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,37 @@ -lxqt-archiver (0.1.0-0ubuntu1) UNRELEASED; urgency=medium +lxqt-archiver (0.3.0-2ubuntu1) hirsute; urgency=medium - * Initial release. + * 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 Thu, 23 Apr 2020 23:57:17 -0500 + -- Thomas Ward Sun, 21 Feb 2021 17:20:04 -0500 + +lxqt-archiver (0.3.0-2) unstable; urgency=medium + + * Source only upload for migration to testing + + -- Yao Wei (魏銘廷) Mon, 01 Feb 2021 19:36:32 +0800 + +lxqt-archiver (0.3.0-1) unstable; urgency=medium + + [ Andrew Lee (李健秋) ] + * Add myself as uploaders + * Correct source/format file + * debian/lxqt-archiver.install: ship correct files + + [ Yao Wei (魏銘廷) ] + * debian/copyright: Update copyright file + * debian/control: Add mwei@debian.org as Uploader + + -- Yao Wei (魏銘廷) Thu, 07 Jan 2021 21:41:59 +0800 + +lxqt-archiver (0.0.0.96-1) experimental; urgency=medium + + * Initial release (Closes: #902808) + + -- Alf Gaida Mon, 25 Jun 2018 22:15:30 +0200 diff --git a/debian/control b/debian/control index 63d1370..d2d7824 100644 --- a/debian/control +++ b/debian/control @@ -1,30 +1,51 @@ Source: lxqt-archiver +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + Andrew Lee (李健秋) , + Yao Wei (魏銘廷) , Section: x11 Priority: optional -Maintainer: Lubuntu Developers -Uploaders: Simon Quigley -Build-Depends: cmake, - debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 12), + cmake, + libfm-qt-dev (>= 0.16.0), libjson-glib-dev, libmagic-dev, - lxqt-build-tools -Standards-Version: 4.5.0 + lxqt-build-tools, + libqt5x11extras5-dev, +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 -Vcs-Browser: https://phab.lubuntu.me/source/lxqt-archiver/ -Vcs-Git: https://phab.lubuntu.me/source/lxqt-archiver.git Package: lxqt-archiver Architecture: any -Depends: bzip2, - p7zip-full, - unzip, - xz-utils, - zip, - ${misc:Depends}, - ${shlibs:Depends} -Recommends: lxqt-archiver-l10n -Suggests: gvfs -Description: Archive Manager for LXQt +Depends: ${misc:Depends}, + ${shlibs:Depends}, + bzip2, + p7zip-full +Recommends: gvfs, + lxqt-archiver-l10n, + unzip, + xz-utils, + zip +Suggests: arj, + binutils, + cpio, + lha, + lzip, + lzma, + lzop, + ncompress, + rar, + rpm2cpio, + rzip, + sharutils, + unace, + unalz, + unrar-free | unar | unrar | p7zip-rar, + zoo +Description: Archiv Manager for LXQt LXQt Archiver is an archive manager for the LXQt environment. It allows you to: * Create and modify archives. @@ -46,14 +67,17 @@ Description: Archive Manager for LXQt compress (.Z), lzip (.lz), lzop (.lzo), lzma (.lzma) and xz (.xz) . LXQt Archiver doesn't perform archive operations by itself, but relies on - standard backend tools to accomplish this. + standard tools for this. . - This package contains LXQt Archiver. + This package contain the LXQt archiver. 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 - This package contains the l10n files needed by LXQt Archiver. + LXQt Archiver is an archive manager for the LXQt environment. + . + This package contains the l10n files needed by the lxqt-archiver. diff --git a/debian/copyright b/debian/copyright index f512f2e..508fe38 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,27 +3,46 @@ Upstream-Name: lxqt-archiver Source: https://github.com/lxqt/lxqt-archiver Files: * -Copyright: 2001-2012 The Free Software Foundation, Inc. - 2018 The LXQt team +Copyright: 2018 The LXQt team License: GPL-2+ -Files: debian/* -Copyright: 2018-2020 Lubuntu Developers +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: debian/* +Copyright: 2018 Alf Gaida +License: LGPL-2.1+ License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This program or library is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. . - This package is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. . - You should have received a copy of the GNU General Public License - along with this program. If not, see + On Debian systems, the complete text of the GNU General Public + License version 2 can be found in + "/usr/share/common-licenses/GPL-2". + +License: LGPL-2.1+ + This program or library is free software; you can redistribute it + and/or modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in + "/usr/share/common-licenses/LGPL-2.1". diff --git a/debian/docs/docs b/debian/docs/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..8957fee --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz + diff --git a/debian/lxqt-archiver.install b/debian/lxqt-archiver.install index 3225dbc..00d30d4 100644 --- a/debian/lxqt-archiver.install +++ b/debian/lxqt-archiver.install @@ -1,2 +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 diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index c9b90c3..1c397f8 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,12 @@ #!/usr/bin/make -f +# export DH_VERBOSE=1 -export DH_VERBOSE = 1 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-format -export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-format %: - dh $@ + dh ${@} --buildsystem cmake override_dh_missing: dh_missing --fail-missing diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..112dfc8 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +tar-ignore=.gitignore diff --git a/debian/watch b/debian/watch index e437958..fc7d141 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=4 -https://github.com/lxqt/lxqt-archiver/releases .*/([\d\.]+).tar.gz +opts="pgpsigurlmangle=s/$/.asc/" \ +https://github.com/lxqt/lxqt-archiver/releases .*/lxqt-archiver-([\d\.]+).tar.xz