On Thu, Aug 21, 2025 at 12:14:03PM +0200, Bastian Germann wrote: > Control: tags -1 patch > > I am uploading a NMU with the attached fix to DELAYED/10. > This also contains the latest git changes by the Maintainer.
Looks like I never finished fixing the license for tiv.cpp. I agree with most of the changes although I am not sure why the BSD-3-clause was changed to the BSD-4-clause-UC license. The latter includes the famous BSD advertising clause which the code inside tiv.cpp does not as far as I can tell. I think the correct license should be: License: GPL-3+ or Apache-2.0, and BSD-3-clause Unfortunately, I am leaving for a trip shortly and won't be able to get back to reviewing this in detail for a couple of weeks. Thanks, Loren > diff -Nru tiv-1.2.1+dfsg/debian/changelog tiv-1.2.1+dfsg/debian/changelog > --- tiv-1.2.1+dfsg/debian/changelog 2024-02-01 07:25:21.000000000 +0100 > +++ tiv-1.2.1+dfsg/debian/changelog 2025-08-21 12:06:52.000000000 +0200 > @@ -1,3 +1,14 @@ > +tiv (1.2.1+dfsg-1.1) unstable; urgency=medium > + > + * Non-maintainer upload. > + * Vcs: Follow HTTP forward. > + * Use the right license name for BSD-4-clause-UC. Closes: #1111709 > + > + [ Loren M. Lang ] > + * Fixed and cleaned up copyright details. > + > + -- Bastian Germann <[email protected]> Thu, 21 Aug 2025 12:06:52 +0200 > + > tiv (1.2.1+dfsg-1) unstable; urgency=low > > * Initial release. Closes: #1062455 > diff -Nru tiv-1.2.1+dfsg/debian/control tiv-1.2.1+dfsg/debian/control > --- tiv-1.2.1+dfsg/debian/control 2024-02-01 07:25:21.000000000 +0100 > +++ tiv-1.2.1+dfsg/debian/control 2025-08-21 12:03:25.000000000 +0200 > @@ -6,8 +6,8 @@ > Standards-Version: 4.5.1 > Homepage: https://github.com/stefanhaustein/TerminalImageViewer > Rules-Requires-Root: no > -Vcs-Git: https://salsa.debian.org/penguin359/tiv.git > -Vcs-Browser: https://salsa.debian.org/penguin359/tiv > +Vcs-Git: https://salsa.debian.org/debian/tiv.git > +Vcs-Browser: https://salsa.debian.org/debian/tiv > > Package: tiv > Architecture: any > diff -Nru tiv-1.2.1+dfsg/debian/copyright tiv-1.2.1+dfsg/debian/copyright > --- tiv-1.2.1+dfsg/debian/copyright 2024-02-01 07:25:21.000000000 +0100 > +++ tiv-1.2.1+dfsg/debian/copyright 2025-08-21 12:03:25.000000000 +0200 > @@ -7,20 +7,26 @@ > src/CImg.h > src/java/TerminalImageViewer.java > > -Files: * > +Files: .github/ISSUE_TEMPLATE/bug_report.yml > + .github/ISSUE_TEMPLATE/config.yml > + .github/ISSUE_TEMPLATE/feature_request.yml > + .github/pull_request_template.md > + .gitignore > + README.md > + snapcraft.yaml > + src/Makefile > + terminalimageviewer.rb > Copyright: Copyright (c) 2017-2023, Stefan Haustein, Aaron Liu > License: GPL-3+ or Apache-2.0 > > Files: src/tiv.cpp > -Copyright: Copyright (c) 1987, 1993 > - * The Regents of the University of California. All rights reserved. > -License: BSD-3-clause > +Copyright: > + Copyright (c) 2017-2023, Stefan Haustein, Aaron Liu > + Copyright (c) 1987, 1993 The Regents of the University of California. All > rights reserved. > +License: GPL-3+ or Apache-2.0, and BSD-4-clause-UC > Comment: > - A small portion of the aforementioned file includes source code > - under the above copyright and license. The block of code is marked > - with a comment in the source. The rest of this file is under the > - main dual Apache-2.0/GPL-3+ license and copyright of Stefan > - Haustein and Aaron Liu. > + A small portion of the aforementioned file includes source code under > + BSD-4-clause-UC. The block of code is marked with a comment in the source. > > Files: debian/* > Copyright: Copyright (c) 2024 Loren M. Lang > @@ -36,6 +42,27 @@ > License can be found in the `/usr/share/common-licenses/Apache-2.0' > file. > > -License: BSD-3-clause > - On Debian systems the full text of the BSD license can be > - found in the `/usr/share/common-licenses/BSD' file. > +License: BSD-4-clause-UC > + Redistribution and use in source and binary forms, with or without > + modification, are permitted provided that the following conditions > + are met: > + 1. Redistributions of source code must retain the above copyright > + notice, this list of conditions and the following disclaimer. > + 2. Redistributions in binary form must reproduce the above copyright > + notice, this list of conditions and the following disclaimer in the > + documentation and/or other materials provided with the distribution. > + 4. Neither the name of the University nor the names of its contributors > + may be used to endorse or promote products derived from this software > + without specific prior written permission. > + . > + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + SUCH DAMAGE. -- Loren M. Lang [email protected] http://www.north-winds.org/ IRC: penguin359 Public Key: http://www.north-winds.org/lorenl_pubkey.asc Fingerprint: 7896 E099 9FC7 9F6C E0ED E103 222D F356 A57A 98FA
signature.asc
Description: PGP signature
