Adjust `debian/copyright' to latest (1.0) revision of dep-5 format

2 files changed, 56 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index f0c83c4..6dd0410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ cflow (1:1.5-1) UNRELEASED; urgency=medium
   * Update debhelper compat to 11
   * Build-depend on `debhelper-compat' (obsoletes `debian/compat')
   * Update Vcs-* fields in `debian/control'
+  * Adjust `debian/copyright' to latest (1.0) revision of dep-5 format
 
  -- Dmitry Bogatov <KAction@debian.org>  Mon, 10 Dec 2018 02:34:22 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 277c5b6..0ccc56c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,23 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: cflow
-Maintainer: Sergey Poznyakoff <gray@mirddin.farlep.net>
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cflow
+Upstream-Contact: Sergey Poznyakoff <gray@mirddin.farlep.net>
 Source: http://www.gnu.org/software/cflow/
 
-Files: src/*
-Copyright: 1997, 2005-2007, 2009, Sergey Poznyakoff <gray@mirddin.farlep.net>
+Files: *
+Copyright: 1997-2016 Sergey Poznyakoff <gray@mirddin.farlep.net>
 License: GPL-3+
- On Debian systems the full text of the GNU General Public License
- Version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
 
-Files: lib/*
+Files: doc/cflow.texi doc/cflow.info
+Copyright: 2005, 2010, 2014-2016 Sergey Poznyakoff
+License: GFDL-1.2+
+
+Files: gnu/*
 Copyright: 1987-2009, Free Software Foundation, Inc.
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License
- Version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
+
+Files: po/*
+Copyright: 2008-2015, Free Software Foundation, Inc.
+License: GPL-3+
 
 Files: debian/*
 Copyright: 1996-1997, Dominik Kubla <dominik@debian.org>
@@ -22,13 +26,51 @@ Copyright: 1996-1997, Dominik Kubla <dominik@debian.org>
            2001-2003, Richard Braakman <dark@xs4all.nl>
            2004, Sebastian Muszynski <do2ksm@linkt.de>
            2006-2007, Bart Martens <bartm@knars.be>
+           2018, Dmitry Bogatov <KAction@debian.org>
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License
- Version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
 
 Files: debian/manpage.xml
 Copyright: 1997, 2005, 2007, Sergey Poznyakoff <gray@mirddin.farlep.net>
            2009, Jakub Wilk <jwilk@debian.org>
-License: GPL-3
+License: GPL-3+
+
+License: GPL-3+
+ 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 3 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 <http://www.gnu.org/licenses/>.
+ .
  On Debian systems the full text of the GNU General Public License
  Version 3 can be found in the /usr/share/common-licenses/GPL-3 file.
+
+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
+ 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 <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems the full text of the GNU General Public License
+ Version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
+
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2 or
+ any later version published by the Free Software Foundation; with no
+ Invariant Sections, no Front-Cover and Back-Cover texts.  A copy of
+ the license is included in the section entitled ``GNU Free Documentation