diff options
Diffstat (limited to '')
-rw-r--r-- | debian/changelog | 10 | ||||
-rw-r--r-- | debian/control | 7 | ||||
-rw-r--r-- | debian/copyright | 360 | ||||
-rw-r--r-- | debian/gbp.conf | 2 | ||||
-rw-r--r-- | debian/liblzma-dev.docs | 2 | ||||
-rw-r--r-- | debian/liblzma-doc.docs | 2 | ||||
-rw-r--r-- | debian/not-installed | 14 | ||||
-rwxr-xr-x | debian/rules | 21 | ||||
-rw-r--r-- | debian/source.lintian-overrides | 6 | ||||
-rw-r--r-- | debian/symbols | 2 | ||||
-rw-r--r-- | debian/tests/control | 2 | ||||
-rw-r--r-- | debian/upstream/signing-key.asc | 99 | ||||
-rw-r--r-- | debian/watch | 3 | ||||
-rw-r--r-- | debian/xz-utils.install | 13 |
14 files changed, 208 insertions, 335 deletions
diff --git a/debian/changelog b/debian/changelog index 1e463e4..3fb8202 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,15 @@ +xz-utils (5.6.2-1) unstable; urgency=medium + + * Import 5.6.2 + * Takeover maintenance of the package. + * Revert the debian/ mostly to what was in 5.6.1-1 + + -- Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Sat, 15 Jun 2024 10:42:31 +0200 + xz-utils (5.6.1+really5.4.5-1) unstable; urgency=critical * Non-maintainer upload by the Security Team. - * Revert back to the 5.4.5-0.2 version + * Revert back to the 5.4.5-0.2 version -- Salvatore Bonaccorso <carnil@debian.org> Thu, 28 Mar 2024 15:59:38 +0100 diff --git a/debian/control b/debian/control index 6b874ec..d2f58a8 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: xz-utils Section: utils Priority: optional -Maintainer: Jonathan Nieder <jrnieder@gmail.com> -Uploaders: Mohammed Adnène Trojette <adn+deb@diwi.org> +Maintainer: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> +Uploaders: Jonathan Nieder <jrnieder@gmail.com> Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.16.2), autoconf (>= 2.64~), automake, libtool (>= 2.2), gettext, autopoint | gettext (<< 0.18-1), autopoint | cvs, po4a @@ -44,7 +44,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: foreign Conflicts: lzma (<< 9.22-1), xz-lzma -Breaks: lzip (<< 1.8~rc2), manpages-de (<< 4.17.0-2~bpo11+1), manpages-fr (<< 4.17.0-2~bpo11+1) +Breaks: lzip (<< 1.8~rc2), manpages-de (<< 4.17.0-2~bpo11+1), manpages-fr (<< 4.17.0-2~bpo11+1), pristine-tar (<< 1.50+nmu1) Replaces: lzip (<< 1.8~rc2), xz-lzma, manpages-de (<< 4.17.0-2~bpo11+1), manpages-fr (<< 4.17.0-2~bpo11+1) Provides: lzma Description: XZ-format compression utilities @@ -112,6 +112,7 @@ Description: XZ-format compression library - development files Package: liblzma-doc Section: doc +Multi-Arch: foreign Architecture: all Depends: ${misc:Depends} Suggests: liblzma-dev diff --git a/debian/copyright b/debian/copyright index d4466ce..4432a45 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Upstream-Contact: https://tukaani.org/xz/lists.html Source: https://tukaani.org/xz - https://git.tukaani.org/xz.git + https://github.com/tukaani-project/xz Comment: XZ Utils is developed and maintained upstream by Lasse Collin. Major portions are based on code by other authors; see AUTHORS for details. @@ -17,107 +17,98 @@ Comment: documentation come from Doxygen. License: Different licenses apply to different files in this package. Here - is a rough summary of which licenses apply to which parts of this - package (but check the individual files to be sure!): + is a summary of which licenses apply to which parts of this package: . - - liblzma is in the public domain. + - liblzma is under the BSD Zero Clause License (0BSD). . - - xz, xzdec, and lzmadec command line tools are in the public - domain unless GNU getopt_long had to be compiled and linked - in from the lib directory. The getopt_long code is under - GNU LGPLv2.1+. + - The command line tools xz, xzdec, lzmadec, and lzmainfo are + under 0BSD except that, on systems that don't have a usable + getopt_long, GNU getopt_long is compiled and linked in from the + 'lib' directory. The getopt_long code is under GNU LGPLv2.1+. . - The scripts to grep, diff, and view compressed files have been - adapted from gzip. These scripts and their documentation are - under GNU GPLv2+. + adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless, + and xzmore) are under GNU GPLv2+. The man pages of the scripts + are under 0BSD; they aren't based on the man pages of GNU gzip. . - - All the documentation in the doc directory and most of the - XZ Utils specific documentation files in other directories - are in the public domain. + - Most of the XZ Utils specific documentation that is in + plain text files (like README, INSTALL, PACKAGERS, NEWS, + and ChangeLog) are under 0BSD unless stated otherwise in + the file itself. The files xz-file-format.txt and + lzma-file-format.xt are in the public domain but may + be distributed under the terms of 0BSD too. . - - Translated messages are in the public domain. + - Translated messages and man pages are under 0BSD except that + some old translations are in the public domain. . - - The build system contains public domain files, and files that - are under GNU GPLv2+ or GNU GPLv3+. None of these files end up - in the binaries being built. + - Test files and test code in the 'tests' directory, and + debugging utilities in the 'debug' directory are under + the BSD Zero Clause License (0BSD). . - - Test files and test code in the tests directory, and debugging - utilities in the debug directory are in the public domain. + - The GNU Autotools based build system contains files that are + under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses. + These files don't affect the licensing of the binaries being + built. . - - The extra directory may contain public domain files, and files - that are under various free software licenses. + - The 'extra' directory contains files that are under various + free software licenses. These aren't built or installed as + part of XZ Utils. . - You can do whatever you want with the files that have been put into - the public domain. If you find public domain legally problematic, - take the previous sentence as a license grant. If you still find - the lack of copyright legally problematic, you have too many - lawyers. + For the files under the BSD Zero Clause License (0BSD), if + a copyright notice is needed, the following is sufficient: . - As usual, this software is provided "as is", without any warranty. + Copyright (C) The XZ Utils authors and contributors . - If you copy significant amounts of public domain code from XZ Utils + If you copy significant amounts of 0BSD-licensed code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but - naturally it is not legally required. Here is an example of a good - notice to put into "about box" or into documentation: + it is not legally required by the license terms. Here is an example + of a good notice to put into "about box" or into documentation: . - This software includes code from XZ Utils <http://tukaani.org/xz/>. + This software includes code from XZ Utils <https://tukaani.org/xz/>. . The following license texts are included in the following files: + - COPYING.0BSD: BSD Zero Clause License - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 . - Note that the toolchain (compiler, linker etc.) may add some code - pieces that are copyrighted. Thus, it is possible that e.g. liblzma - binary wouldn't actually be in the public domain in its entirety - even though it contains no copyrighted code from the XZ Utils source - package. - . - If you have questions, don't hesitate to ask the author(s) for more - information. + A note about old XZ Utils releases: + . + XZ Utils releases 5.4.6 and older and 5.5.1alpha have a + significant amount of code put into the public domain and + that obviously remains so. The switch from public domain to + 0BSD for newer releases was made in Febrary 2024 because + public domain has (real or perceived) legal ambiguities in + some jurisdictions. + . + There is very little *practical* difference between public + domain and 0BSD. The main difference likely is that one + shouldn't claim that 0BSD-licensed code is in the public + domain; 0BSD-licensed code is copyrighted but available under + an extremely permissive license. Neither 0BSD nor public domain + require retaining or reproducing author, copyright holder, or + license notices when distributing the software. (Compare to, + for example, BSD 2-Clause "Simplified" License which does have + such requirements.) + . + If you have questions, don't hesitate to ask for more information. + The contact information is in the README file. Files: * -Copyright: 2006-2018, Lasse Collin - 1999-2008, Igor Pavlov - 2006, Ville Koskinen - 1998, Steve Reid - 2000, Wei Dai - 2003, Kevin Springle - 2009, Jonathan Nieder - 2010, Anders F Björklund -License: PD - This file has been put in the public domain. - You can do whatever you want with this file. -Comment: - From: Lasse Collin <lasse.collin@tukaani.org> - To: Jonathan Nieder <jrnieder@gmail.com> - Subject: Re: XZ utils for Debian - Date: Sun, 19 Jul 2009 13:28:23 +0300 - Message-Id: <200907191328.23816.lasse.collin@tukaani.org> - . - [...] - . - > AUTHORS, ChangeLog, COPYING, README, THANKS, TODO, - > dos/README, windows/README - . - COPYING says that most docs are in the public domain. Maybe that's not - clear enough, but on the other hand it looks a bit stupid to put - copyright information in tiny and relatively small docs like README. - . - I don't dare to say that _all_ XZ Utils specific docs are in the public - domain unless otherwise mentioned in the file. I'm including PDF files - generated by groff + ps2pdf, and some day I might include Doxygen- - generated HTML docs too. Those don't include any copyright notices, but - it seems likely that groff + ps2pdf or at least Doxygen put some - copyrighted content into the generated files. - -Files: INSTALL NEWS PACKAGERS - windows/README-Windows.txt - windows/INSTALL-MinGW.txt -Copyright: 2009-2010, Lasse Collin -License: probably-PD - See the note on AUTHORS, README, and so on above. +Copyright: Lasse Collin + Igor Pavlov + Andrew Dudman + Chenxi Mao + Ilya Kurdyukov + Jonathan Nieder + Joachim Henke + Hans Jansen + Maksym Vatsyk + Michał Górny + Sebastian Andrzej Siewior + Wei Dai +License: 0BSD Files: src/scripts/* lib/* extra/scanlzma/scanlzma.c Copyright: © 1993, Jean-loup Gailly @@ -129,159 +120,74 @@ Copyright: © 1993, Jean-loup Gailly Other-Authors: Paul Eggert, Ulrich Drepper License: GPL-2+ -Files: src/scripts/Makefile.am src/scripts/xzless.1 -Copyright: 2009, Andrew Dudman - 2009, Lasse Collin -License: PD - This file has been put in the public domain. - You can do whatever you want with this file. - -Files: doc/examples/xz_pipe_comp.c doc/examples/xz_pipe_decomp.c -Copyright: 2010, Daniel Mealha Cabrita -License: PD - Not copyrighted -- provided to the public domain. - -Files: lib/getopt.c lib/getopt1.c lib/getopt.in.h +Files: lib/getopt* Copyright: © 1987-2007 Free Software Foundation, Inc. Other-Authors: Ulrich Drepper License: LGPL-2.1+ Files: m4/getopt.m4 m4/posix-shell.m4 -Copyright: © 2002-2006, 2008 Free Software Foundation, Inc. - © 2007-2008 Free Software Foundation, Inc. -Other-Authors: Bruno Haible, Paul Eggert -License: permissive-fsf - -Files: m4/acx_pthread.m4 -Copyright: © 2008, Steven G. Johnson <stevenj@alum.mit.edu> -License: Autoconf - -files: m4/ax_check_capsicum.m4 -Copyright: © 2014, Google Inc. - © 2015, Lasse Collin <lasse.collin@tukaani.org> -License: permissive-nowarranty - -Files: Doxyfile.in -Copyright: © 1997-2007 by Dimitri van Heesch -Origin: Doxygen 1.4.7 -License: GPL-2 +Copyright: © 2002-2006, 2008-2023 Free Software Foundation, Inc. +Other-Authors: Paul Eggert +License: FSFULLR -Files: src/liblzma/check/crc32_table_?e.h - src/liblzma/check/crc64_table_?e.h - src/liblzma/lzma/fastpos_table.c - src/liblzma/rangecoder/price_table.c -Copyright: none, automatically generated data -Generated-With: - src/liblzma/check/crc32_tablegen.c - src/liblzma/check/crc64_tablegen.c - src/liblzma/lzma/fastpos_tablegen.c - src/liblzma/rangecoder/price_tablegen.c -License: none - No copyright to license. +Files: m4/ax_pthread.m4 +Copyright: © 2008 Steven G. Johnson <stevenj@alum.mit.edu> + © 2011 Daniel Richard G. <skunk@iSKUNK.ORG> + © 2019 Marc Stevens <marc.stevens@cwi.nl> +License: GPL-3.0-or-later-WITH-Autoconf-exception-macro -Files: .gitignore m4/.gitignore po/.gitignore po/LINGUAS po/POTFILES.in +Files: po/LINGUAS Copyright: none; these are just short lists. License: none No copyright to license. -Files: tests/compress_prepared_bcj_* -Copyright: 2008-2009, Lasse Collin -Source-Code: tests/bcj_test.c -License: PD - This file has been put into the public domain. - You can do whatever you want with this file. -Comment: - changelog.gz (commit 975d8fd) explains: - . - Recreated the BCJ test files for x86 and SPARC. The old files - were linked with crt*.o, which are copyrighted, and thus the - old test files were not in the public domain as a whole. They - are freely distributable though, but it is better to be careful - and avoid including any copyrighted pieces in the test files. - The new files are just compiled and assembled object files, - and thus don't contain any copyrighted code. - -Files: po/cs.po po/de.po po/fr.po -Copyright: 2010, Marek Černocký - 2010, Andre Noll - 2011, Adrien Nader +Files: po/ca.po po/cs.po po/da.po po/fr.po po/it.po po/pt_BR.po po/pt.po po/sr.po po/tr.po po/zh_CN.po po/zh_TW.po +Copyright: Jordi Mas i Hernàndez + Marek Černocký + Joe Hansen + Adrien Nader + Stéphane Aulery + Gruppo traduzione italiano di Ubuntu-it + Lorenzo De Liso + Milo Casagrande + Rafael Fontenelle + Pedro Albuquerque + Мирослав Николић + Emir SARI + Boyuan Yang + Yi-Jyun Pan License: PD This file is put in the public domain. -Files: po/it.po po/pl.po -Copyright: 2009, 2010, Gruppo traduzione italiano di Ubuntu-it - 2010, Lorenzo De Liso - 2009, 2010, 2011, Milo Casagrande - 2011, Jakub Bogusz -License: PD - This file is in the public domain +Files: po/de.po po/eo.po po/es.po po/fi.po po/hr.po po/hu.po po/ko.po po/pl.po po/ro.po po/sv.po po/uk.po po/vi.po +Copyright: André Noll + Anna Henningsen + Mario Blättermann + Keith Bowes + Cristian Othón Martínez Vera + Lauri Nurmi + Božidar Putanec + Meskó Balázs + Seong-ho Cho + Jakub Bogusz + Remus-Gabriel Chelu + Sebastian Rasmussen + Luna Jernberg + Anders Jonsson + Yuri Chornoivan + Trần Ngọc Quân +License: 0BSD Files: INSTALL.generic Copyright: © 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. License: permissive-nowarranty -Files: dos/config.h -Copyright: © 1992, 1993, 1994, 1999, 2000, 2001, 2002, 2005 - Free Software Foundation, Inc. - 2007-2010, Lasse Collin -Other-Authors: Roland McGrath, Akim Demaille, Paul Eggert, - David Mackenzie, Bruno Haible, and many others. -Origin: configure.ac from XZ Utils, - visibility.m4 serial 1 (gettext-0.15), - Autoconf 2.52g -License: config-h - configure.ac: - . - # Author: Lasse Collin - # - # This file has been put into the public domain. - # You can do whatever you want with this file. - . - visibility.m4: - . - dnl Copyright (C) 2005 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - . - dnl From Bruno Haible. - . - comments from Autoconf 2.52g: - . - # Copyright 1992, 1993, 1994, 1999, 2000, 2001, 2002 - # Free Software Foundation, Inc. - . - [...] - . - # As a special exception, the Free Software Foundation gives unlimited - # permission to copy, distribute and modify the configure scripts that - # are the output of Autoconf. You need not follow the terms of the GNU - # General Public License when using or distributing such scripts, even - # though portions of the text of Autoconf appear in them. The GNU - # General Public License (GPL) does govern all other use of the material - # that constitutes the Autoconf program. - . - On Debian systems, the complete text of the GNU General Public - License version 2 can be found in ‘/usr/share/common-licenses/GPL-2’. - dos/config.h was generated with autoheader, which tells Autoconf to - output a script to generate a config.h file and then runs it. - Files: po/Makevars -Origin: gettext-runtime/po/Makevars (gettext-0.12) -Copyright: © 2003 Free Software Foundation, Inc. -Authors: Bruno Haible -License: LGPL-2.1+ - The gettext-runtime package is under the LGPL, see files intl/COPYING.LIB-2.0 - and intl/COPYING.LIB-2.1. - . - On Debian systems, the complete text of intl/COPYING.LIB-2.0 from - gettext-runtime 0.12 can be found in ‘/usr/share/common-licenses/LGPL-2’ - and the text of intl/COPYING.LIB-2.1 can be found in - ‘/usr/share/common-licenses/LGPL-2.1’. - . - po/Makevars consists mostly of helpful comments and does not contain a - copyright and license notice. +Copyright: © 2003-2019 Free Software Foundation, Inc +License: FSFUL + This file is free software; the Free Software Foundation gives + unlimited permission to use, copy, distribute, and modify it. Files: COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 Copyright: © 1989, 1991, 1999, 2007 Free Software Foundation, Inc. @@ -295,6 +201,19 @@ License: PD-debian The Debian packaging files are in the public domain. You may freely use, modify, distribute, and relicense them. +License: 0BSD + Permission to use, copy, modify, and/or distribute this + software for any purpose with or without fee is hereby granted. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL + WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + License: LGPL-2.1+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -313,21 +232,6 @@ License: LGPL-2.1+ 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’. -License: GPL-2 - Permission to use, copy, modify, and distribute this software and its - documentation under the terms of the GNU General Public License is - hereby granted. No representations are made about the suitability of - this software for any purpose. It is provided "as is" without express - or implied warranty. See the GNU General Public License for more - details. - . - Documents produced by doxygen are derivative works derived from the - input used in their production; they are not affected by this license. - . - On Debian systems, the complete text of the version of the GNU General - Public License distributed with Doxygen can be found in - ‘/usr/share/common-licenses/GPL-2’. - License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -346,7 +250,7 @@ License: GPL-2+ 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: Autoconf +License: GPL-3.0-or-later-WITH-Autoconf-exception-macro This program 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 3 of the License, or (at your @@ -376,7 +280,7 @@ License: Autoconf On Debian systems, the complete text of the GNU General Public License version 3 can be found in ‘/usr/share/common-licenses/GPL-3’. -License: permissive-fsf +License: FSFULLR This file is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. diff --git a/debian/gbp.conf b/debian/gbp.conf index bd092b9..316e519 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] debian-branch=debian/unstable -upstream-branch=upstream/v5.4 +upstream-branch=upstream/v5.6 [pq] patch-numbers = False diff --git a/debian/liblzma-dev.docs b/debian/liblzma-dev.docs index 84297e3..8061e52 100644 --- a/debian/liblzma-dev.docs +++ b/debian/liblzma-dev.docs @@ -1,5 +1,3 @@ usr/share/doc/xz/xz-file-format.txt usr/share/doc/xz/lzma-file-format.txt -usr/share/doc/xz/TODO usr/share/doc/xz/examples -usr/share/doc/xz/examples_old diff --git a/debian/liblzma-doc.docs b/debian/liblzma-doc.docs index 07e0351..208b7de 100644 --- a/debian/liblzma-doc.docs +++ b/debian/liblzma-doc.docs @@ -1 +1 @@ -doc/api/ +usr/share/doc/xz/api diff --git a/debian/not-installed b/debian/not-installed index 1b5a772..8a2e86a 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -10,8 +10,8 @@ usr/bin/lzmore usr/bin/unlzma usr/lib/*/liblzma.la usr/share/doc/xz/COPYING +usr/share/doc/xz/COPYING.0BSD usr/share/doc/xz/COPYING.GPLv2 -usr/share/doc/xz/TODO usr/share/man/man1/lzcat.1 usr/share/man/man1/lzcmp.1 usr/share/man/man1/lzdiff.1 @@ -22,4 +22,16 @@ usr/share/man/man1/lzless.1 usr/share/man/man1/lzma.1 usr/share/man/man1/lzmore.1 usr/share/man/man1/unlzma.1 +usr/share/man/*/man1/lzcmp.1 +usr/share/man/*/man1/lzdiff.1 +usr/share/man/*/man1/lzegrep.1 +usr/share/man/*/man1/lzfgrep.1 +usr/share/man/*/man1/lzgrep.1 +usr/share/man/*/man1/lzmore.1 +usr/share/man/*/man1/xzcmp.1 +usr/share/man/*/man1/xzdiff.1 +usr/share/man/*/man1/xzegrep.1 +usr/share/man/*/man1/xzfgrep.1 +usr/share/man/*/man1/xzgrep.1 +usr/share/man/*/man1/xzmore.1 usr/share/doc/xz/api/* diff --git a/debian/rules b/debian/rules index 5786bae..04c3c29 100755 --- a/debian/rules +++ b/debian/rules @@ -5,24 +5,23 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all dh $@ $(opt_no_act) override_dh_auto_clean: - if [ -f doc/api.backup.done ]; then rm -rf doc/api; mv doc/api.backup doc/api; rm doc/api.backup.done; else rm -rf doc/api.backup*; fi dh_auto_clean --builddirectory debian/xzdec-build dh_auto_clean --builddirectory debian/normal-build dh_auto_clean --builddirectory debian/static-build override_dh_auto_install-indep: + dh_auto_install --builddirectory debian/normal-build override_dh_auto_install-arch: dh_auto_install --builddirectory debian/xzdec-build - dh_auto_install --builddirectory debian/normal-build dh_auto_install --builddirectory debian/static-build + dh_auto_install --builddirectory debian/normal-build override_dh_installchangelogs: dh_installchangelogs ChangeLog override_dh_auto_build-indep: - if [ ! -d doc/api.backup ]; then cp --reflink=auto -ra doc/api doc/api.backup; touch doc/api.backup.done; fi - cd doxygen && sh update-doxygen + dh_auto_install --builddirectory debian/normal-build override_dh_auto_build-arch: dh_auto_build --builddirectory debian/normal-build @@ -43,7 +42,19 @@ else dh_auto_test --builddirectory debian/xzdec-build endif -override_dh_auto_configure: +override_dh_auto_configure-indep: +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + @echo Skipping docs +else + dh_auto_configure --builddirectory debian/normal-build -- \ + $(opt_reproduce) \ + --enable-threads --disable-static \ + $(opt_optimize) $(opt_quiet) \ + --enable-doxygen \ + --disable-xzdec --disable-lzmadec +endif + +override_dh_auto_configure-arch: dh_auto_configure --builddirectory debian/normal-build -- \ $(opt_reproduce) \ --enable-threads --disable-static \ diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides index 9400e2c..21bfd55 100644 --- a/debian/source.lintian-overrides +++ b/debian/source.lintian-overrides @@ -1,8 +1,2 @@ -# Source is tests/bcj_test.c -source-is-missing [tests/compress_prepared_bcj_sparc] -# Source is tests/bcj_test.c -source-is-missing [tests/compress_prepared_bcj_x86] # This is a compressed text file with bad magic for testing. source-contains-prebuilt-windows-binary [tests/files/bad-1-v1-magic-2.lz] -# Doxygen generated, #1019980, #1017094 -source-is-missing [doc/api/*.html] diff --git a/debian/symbols b/debian/symbols index 74dd00b..d19cdc3 100644 --- a/debian/symbols +++ b/debian/symbols @@ -24,3 +24,5 @@ liblzma.so.5 liblzma5 #MINVER# (arch=linux-any)lzma_stream_encoder_mt@XZ_5.2.2 5.2.2 (arch=linux-any)lzma_stream_encoder_mt_memusage@XZ_5.1.2alpha 5.4 (arch=linux-any)lzma_stream_encoder_mt_memusage@XZ_5.2.2 5.2.2 + XZ_5.6.0@XZ_5.6.0 5.6.0 + lzma_mt_block_size@XZ_5.6.0 5.6.0 diff --git a/debian/tests/control b/debian/tests/control index 10ec68d..60597c2 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,3 +1,3 @@ Tests: testsuite Depends: debhelper-compat (= 13), autoconf (>= 2.64~), automake, libtool (>= 2.2), gettext, @ -Restrictions: rw-build-tree +Restrictions: rw-build-tree, allow-stderr diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 3ca2db5..4a391c6 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -13,18 +13,18 @@ CduUwSKv+6RmtWI5ZmTQYOcBRcZyGKml9X9Q8iSbm6cnpFXmLrNQwCJN+D3SiYGc MtbltZo0ysPMa6Xj5xFaYqWk/BI4iLb2Gs+ByGo/+a0Eq4XYBMOpitNniQARAQAB tCdMYXNzZSBDb2xsaW4gPGxhc3NlLmNvbGxpbkB0dWthYW5pLm9yZz6JAlEEEwEK ADsCGwMCHgECF4AECwkIBwMVCggFFgIDAQAWIQQ2kMJAzlG0Zw0wrRw47nV9aRhG -IAUCYzcN9AUJGPjTYgAKCRA47nV9aRhGIIlfD/0cS3q+z1fGoSYAR8FX/am39S6v -1T0yVyicEFbwNd7x7OCJ6T8qZYb72FjArP8hq/S/1JQOYn7qAvzRb+5WLMgxEOUs -rqol6jvwXGeyIhA09lSe7uEfv+NehEKs8F/30qIEa8Fwc7D6t/WCesDMULFMf4G8 -6XMFVs4gZDS2P54d7rt4+mDn2ZZve2OGcR3k3qr0sgZWNlLOk05n15XtBIFIBJbg -hKXU68ud9I46Ji1Xrnqrn0H/P0jybW3klhp9AzUOfhuoRyUi1PLHDsw7d+jRAHGm -8NnOPOAqxitYcAyU8SLBcpL3k24kjq6C6UwpStHBzqwQTQIfoyCVefxvlYm+8zht -u/CmVXfjB0W+UImCWIeSpj/YzaD3i+YWz8m9lBGuU2WFNO7SAdoenJcUdNiwRL7P -1E0n8HGM0OsSOks9NOWZHn+Ka36ivsNXAAec6inp0BnDEzdNcfrtgFMNBkiEeBD4 -+8T/HRNtBpYBrlDLtmk2uF86wRhSb+J+pOZeUVIuRQiHg3ridz2U+n6Ld4jqNRS1 -5L+yOhx2yJQ/lyIoAF0caPB3QcubXEYvnBLlZHvpdB5XwYr2ROv4OP5bniAvzL4P -45jPdrWd/BJUpBD7V3pac83nvcB+z4K91Hnru2bTNatFlmAhR+1rN9nK9fggmeud -BtgxpnVJAJt5VwF9p7kCDQRMxDmSARAAv8XAp2PGA/G1KmCrVIzOBm1NPIuqGAYP +IAUCZZwJyQUJGuHiNwAKCRA47nV9aRhGIE4qD/4jdFTe3WPpLgvz/jdlbnSZxr7q +OS6H/ZJFENHO4SbavXdoXLtj+t6/lqWq890Js8IpWaaiJLowzW1xJMEg99W6k0KD +3pHUbwPxf0GCSAt/W4JYxdTj+1ggdHjx5yBAmOakjnOH+ZDKQNBnDOI6ghf3ew+H +9z/b0mQX3rlQbtoqSPZtuDOdFcjCOSwEyqdV+9eNqnv2CoKZkiGoUB1WGCbqKUkY +KiUJ3WldmPQ5RQYjEi7zZWVac1VuwBA0XOku+W4cCJ5DnPyK7CtMwC84VvaodlOX +UAK3Y5BIZpZM2Rk6yMX5lFDA5nA8UuHJQRDjTVmh3BIdgRvp0ZV6ogtqNE7RifpW +aBWDIsCkimcbCJJM+edOLiVZog+ia1Ts8zu33wj7Tnvp5znLc8NLZIqwu1HKLS97 +m+Yf5oC3ObTZtXbVF+OglWe/3ljLHdL2bJxNdtcVlChSNPUW3fgLHk9Fzrlnqdab +tSGwI/0Ryt00cKjRiMOagTn5Nly6boCtgGYdQafQoSrs3eQjnWVgbNYDMgPyl4k+ +Q5RJLEY7AvtXo7FUEgOTfr9PWmjmc2JzGpxbtwl6sQi6yLrBZTRf1Xao2OjOje6G +XdUbXNmgOv16sWxcI0s4lX1z28BgHQfwXhBFBRjw2Sy+6TfFXjX24thcpMwvyJ3c +xhMtdY4N4jyfRjYe8LkCDQRMxDmSARAAv8XAp2PGA/G1KmCrVIzOBm1NPIuqGAYP c1l9p0dYdhEgvfw0NXcl5MDv1jbOPZ2PspA8NP7Rqp6LNNXYTeM/eIJDndU5Phyi ewFpACAp7Gmm2dL5PUOhu0gIUnQYbN/QdGPoo7bNI646K1Y9aVTBu9fszQssjb6G qXHSNM+pskVn9lropO1tLrF0I9VSlSphlCmiQRlzBCZSnxD6UagkPaw1gJnJqnrd @@ -35,65 +35,18 @@ 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 -46F3erOKU/vOLCZorkwq -=akRR +vN1ZZND9M1UAEQEAAYkCPAQYAQoAJgIbDBYhBDaQwkDOUbRnDTCtHDjudX1pGEYg +BQJlnAmyBQka4eIgAAoJEDjudX1pGEYguyYQAJo+5SnMMdu+d70mWfUb9PZg7P5C +GRepHnckx9Sis5oR5s7NNl5j5Yy4J1UwsmrP+mn52ujqewkkVsCq65NGQQx7+tkw +uKGvnGBkHdrI+aJk86qLMf4DlnNJEmN8t5jTGQfRLbFVf2I8EY6qXAzCSmL9Zs++ +rDUz65GOTB1EP0XmBRsuVYRfDbFezrPQH0JDucbXFi/2BDnl2/Mk9NBoQ0CvB4oG +tLDiQZ+jV7n1VXXJ1faD9s7i0hOTdcG6rlyIqi/LyAzdCnOYTkmv3U1kdmzkvrh1 +KEiejnM5fj27RE2v191vh3hgZ+X5+uwjNTP0QC4qP8XykQOAA8usOMVZ72lyXCAk +wiUcRdrAXLN/XbIFNcQ3m4d3W6t60Gk09wFlUKaEltDMlPUsxiSG3qFwFGPBP6UV +h3mjJMAl1jltLrR7ybez0SczfrcAtdCsKTvgzV9W2TzUfK2R9PBanmXTXK2M7yU3 +IquHt3Je4aSP7XYb5D+ajlbFNvnXOYcai8WryfC5nLAfV4MbPX+UlRaYCqqHVhut +gK93re1L5mMI3zjG5Ri5jLpUA9toSJCIJIY5zwr/8LL/ZL4TixXlouA17yjkpY/e +Bjs8cNj1O3aM4jY2FKCS8UbfxOiARk/5kBMRPEZ/mqpMQttzE8KVjOv6fRxy/eVE +888/gToe5kb8qYwy +=6rZC -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 6aee3aa..633fabb 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=4 opts=dversionmangle=s/\+\d{8}$//,pgpsigurlmangle=s/$/.sig/ \ -https://tukaani.org/xz/xz-([\d.]*(?:beta)?)\.tar\.xz +https://tukaani.org/xz/ \ +https://github.com/tukaani-project/xz/releases/download/v[^/]+/xz-([\d\.]*(?:beta|alpha)?)\.tar\.xz diff --git a/debian/xz-utils.install b/debian/xz-utils.install index 28bb151..b4c0aeb 100644 --- a/debian/xz-utils.install +++ b/debian/xz-utils.install @@ -9,25 +9,14 @@ usr/bin/xzless usr/bin/xzmore usr/share/locale/*/LC_MESSAGES/xz.mo usr/share/man/*/man1/lzcat.1 -usr/share/man/*/man1/lzcmp.1 -usr/share/man/*/man1/lzdiff.1 -usr/share/man/*/man1/lzegrep.1 -usr/share/man/*/man1/lzfgrep.1 -usr/share/man/*/man1/lzgrep.1 usr/share/man/*/man1/lzless.1 usr/share/man/*/man1/lzma.1 -usr/share/man/*/man1/lzmore.1 +usr/share/man/*/man1/lzmainfo.1 usr/share/man/*/man1/unlzma.1 usr/share/man/*/man1/unxz.1 usr/share/man/*/man1/xz.1 usr/share/man/*/man1/xzcat.1 -usr/share/man/*/man1/xzcmp.1 -usr/share/man/*/man1/xzdiff.1 -usr/share/man/*/man1/xzegrep.1 -usr/share/man/*/man1/xzfgrep.1 -usr/share/man/*/man1/xzgrep.1 usr/share/man/*/man1/xzless.1 -usr/share/man/*/man1/xzmore.1 usr/share/man/man1/lzmainfo.1 usr/share/man/man1/unxz.1 usr/share/man/man1/xz*grep.1 |