some work on debian/copyright

1 files changed, 40 insertions, 47 deletions

diff --git a/debian/copyright b/debian/copyright
index 802c493..02d7593 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,43 +5,44 @@ Source: http://sourceforge.net/projects/xtrkcad-fork/
 Files-Excluded: .hgtags .hgignore
 
 Files: *
-Copyright: 2003 by Sillub Technology and 2007 by Martin Fischer and Bob Blackwell.
+Copyright: 2003      Sillub Technology
+           2005      Dave Bullis
+           2007      Martin Fischer
+           2007      Bob Blackwell
 License: GPL-2+
 
 Files: app/bin/dlayer.c
        app/bin/smalldlg.*
-Copyright: 2005-2016 Dave Bullis
-           2007-2016 Martin Fischer
+Copyright: 2005      Dave Bullis
+           2007      Martin Fischer
 License: GPL-2+
 
 Files: app/bin/cblock.c
        app/bin/cswitchmotor.c
-Copyright: 2005-2016 Robert Heller D/B/A Deepwoods Software
+Copyright: 2002-2009 Robert Heller D/B/A Deepwoods Software
 License: GPL-2+
 
 Files: app/bin/i18n.*
-Copyright: 2007-2016 Mikko Nissinen
+       app/i18n/stripmsg.c
+       app/i18n/fi.po
+Copyright: 2007-2008 Mikko Nissinen
 License: GPL-2+
 
 Files: app/help/readpng.*
-Copyright: 1998-2015 Greg Roelofs
-License: mixed
-
-Files: app/i18n/fi.po
-Copyright: 2007-2015 Mikko Nissinen
-License: GPL-2+
+Copyright: 1998-1999 Greg Roelofs
+License: BSD-like with advertising clause
 
 Files: app/i18n/pt_BR.po
-Copyright: 2009-2015 Daniel Spagnol
+Copyright: 2009      Daniel Spagnol
 License: GPL-2+
 
 Files: app/lib/params/protosteam.xtp
-Copyright: 2012 Serdar Soysal <online@soysals.com>
+Copyright: 2012      Serdar Soysal <online@soysals.com>
 License: GPL-2+
 
-Files: app/lib/params/mkcarpart.c
-Copyright: 2005 Dave Bullis
-License: GPL-2+
+Files: app/tools/halibut/charset/macenc.c
+Copyright: 2008      Ben Harris
+License: Expat
 
 Files: app/tools/halibut/*
 Copyright: 1999-2007 Simon Tatham
@@ -49,70 +50,62 @@ License: Expat
 
 Files: app/tools/addcrlf.c
        app/tools/listxtp.c
-Copyright: 2006-2015 Marin Fischer
+Copyright: 2006-2009 Marin Fischer
 License: GPL-2+
 
 Files: app/tools/dirent.*
-Copyright: 1997-2015 Kevlin Henney
+Copyright: 1997-2003 Kevlin Henney
 License: permissive
 
-Files: app/wlib/gtklib/*
-Copyright: 2005-2016 Dave Bullis
-License: GPL-2+
-
 Files: app/wlib/gtklib/gtkhelp.c
-Copyright: 2005-2016 Dave Bullis
-           2007-2016 Martin Fischer
+Copyright: 2005      Dave Bullis
+           2007      Martin Fischer
 License: GPL-2+
 
 Files: app/wlib/gtklib/gtkbitmap.c
-Copyright: 2005-2016 Daniel Spagnol
+Copyright: 2009      Daniel Spagnol
 License: GPL-2+
 
 Files: app/wlib/gtklib/FindGTKUnixPrint.cmake
-Copyright: 2012-2016 Raphael Kubo da Costa <rakuco@webkit.org>
-           2014-2016 Igalia S.L
-License: FreeBSD
+Copyright: 2012      Raphael Kubo da Costa <rakuco@webkit.org>
+           2014      Igalia S.L
+License: BSD-2-clause
 
 Files: app/wlib/gtklib/gtksplash.c
        app/wlib/gtklib/gtkxpm.c
        app/wlib/gtklib/print.c
-Copyright: 2007-2016 Martin Fischer
+Copyright: 2007-2015 Martin Fischer
 License: GPL-2+
 
 Files: app/wlib/gtklib/uthash.h
-Copyright: 2005-2015 Troy D. Hanson
-License: BSD-Revised
+Copyright: 2005-2014 Troy D. Hanson
+License: BSD-1-Clause
 
 Files: app/wlib/include/getopt.h
-Copyright: 1998-2015 David A. Hinds
+Copyright: 1998-2003 David A. Hinds
 License: GPL-2+
 
 Files: app/wlib/mswlib/getopt.c
-Copyright: 1998-2015 David A. Hinds
+Copyright: 1998-2003 David A. Hinds
 License: GPL-2+
 
 Files: app/wlib/mswlib/gwin32.c
-Copyright: 1995-2015 Peter Mattis, Spencer Kimball and Josh MacDonald
-           1998-2015 Tor Lillqvist
+Copyright: 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald
+           1998-1999 Tor Lillqvist
 License: GPL-2+
 
 Files: app/wlib/mswlib/mswbitmap.c
        app/wlib/mswlib/mswsplash.c
-Copyright: 2007-2015 Martin Fischer
-License: GPL-2+
-
-Files: app/wlib/mswlib/mswmenu.c
-Copyright: 2005-2015 Dave Bullis
+Copyright: 2007-2009 Martin Fischer
 License: GPL-2+
 
 Files: app/wlib/mswlib/mswmisc.c
-Copyright: 2005-2015 Dave Bullis
-           2009-2015 Martin Fischer
+Copyright: 2005      Dave Bullis
+           2009      Martin Fischer
 License: GPL-2+
 
 Files: app/wlib/mswlib/simple-gettext.c
-Copyright: 1995-2015 Free Software Foundation, Inc.
+Copyright: 1995-2005 Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: app/lib/icon.svg
@@ -122,10 +115,10 @@ License: public-domain
 
 Files: debian/*
 Copyright: 2015      Daniel E. Markle <dmarkle@ashtech.net>
-           2016-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2016      Jörg Frings-Fürst <debian@jff-webhosting.net>
 License: GPL-2+
 
-License: FreeBSD
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -168,7 +161,7 @@ License: GPL-2+
   License version 2 can be found in the file
   `/usr/share/common-licenses/GPL-2'.
 
-License: BSD-Revised
+License: BSD-1-Clause
   Copyright (c) 2005-2015, Troy D. Hanson  http://troydhanson.github.com/uthash/
   All rights reserved.
   .
@@ -209,7 +202,7 @@ License: Expat
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-License: mixed
+License: BSD-like with advertising clause
  This software is provided "as is," without warranty of any kind,
  express or implied.  In no event shall the author or contributors
  be held liable for any damages arising in any way from the use of