Refresh d/copyright; Declare compliance with Debian Policy 4.0.0

3 files changed, 32 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index e4c8e89..4cbbb78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,12 @@ xtrkcad (1:4.3.0-1) UNRELEASED; urgency=medium
       + debian/patches/0705-help_path.patch
     - Refresh patches
       + debian/patches/0100-gtk.patch
+    - Refresh debian/copyright.
   * debian/control:
     - Add Daniel E. Markle as maintainer again.
     - Add myself as uploader.
     - Use http for the homepage because https isn't available.
+  * Declare compliance with Debian Policy 4.0.0. (No changes needed).
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Thu, 26 Jan 2017 21:28:03 +0100
 
diff --git a/debian/control b/debian/control
index 47756fa..f800b3f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: editors
 Priority: optional
 Maintainer: Daniel E. Markle <dmarkle@ashtech.net>
 Uploaders: 
- Mike Gabriel <sunweaver@debian.org>
+ Mike Gabriel <sunweaver@debian.org>,
  Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends:
  cmake,
  debhelper (>= 10),
  libgtk2.0-dev,
  libwebkitgtk-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Homepage: http://xtrkcad.org/
 Vcs-Git: git://anonscm.debian.org/collab-maint/xtrkcad.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xtrkcad.git
diff --git a/debian/copyright b/debian/copyright
index 431edee..0f1f494 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,8 @@ Files-Excluded: .hgtags .hgignore
 
 Files: *
 Copyright: 2003      Sillub Technology
-           2005      Dave Bullis
+           2005-2015 Troy D. Hanson
+           2005-2007 Dave Bullis
            2007      Martin Fischer
            2007      Bob Blackwell
 License: GPL-2+
@@ -22,12 +23,24 @@ Files: app/bin/cblock.c
 Copyright: 2002-2009 Robert Heller D/B/A Deepwoods Software
 License: GPL-2+
 
+Files: app/bin/ccontrol.c
+       app/bin/csensor.c
+       app/bin/csignal.c
+       app/bin/dcontmgm.c
+       app/bin/dxfformat.c
+Copyright: 2017      Robert Heller D/B/A Deepwoods Software
+License: GPL-2+
+
 Files: app/bin/i18n.*
        app/i18n/stripmsg.c
        app/i18n/fi.po
 Copyright: 2007-2008 Mikko Nissinen
 License: GPL-2+
 
+Files: app/bin/helphelper.c
+Copyright: 2015      Martin Fischer
+License: GPL-2+
+
 Files: app/help/readpng.*
 Copyright: 1998-1999 Greg Roelofs
 License: BSD-like-with-advertising-clause
@@ -57,13 +70,22 @@ Files: app/tools/dirent.*
 Copyright: 1997-2003 Kevlin Henney
 License: permissive
 
-Files: app/wlib/gtklib/gtkhelp.c
-Copyright: 2005      Dave Bullis
-           2007      Martin Fischer
+Files: app/wlib/gtklib/control.c
+       app/wlib/gtklib/ixhelp.c
+       app/wlib/gtklib/liststore.c      
+       app/wlib/gtklib/notice.c
+       app/wlib/gtklib/osxhelp.c
+       app/wlib/gtklib/pixbuf.c
+       app/wlib/gtklib/print.c
+       app/wlib/gtklib/png.c
+       app/wlib/gtklib/timer.c
+       app/wlib/gtklib/treeview.c
+Copyright: 2007-2016 Martin Fischer <m_fischer@sf.net>
 License: GPL-2+
 
-Files: app/wlib/gtklib/gtkbitmap.c
-Copyright: 2009      Daniel Spagnol
+Files: app/wlib/gtklib/droplist.c
+Copyright: 2005      Dave Bullis
+           2016      Martin Fischer
 License: GPL-2+
 
 Files: app/wlib/gtklib/FindGTKUnixPrint.cmake
@@ -71,12 +93,6 @@ 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-2015 Martin Fischer
-License: GPL-2+
-
 Files: app/wlib/gtklib/uthash.h
 Copyright: 2005-2014 Troy D. Hanson
 License: BSD-1-Clause