Control: retitle -1 unblock: tkcvs/8.2.3-6

On 2025-07-05 Andreas Metzler <ametz...@bebt.de> wrote:
> Package: release.debian.org
> Severity: normal
> X-Debbugs-Cc: tk...@packages.debian.org, ametz...@bebt.de
> Control: affects -1 + src:tkcvs
> User: release.debian....@packages.debian.org
> Usertags: unblock

> Please unblock package tkcvs

> This upload only changes debian/copyright. The data there is incomplete,
> most importantly the original author was not listed there. He was aware
> of this and quite unhapppy about it. I am not completely sure what went
> wrong but I think the original author's copyright info was deleted in
> debian/copyright when the software was relicensed from PD to GPL.

> Anyway, the new data in debian/copyright is based on the newly added
> AUTHORS.txt in tkcvs (tkrev) upstream SVN and tkdiff's README.txt which
> were both recently updated when I asked the respective upstreams about
> it.

I have just pushed another minor update. - diff attached.

unblock tkcvs/8.2.3-6

cu Andreas
diff --git a/debian/changelog b/debian/changelog
index 99ed8ee..ced9209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,21 @@
+tkcvs (8.2.3-6) unstable; urgency=high
+
+  * QA upload.
+  * Also add other contributors to debian/copyright.
+
+ -- Andreas Metzler <ametz...@debian.org>  Sat, 05 Jul 2025 11:30:52 +0200
+
+tkcvs (8.2.3-5) unstable; urgency=high
+
+  * QA upload.
+  * Fix debian/copyright, original author was missing.
+    See https://sourceforge.net/p/tkcvs/bugs/160/
+    https://sourceforge.net/p/tkdiff/bugs/100/
+
+ -- Andreas Metzler <ametz...@debian.org>  Sat, 05 Jul 2025 10:43:40 +0200
+
 tkcvs (8.2.3-4) unstable; urgency=medium
 
   * Orphan the package. (See #1076093)
 
  -- Boyuan Yang <by...@debian.org>  Wed, 10 Jul 2024 11:58:31 -0400
diff --git a/debian/copyright b/debian/copyright
index 15993c1..d2f7d47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,107 @@
-This package was originally debianized by Joel Rosdahl <j...@debian.org>.
-It is currently being mainained by Tim Cutts <tj...@debian.org>.
+This package was originally debianized by Joel Rosdahl <j...@debian.org>
+1997-2004, followed by Tim Cutts <tj...@debian.org> 2004-2012, and Boyuan
+Yang <by...@debian.org> 2024
 
 The upstream source code was downloaded from:
 
-    http://www.twobarleycorns.net/tkcvs.html
+    https://sourceforge.net/projects/tkcvs/
 
-Distributed under GPL version 2.  See /usr/share/common-licenses/GPL-2.
+TkCVS was originally written by Del <d...@babel.com.au> and released as
+public domain.
 
-Portions of the code are:
-Copyright (C) 1999-2002 Paul Mackerras.  All rights reserved
-Copyright (C) 1993,1994 by John Heidemann <jo...@ficus.cs.ucla.edu>
-Copyright (C) 1997,1998 D. Richard Hipp
-Copyright (C) 1994-2005 by John M. Klassa.
+In 1998 Dorothy Robinson took over maintainership.
+TKCVS was re-licensed und the GPL v2 (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.
+
+    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 along
+    with this program; if not, see <https://www.gnu.org/licenses/>.
+
+See /usr/share/common-licenses/GPL-2.
+
+List of copyright holders for tkrev (excluding contrib and tkdiff
+subdirectories)
+Copyright (C) 1992-1998 Del d...@babel.com.au
+Copyright (C) 1998-2011 Dorothy Robinson
+Copyright (C) 1999 Christoph Jaeschke
+Copyright (C) 1999 Jo Wahle
+Copyright (C) 1999-2000 Marcel Koelewijn
+Copyright (C) 2002 Mike Jagdis
+
+Other contributors:
+
+Release 4
+  Carl Staelin stae...@info.hpl.hp.com
+  Uwe Graichen graic...@bln.sel.alcatel.de
+  Matthias Schade mas...@mt.e-technik.uni-kassel.de
+  Steven Jowers jow...@pat.mdc.com
+Release 5
+  Jeremy Harker hark...@ttc.com
+  Eugene Lee, Aerospace Corporation. g...@mars.aero.org
+Release 6.1
+  M.E. Smith
+  Christoph Jaeschke
+  Jo Wahle
+  Stephen Kick
+Release 6.3 (2000)
+  Andrew Johnson
+  Marcel Koelewijn
+Release 7.1
+  2002 Mike Jagdis
+  2002 Laurent Duperval
+  2002 John Lash
+  2002 John Cerney
+Release 8.2 (2011)
+  2010 Steve Schwarm
+
+
+The tkdiff subdirectory contains a copy of tkdiff
+https://sourceforge.net/p/tkdiff - See its README.txt:
+------------------------------------
+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.
+
+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 along with
+this program; if not, write to the Free Software Foundation, Inc., 59  Temple
+Place, Suite 330, Boston, MA 02111-1307 USA
+
+Credits:
+
+TkDiff is Copyright (C) 1994-2006 by John M. Klassa, among others:
+Copyright (C) 1998      by Bryan Oakley
 Copyright (C) 1999-2001 by AccuRev Inc.
+Copyright (C) 2004      by Tom Dunne
+Copyright (C) 2004-2011 by Dorothy Robinson ("dorothyr")
+
+Many of the toolbar icons were created by Dean S. Jones and used with his
+permission. These icons have the following Copyright:
+
 Copyright(C) 1998 by Dean S. Jones
-Copyright (C) 1993,1994 by John Heidemann <jo...@ficus.cs.ucla.edu>
-Copyright (C) 1998-2005 Bryan Oakley
+d...@gallant.com
+http://www.gallant.com/icons.htm
+http://www.javalobby.org/jfa/projects/icons/
+
+Others not coverred by the above are the work of Michael-M
+--------------------------------------
+
+contrib/tkdirdiff is
+Copyright (C) 1999-2002 Paul Mackerras.  All rights reserved
+This program is free software; it may be used, copied, modified
+and distributed under the terms of the GNU General Public Licence,
+either version 2, or (at your option) any later version.
+

Attachment: signature.asc
Description: PGP signature

Reply via email to