diff -Nru cdtool-2.1.8-release/debian/changelog cdtool-2.1.8-release/debian/changelog --- cdtool-2.1.8-release/debian/changelog 2019-01-19 19:45:45.000000000 +0000 +++ cdtool-2.1.8-release/debian/changelog 2021-01-08 14:11:55.000000000 +0000 @@ -1,3 +1,20 @@ +cdtool (2.1.8-release-8) unstable; urgency=medium + + [ Debian Janitor ] + * Use secure URI in Homepage field. + * Update standards version to 4.4.1, no changes needed. + * Bump debhelper from old 11 to 12. + * Fix day-of-week for changelog entries 2.1.5-5. + + [ Stephen Kitt ] + * Fix formatting issues highlighted by GCC. + * Switch to debhelper compatibility level 13. + * Add a watch file. + * Switch to a machine-readable debian/copyright file. + * Standards-Version 4.5.1, no further change required. + + -- Stephen Kitt Fri, 08 Jan 2021 15:11:55 +0100 + cdtool (2.1.8-release-7) unstable; urgency=medium * Set “Rules-Requires-Root: binary-targets” since the build assumes it @@ -228,7 +245,7 @@ * Tell dpkg-gencontrol to generate Priority and Section * Strip .note and .comment from the binaries - -- Max Vozeler Wed, 20 Jan 2004 23:19:59 +0100 + -- Max Vozeler Tue, 20 Jan 2004 23:19:59 +0100 cdtool (2.1.5-4.1) unstable; urgency=low diff -Nru cdtool-2.1.8-release/debian/compat cdtool-2.1.8-release/debian/compat --- cdtool-2.1.8-release/debian/compat 2018-04-22 18:42:48.000000000 +0000 +++ cdtool-2.1.8-release/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru cdtool-2.1.8-release/debian/control cdtool-2.1.8-release/debian/control --- cdtool-2.1.8-release/debian/control 2019-01-19 19:43:28.000000000 +0000 +++ cdtool-2.1.8-release/debian/control 2021-01-08 14:11:12.000000000 +0000 @@ -2,9 +2,9 @@ Section: sound Priority: optional Maintainer: Stephen Kitt -Build-Depends: debhelper (>= 11~) -Standards-Version: 4.3.0 -Homepage: http://hinterhof.net/cdtool/ +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.5.1 +Homepage: https://hinterhof.net/cdtool/ Vcs-Browser: https://salsa.debian.org/debian/cdtool Vcs-Git: https://salsa.debian.org/debian/cdtool.git Rules-Requires-Root: binary-targets diff -Nru cdtool-2.1.8-release/debian/copyright cdtool-2.1.8-release/debian/copyright --- cdtool-2.1.8-release/debian/copyright 2016-01-29 22:38:39.000000000 +0000 +++ cdtool-2.1.8-release/debian/copyright 2021-01-08 13:58:18.000000000 +0000 @@ -1,51 +1,44 @@ -This package was created from the cdtool sources distributed at: - http://hinterhof.net/cdtool/dist/ - -The maintainer of this package is Max Vozeler . -Martin Mitchell maintained this package before. - -Copyright: - - CDTOOL 1.0 is Copyright 1994 Thomas Insel. It may be distributed -freely under the terms of the GPL. For more information, read the files -"COPYING" and "main.c". - - CDTOOL 1.0 contains some code from XPlaycd (mainly in hardware.c) -which is by Olav Woelfelschneider. Per the CREDITS file with XPlaycd, this -code was originally from WdorkBone and/or WorkMan. Thanks for OpenSource! - - CDTOOL 2.0 is Copyright 1995,96 Sven Oliver Moll. Since it was GPL, -it still is GPL. - - CDTOOL 2.1 is Copyright 1997,98 Wade Hampton, Dan Risacher, Lin Zhe Min, -Byron Ellacott, and the original authors. Since it was GPL, it is still GPL. - - CDTOOL 2.1.6 is Copyright 2004 Max Vozeler, Copyright 2003 Josh Buhl, -Copyright 1999 Roland Rosenfeld, Copyright 1999 Mike Coleman and Copyright -2001 Richard Kettlewell. - - CDTOOL 2.1.7 is Copyright 2004 Max Vozeler and Copyright 2000 -Peter Samuelson. - -EMAIL: - Byron Ellacott - Daniel R. Risacher - Josh Buhl - Lin Zhe Min - Max Vozeler - Mike Coleman - Olav Woelfelschneider - Peter Samuelson - Richard Kettlewell - Roland Rosenfeld - Sven Oliver Moll - Thomas Insel - Wade Hampton - - See also PEOPLE and CHANGES for detailed attributions. - -You are free to distribute this software under the terms of -the GNU General Public License. - -On Debian systems, the complete text of the GNU General Public -License can be found in the file '/usr/share/common-licenses/GPL-2'. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cdtool +Source: https://hinterhof.net/cdtool/ + +Files: * +Copyright: 1994 Thomas Insal + 1995-1996 Sven Oliver Moll + 1997-1998 Wade Hampton, Dan Risacher, Lin Zhe Min, + Byron Ellacott, and the original authors + 1999 Roland Rosenfeld and Mike Coleman + 2000 Peter Samuelson + 2001 Richard Kettlewell + 2003 Josh Buhl + 2004 Max Vozeler +License: GPL-2 + +Files: debian/* +Copyright: 1996 Stephen Pitts + 1997-1999 Martin Mitchell + 2002 Gergely Nagy + 2004 Christian Perrier + 2004-2006 Max Vozeler + 2009 Barry deFreese + 2015 Santiago Vila + 2016, 2018-2019, 2021 Stephen Kitt +License: 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 + the Free Software Foundation; version 2 dated June, 1991. + . + 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. + . + You should have received a copy of the GNU General Public License + with this program; if not, write to the Free Software Foundation, + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public + License, version 2, can be found in the file + '/usr/share/common-licenses/GPL-2'. diff -Nru cdtool-2.1.8-release/debian/patches/formatting-fixes.patch cdtool-2.1.8-release/debian/patches/formatting-fixes.patch --- cdtool-2.1.8-release/debian/patches/formatting-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ cdtool-2.1.8-release/debian/patches/formatting-fixes.patch 2019-12-14 10:33:09.000000000 +0000 @@ -0,0 +1,28 @@ +Description: Fix formatting issues +Author: Stephen Kitt + +size_t should be qualified with ‘z’. Increase label length to cover +all possible sizes. + +--- a/cdown.c ++++ b/cdown.c +@@ -261,7 +261,7 @@ + va_end(args); + + if (len < 1 || len > sizeof(buffer)) { +- fprintf(stderr, "%s len=%d in netprintf\n", (len > sizeof(buffer)) ? ++ fprintf(stderr, "%s len=%zd in netprintf\n", (len > sizeof(buffer)) ? + "truncated message" : "empty message or error", len); + return -1; + } +--- a/cdtool2cddb.c ++++ b/cdtool2cddb.c +@@ -197,7 +197,7 @@ + report_submitter, crlf, crlf, b->id, crlf); + fputstring (out, cddb_max_line, "DTITLE=", "%s / %s", b->artist, b->title); + for (i=0; itracks; i++) { +- char label[12]; ++ char label[18]; + sprintf (label, "TTITLE%d=", i); + fputstring (out, cddb_max_line, label, "%s", b->track[i]); + } diff -Nru cdtool-2.1.8-release/debian/patches/series cdtool-2.1.8-release/debian/patches/series --- cdtool-2.1.8-release/debian/patches/series 2018-04-30 11:59:49.000000000 +0000 +++ cdtool-2.1.8-release/debian/patches/series 2019-12-14 10:26:58.000000000 +0000 @@ -3,3 +3,4 @@ 03_distclean_remove_makefile_and_config_dot_h.diff 04_spelling_fixes.diff 05_cdtool.1_fixes.diff +formatting-fixes.patch diff -Nru cdtool-2.1.8-release/debian/watch cdtool-2.1.8-release/debian/watch --- cdtool-2.1.8-release/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ cdtool-2.1.8-release/debian/watch 2021-01-08 10:15:28.000000000 +0000 @@ -0,0 +1,3 @@ +version=4 +opts="dversionmangle=s/-release$//" \ +https://hinterhof.net/cdtool/ dist/cdtool-@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate