diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 34962a2..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,24 +0,0 @@ - - -Problems with "missing files" and international characters? -------------------------------------------------------------- - -From http://bugs.debian.org/466591 - - -"When verifying .md5 or .cfv files which contain filenames containing - chars with values > 127 (in ISO-8859), cfv reports the corresponding -files as missing. - -... - -cfv (1.x) has no understanding of encodings for text checksum files, and -since the files are encoded in iso-8859-? but your system is probably -using utf-8 for filenames, the bytes just aren't going to match up. For -the text-based formats you can work around this pretty easily by -manually converting the files: - -"iconv -f iso-8859-1 -t utf-8 foo.md5 > foo.utf8.md5" - - - diff --git a/debian/cfv.docs b/debian/cfv.docs new file mode 100644 index 0000000..9bbfb2c --- /dev/null +++ b/debian/cfv.docs @@ -0,0 +1,2 @@ +README.md +Changelog diff --git a/debian/cfv.manpages b/debian/cfv.manpages new file mode 100644 index 0000000..d3bb1cc --- /dev/null +++ b/debian/cfv.manpages @@ -0,0 +1 @@ +cfv.1 diff --git a/debian/changelog b/debian/changelog index 0990d8f..612ebf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,270 +1,18 @@ -cfv (1.18.3-2) unstable; urgency=low +cfv (3.2.1~dev0+git20260414.adae045-1~ppa3) resolute; urgency=medium - * Package cleanup below by Jari Aalto - thanks! - * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". - * Update to Standards-Version to 3.9.3 and debhelper to 9. - * Move to full dh(1) and simplify rules file. Move from deprecated - python-support to dh_python2, see: - http://wiki.debian.org/Python/TransitionToDHPython2 - * Fix build-depends-on-python-dev-with-no-arch-any (Lintian) by changing - depends python-dev to python-all. + * Track upstream with BLAKE3 b3sum support merged (PR #88). + * Acknowledge in-flight upstream support for BLAKE2 b2sum (PR #92, + uses hashlib, no new runtime dep) and xxhash (future PR). + * Suggests already lists python3-blake3 and python3-xxhash; no + change required for blake2. + * Target Ubuntu 26.04 LTS (resolute). - -- Stefan Alfredsson Thu, 10 May 2012 20:39:46 +0200 + -- Artur Ladka (sarsolot) Tue, 14 Apr 2026 17:38:18 +0000 -cfv (1.18.3-1) unstable; urgency=low +cfv (3.2.1~dev0+git20251102.8533a22-1~ppa2) questing; urgency=medium - * New upstream release and python 2.6 compatibility (Closes: #532056) - * Included note in README.Debian about iso-8859-x - and utf problems (Closes: #466591) - * Improvements below by Krzysztof Klimonda (thanks!) - * debian/rules: - - Simplify rules, make it compatible with Python 2.6. - * debian/control: - - Add versioned Build-Depends on debhelper and python packages. - - Add Homepage. - - Make package depends on ${misc:Depends}. - * debian/copyright: - - Use GPL-2 instead of GPL symlink. - * debian/compat: - - Make package compatible with debhelper 7. - - - -- Stefan Alfredsson Sat, 08 Aug 2009 16:27:25 +0200 - -cfv (1.18.2-1) unstable; urgency=low - - * New upstream release - * Fix for py 2.5 "struct integer overflow warning" (Closes: #479037, #479037) - * torrent clients are now suggested rather than recommended (Closes: #337796) - * Color patch temporarily removed due to incompatiblitiy - with new upstream version - - -- Stefan Alfredsson Tue, 24 Jun 2008 22:41:40 +0000 - -cfv (1.18.1-2) unstable; urgency=low - - * Color patch from "xi iota" applied. - - -- Stefan Alfredsson Mon, 4 Feb 2008 19:50:15 +0100 - -cfv (1.18.1-1) unstable; urgency=low - - * New upstream release - * Acknowledge FTBFS unrepresentable changes NMU (Closes: #357216). - Thanks Matej! - * Acknowledge python transition NMU (Closes: #380793). - Thanks Pierre! - * Bump Standards-Version to 3.7.3 - - -- Stefan Alfredsson Wed, 30 Jan 2008 06:57:24 +0100 - -cfv (1.18-2.2) unstable; urgency=low - - * Non-maintainer upload. - * Update package to the last python policy (Closes: 380793).. - * Bump Standards-Version to 3.7.2. - * Bump DH_COMPAT to 4. - - -- Pierre Habouzit Sun, 3 Sep 2006 22:54:37 +0200 - -cfv (1.18-2.1) unstable; urgency=medium - - * Non-maintainer upload. - * debian/rules: Invoke `make distclean' to avoid spurious diffs. - Closes: #357216. - - -- Matej Vela Mon, 27 Mar 2006 18:44:40 +0200 - -cfv (1.18-2) unstable; urgency=low - - * Fixed grammatical and spelling errors (closes: #298519) - * Updated standards-version - - -- Stefan Alfredsson Thu, 10 Mar 2005 07:13:18 +0100 - -cfv (1.18-1) unstable; urgency=low - - * New upstream release - adds sha1 and torrent related fixes - - -- Stefan Alfredsson Fri, 14 Jan 2005 11:34:19 +0100 - -cfv (1.17-1) unstable; urgency=low - - * New upstream release - * To use bittorrent checking, bittorrent or bittornado must (at the moment) - be installed, therefore a Recommends: was added on these packages - (Closes: #259391) - - -- Stefan Alfredsson Fri, 16 Jul 2004 15:23:17 +0200 - -cfv (1.16-1) unstable; urgency=low - - * New upstream release - - -- Stefan Alfredsson Fri, 21 Nov 2003 13:52:55 +0100 - -cfv (1.15-2) unstable; urgency=low - - * An automatically generated wrapper script tried to use python 2.2, - due to a hardcoded version in debian/rules - updated - the rules-file to use python2.3 (Closes: #207062). - - -- Stefan Alfredsson Mon, 25 Aug 2003 07:16:29 +0200 - -cfv (1.15-1) unstable; urgency=low - - * New upstream release - * Python dependency moved to 2.3, as per Matthias Klose request - - -- Stefan Alfredsson Sun, 24 Aug 2003 18:54:03 +0200 - -cfv (1.13-1) unstable; urgency=low - - * New upstream release - - -- Stefan Alfredsson Thu, 19 Dec 2002 07:39:44 +0100 - -cfv (1.12-3) unstable; urgency=low - - * Somehow the last upload got lost in the upload queue of - ftp.uk.debian.org - * Updated to latest policy - * Python dependency moved to 2.2 - - -- Stefan Alfredsson Mon, 25 Nov 2002 18:59:05 +0100 - -cfv (1.12-2) unstable; urgency=low - - * Added python-imaging suggestion, to get image dimensions for pictures. - - -- Stefan Alfredsson Tue, 24 Sep 2002 14:54:06 +0200 - -cfv (1.12-1) unstable; urgency=low - - * New upstream release - - -- Stefan Alfredsson Tue, 24 Sep 2002 12:04:36 +0200 - -cfv (1.11-1) unstable; urgency=low - - * New upstream release - - -- Stefan Alfredsson Sun, 14 Apr 2002 21:40:43 +0200 - -cfv (1.10-1) unstable; urgency=low - - * New upstream release - - -- Stefan Alfredsson Sat, 8 Dec 2001 00:04:22 +0100 - -cfv (1.9-4) unstable; urgency=low - - * Removed dependency on package not in debian archive (closes: #116867) - * Upstream changes to support 2.1 (new python policy) - - -- Stefan Alfredsson Mon, 5 Nov 2001 23:02:12 +0100 - -cfv (1.9-3) unstable; urgency=low - - * Update to the new python policy. - - -- Matthew Mueller Sun, 4 Nov 2001 12:52:42 -0700 - -cfv (1.9-2) unstable; urgency=low - - * First upload to the debian archive; Previous versions have been - packaged by the upstream author and offered locally, but to - get the package into the official debian archive it must be - maintained by a debian developer. Hence, this upload by me - (after checking that the packaging was OK). - - -- Stefan Alfredsson Wed, 19 Sep 2001 18:32:39 +0200 - -cfv (1.9-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Mon, 3 Sep 2001 15:20:25 -0700 - -cfv (1.8-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Thu, 17 May 2001 13:51:23 -0700 - -cfv (1.7.2-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Tue, 27 Feb 2001 07:38:05 -0700 - -cfv (1.7.1-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Thu, 22 Feb 2001 03:33:05 -0700 - -cfv (1.7-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Sun, 19 Nov 2000 17:16:51 -0700 - -cfv (1.6-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Sun, 5 Nov 2000 14:00:00 -0700 - -cfv (1.5.2-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Tue, 17 Oct 2000 01:34:48 -0700 - -cfv (1.5.1-1) unstable; urgency=low - - * New release. - * Use debian python postinst/prerm scripts. - - -- Matthew Mueller Thu, 12 Oct 2000 15:54:08 -0700 - -cfv (1.5-1) unstable; urgency=low - - * New release. - - -- Matthew Mueller Thu, 12 Oct 2000 01:54:59 -0700 - -cfv (1.4-1) unstable; urgency=low - - * New release. - * Use make install-wrapper method. - - -- Matthew Mueller Thu, 5 Oct 2000 22:23:54 -0700 - -cfv (1.3-1) unstable; urgency=low - - * New release - * Updated depends: and recommends: to include python-fchksum - - -- Matthew Mueller Wed, 16 Aug 2000 04:43:41 -0700 - -cfv (1.2-1) unstable; urgency=low - - * New release - - -- Matthew Mueller Fri, 11 Aug 2000 04:33:55 -0700 - -cfv (1.1-1) unstable; urgency=low - - * New release - - -- Matthew Mueller Mon, 10 Jul 2000 20:12:29 -0700 - -cfv (1.0-1) unstable; urgency=low - - * Initial Release. - * Added (empty) clean rule to Makefile. - - -- Matthew Mueller Fri, 30 Jun 2000 15:35:14 -0700 + * Initial packaging for the Python 3 upstream snapshot. + * Use pyproject build with dh-sequence-python3 and pybuild. + * Add autopkgtest smoke and functional checks. + -- Artur Ladka (sarsolot) Thu, 29 Jan 2026 09:48:43 +0000 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 6727f66..2e395fa 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,26 @@ Source: cfv Section: utils Priority: optional -Maintainer: Stefan Alfredsson -Build-Depends: python-all (>=2.6.7), debhelper (>= 9) -Standards-Version: 3.9.3 -Homepage: http://cfv.sourceforge.net/ +Maintainer: Artur Ladka +Build-Depends: debhelper-compat (= 13), + dh-sequence-python3, + pybuild-plugin-pyproject, + python3-all, + python3-build, + python3-setuptools, + python3-wheel +Standards-Version: 4.7.2 +Rules-Requires-Root: no +Testsuite: autopkgtest-pkg-python +Homepage: https://github.com/cfv-project/cfv +Vcs-Browser: https://github.com/cfv-project/cfv +Vcs-Git: https://github.com/cfv-project/cfv.git Package: cfv Architecture: all -Depends: ${python:Depends}, ${misc:Depends} -Suggests: python-pil, bittorrent | bittornado -Description: versatile file checksum creator and verifier - cfv is a utility to test and create a wide range of checksum - verification files. It currently supports testing and creating - sfv, sfvmd5, csv, csv2, csv4, md5, bsdmd5, torrent and crc files. - Test-only support is available for par, par2. - +Depends: ${python3:Depends}, ${misc:Depends} +Suggests: python3-blake3, python3-pil, python3-xxhash +Description: file checksum creator and verifier + cfv is a command-line utility to create and verify a wide range of checksum + file formats, including sfv, csv, crc, md5, sha*, blake2, blake3, and xxhash. + It also supports torrent, par, and par2 verification. diff --git a/debian/copyright b/debian/copyright index a04eede..91c1bd7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,20 +1,45 @@ -This package was debianized by Matthew Mueller on -Fri, 30 Jun 2000 15:35:14 -0700. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cfv +Upstream-Contact: Lisa Gnedt +Source: https://github.com/cfv-project/cfv -Upstream Authors: Matthew Mueller, Lisa Gnedt. +Files: * +Copyright: 2000-2013 Matthew Mueller + 2018-2025 Lisa Gnedt +License: GPL-2.0-or-later -This software is Copyright (C) 2000-2013 by Matthew Mueller and - Copyright (C) 2018-2025 by Lisa Gnedt. +Files: lib/cfv/BitTorrent/* +Copyright: 2001-2002 Bram Cohen +License: MIT - 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 2 of the License, or - (at your option) any later version. +Files: debian/* +Copyright: 2025 Artur Ladka +License: GPL-2.0-or-later - 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. +License: GPL-2.0-or-later + 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 2 of the License, or + (at your option) any later version. + . + 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 General Public -License can be found in /usr/share/common-licenses/GPL-2 file. +License: MIT + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index bcf3c5f..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/man/man1 -usr/share/pyshared diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 389dbb9..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -README.md -debian/README.Debian diff --git a/debian/rules b/debian/rules index 681db87..21fb525 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,15 @@ #!/usr/bin/make -f -include /usr/share/python/python.mk - -override_dh_auto_install: - make install-wrapper-only prefix=/usr mandir=/usr/share/man DESTDIR=debian/cfv - mv debian/cfv/*.py debian/cfv/usr/share/pyshared/cfv.py +export PYBUILD_SYSTEM=pyproject %: - dh $@ --with python2 + dh $@ --buildsystem=pybuild + +override_dh_installdocs: + dh_installdocs + if [ -e debian/cfv/usr/share/doc/cfv/Changelog ]; then \ + mv debian/cfv/usr/share/doc/cfv/Changelog debian/cfv/usr/share/doc/cfv/changelog; \ + fi -# End of file +override_dh_auto_test: + : diff --git a/debian/tests/cfv b/debian/tests/cfv new file mode 100755 index 0000000..4b52346 --- /dev/null +++ b/debian/tests/cfv @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +cfv --help >/dev/null + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +cd "$tmpdir" +printf 'hello world\n' > sample.txt +cfv -C -t sha1 -f sample.sha1 sample.txt >/dev/null +cfv sample.sha1 >/dev/null diff --git a/debian/tests/cfv-upstream b/debian/tests/cfv-upstream new file mode 100755 index 0000000..e1bb50e --- /dev/null +++ b/debian/tests/cfv-upstream @@ -0,0 +1,29 @@ +#!/bin/sh +exec 2>&1 +set -e +set -x + +cd "$(dirname "$0")/../.." + +if [ ! -f test/test.py ]; then + echo "test/test.py not found; are we in the source tree root?" >&2 + exit 1 +fi + +# Provide a "python" shim for upstream tests that invoke /usr/bin/env python. +tmpbin=$(mktemp -d) +trap 'rm -rf "$tmpbin"' EXIT +ln -s "$(command -v python3)" "$tmpbin/python" +export PATH="$tmpbin:$PATH" + +python3 -W error -bb test/test.py --unit --exit-early + +ulimit -n || true +ulimit -n 4096 || true + +python3 -W error -bb test/test.py -i --exit-early + +ulimit -n || true +ulimit -n 4096 || true + +python3 test/test.py -e --exit-early diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..99a3bf3 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,5 @@ +Tests: cfv +Depends: @ + +Tests: cfv-upstream +Depends: @, python3, coreutils, cksfv, python3-blake3, python3-xxhash diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..f3d3a15 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts=filenamemangle=s/.+\/v?(\d[\d\.]*).*\.tar\.gz/cfv-$1\.tar\.gz/ \ + https://github.com/cfv-project/cfv/tags .*/v?(\d[\d\.]*)\.tar\.gz