[med-svn] [populations] 04/07: cme fix dpkg-copyright

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository populations.

commit b7ffd9e5583de28b8afd6b4ecaf862af5dcb6b91
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 17 22:33:29 2017 +0100

    cme fix dpkg-copyright
---
 debian/changelog |  1 +
 debian/copyright | 53 +++++++++++++++++++++++++++--------------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6c12c82..cfba61f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ populations (1.2.33+svn0120106+dfsg-1) UNRELEASED; urgency=medium
   * Priority: optional
   * cme fix dpkg-control
   * debhelper 10
+  * cme fix dpkg-copyright
 
  -- Andreas Tille <tille at debian.org>  Fri, 17 Nov 2017 21:49:33 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 28488ce..2c7407f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: populations
 Source: http://ppa.launchpad.net/olivier-langella/ppa/ubuntu/pool/main/p/populations/populations_1.2.32-2~maverick1.tar.gz
 Files-Excluded: *.o
@@ -22,22 +22,43 @@ License: GPL-2
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Files: html/libcss/mathematica.css 
+Files: html/libcss/mathematica.css
 Copyright: 1999 The University Of Queensland
-Contributor: Roger B. Sidje <rbs at maths.uq.edu.au>License: MPL1.1
 License: MPL-1.1
- see the complete text of the license below.
+Contributor: Roger B. Sidje <rbs at maths.uq.edu.au>License: MPL1.1
 
 Files: html/libjs/entity.js
 Copyright: 2002 The University of Queensland
-Contributor: Roger B. Sidje <rbs at maths.uq.edu.au>License: MPL1.1
 License: MPL-1.1
- see the complete text of the license below.
+Contributor: Roger B. Sidje <rbs at maths.uq.edu.au>License: MPL1.1
 
 Files: html/libjs/viewmath.js
 Copyright: 2002 The University of Queensland
+License: MPL-1.1
 Contributors: Roger B. Sidje <rbs at maths.uq.edu.au>
               Steve Swanson <steve.swanson at mackichan.com>
+
+Files: debian/*
+Copyright: 2011 Georges Khaznadar <georgesk at ofset.org>
+License: GPL-2+
+
+License: GPL-2+
+ This package 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 package 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 complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
 License: MPL-1.1
  1. Definitions.
  .
@@ -503,23 +524,3 @@ License: MPL-1.1
  the notices in the Source Code files of the Original Code. You should
  use the text of this Exhibit A rather than the text found in the
  Original Code Source Code for Your Modifications.]
-
-Files: debian/*
-Copyright: 2011 Georges Khaznadar <georgesk at ofset.org>
-License: GPL-2+
- This package 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 package 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 complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/populations.git