Rewrite debian/copyright; add DEP-3 header

4 files changed, 192 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index cd723d7..5e3f47b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,10 @@ xtrkcad (1:4.2.4a-1) UNRELEASED; urgency=medium
   * debian/rules:
    - Enable hardening.
   * New debian/patches/0700-info_file.patch to add requested directory entry
-    and INFO-DIR-SECTION line.
+    and INFO-DIR-SECTION.
   * Rewrite debian/watch to use the sf redirector.
     - Add files to exclude in debian/copyright.
+  * Rewrite debian/copyright.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 28 Dec 2016 17:27:47 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f178739..4f04da1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,6 +8,113 @@ Files: *
 Copyright: 2003 by Sillub Technology and 2007 by Martin Fischer and Bob Blackwell.
 License: GPL-2+
 
+Files: app/bin/dlayer.c
+       app/bin/smalldlg.*
+Copyright: 2005-2016 Dave Bullis
+           2007-2016 Martin Fischer
+License: GPL-2+
+
+Files: app/bin/cblock.c
+       app/bin/cswitchmotor.c
+Copyright: 2005-2016 Robert Heller D/B/A Deepwoods Software
+License: GPL-2+
+
+Files: app/bin/i18n.*
+Copyright: 2007-2016 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+
+
+Files: app/i18n/pt_BR.po
+Copyright: 2009-2015 Daniel Spagnol
+License: GPL-2+
+
+Files: app/lib/params/protosteam.xtp
+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/*
+Copyright: 1999-2007 Simon Tatham
+License: Expat
+
+Files: app/tools/addcrlf.c
+       app/tools/listxtp.c
+Copyright: 2006-2015 Marin Fischer
+License: GPL-2+
+
+Files: app/tools/dirent.*
+Copyright: 1997-2015 Kevlin Henney
+License: permissive
+
+Files: app/wlib/gtklib/*
+Copyright: 2005-2016 Dave Bullis
+License: GPL-2+
+
+Files: app/wlib/gtklib/uthash.h
+Copyright: 2003-2014 Troy D. Hanson
+License: FreeBSD
+
+Files: app/wlib/gtklib/gtkhelp.c
+Copyright: 2005-2016 Dave Bullis
+           2007-2016 Martin Fischer
+License: GPL-2+
+
+Files: app/wlib/gtklib/gtkbitmap.c
+Copyright: 2005-2016 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
+
+Files: app/wlib/gtklib/gtksplash.c
+       app/wlib/gtklib/gtkxpm.c
+       app/wlib/gtklib/print.c
+Copyright: 2007-2016 Martin Fischer
+License: GPL-2+
+
+Files: app/wlib/include/getopt.h
+Copyright: 1998-2015 David A. Hinds
+License: GPL-2+
+
+Files: app/wlib/mswlib/getopt.c
+Copyright: 1998-2015 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
+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
+License: GPL-2+
+
+Files: app/wlib/mswlib/mswmisc.c
+Copyright: 2005-2015 Dave Bullis
+           2009-2015 Martin Fischer
+License: GPL-2+
+
+Files: app/wlib/mswlib/simple-gettext.c
+Copyright: 1995-2015 Free Software Foundation, Inc.
+License: GPL-2+
+
 Files: app/lib/icon.svg
        app/bin/bitmaps/SVG/tipofday.svg
 Copyright: Jakub Steiner
@@ -22,6 +129,28 @@ Files: app/wlib/gtklib/uthash.h
 Copyright: 2005-2015, Troy D. Hanson  http://troydhanson.github.com/uthash/
 License: BSD-Revised
 
+License: FreeBSD
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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
+
 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
@@ -65,6 +194,55 @@ License: BSD-Revised
   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: mixed
+ 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
+ this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, disclaimer, and this list of conditions.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, disclaimer, and this list of conditions in the documenta-
+    tion and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this
+    software must display the following acknowledgment:
+ .
+ This product includes software developed by Greg Roelofs
+ and contributors for the book, "PNG: The Definitive Guide,"
+ published by O'Reilly and Associates.
+
+License: permissive
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose is hereby granted without fee, provided
+ that this copyright and permissions notice appear in all copies and
+ derivatives.
+ .
+ This software is supplied "as is" without express or implied warranty.
+
 License: public-domain
  THIS WORK IS IN PUBLIC DOMAIN:
  The person or persons who have associated work with this document
diff --git a/debian/patches/0100-gtk.patch b/debian/patches/0100-gtk.patch
index 798eed1..d2e990f 100644
--- a/debian/patches/0100-gtk.patch
+++ b/debian/patches/0100-gtk.patch
@@ -1,3 +1,9 @@
+Description: prevend gcc format-security errors
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/163/
+Last-Update: 2016-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/app/wlib/gtklib/gtktext.c
 ===================================================================
 --- trunk.orig/app/wlib/gtklib/gtktext.c
diff --git a/debian/patches/0700-info_file.patch b/debian/patches/0700-info_file.patch
index 01bfee2..4ccff25 100644
--- a/debian/patches/0700-info_file.patch
+++ b/debian/patches/0700-info_file.patch
@@ -1,3 +1,9 @@
+Description: add requested directory entry and INFO-DIR-SECTION
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/164/
+Last-Update: 2016-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/app/help/xtrkcad.info
 ===================================================================
 --- trunk.orig/app/help/xtrkcad.info