[davmail] 12/20: debian/copyright: make "cme check dpkg-copyright" pass

[Alexandre Rossi]

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

niol-guest pushed a commit to branch master
in repository davmail.

commit c3de115a718f82ff1a64093d0cd5240b5dfcad05
Author: Antonio Ospite <ao2 at ao2.it>
Date:   Fri Oct 28 14:09:15 2016 +0200

    debian/copyright: make "cme check dpkg-copyright" pass
    
    Update the debian/copyright file to use a shared License block.
    
    This also fixes a lintian warning:
    
      W: davmail source: dep5-copyright-license-name-not-unique (paragraph at line 54)
    
    While at it also run "cme fix dpkg-copyright":
    
      cme: using Dpkg::Copyright model
      cme: running fix on dpkg-copyright configuration...
      Warning in 'Format' value 'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/': Format uses insecure http protocol instead of https
    
      Changes applied to dpkg-copyright configuration:
      - Format: 'http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/' -> 'https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/' # applied fix
---
 debian/copyright | 47 ++++++++++++++++-------------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a280a7b..276af12 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Davmail
 Upstream-Contact: Mickaël Guessant <mguessan at free.fr>
 Source: http://davmail.sourceforge.net/download.html
@@ -6,6 +6,20 @@ Source: http://davmail.sourceforge.net/download.html
 Files: *
 Copyright: 2009-2012, Mickael Guessant
 License: GPL-2+
+
+Files: src/java/com/ctc/wstx/sr/StreamScanner.java
+Copyright: 2004 Tatu Saloranta <tatu.saloranta at iki.fi>
+License: LGPL-2.1+ or Apache-2.0
+
+Files: debian/*
+Copyright: 2012 Alexandre Rossi <alexandre.rossi at gmail.com>
+License: GPL-2+
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache License version 2 can be
+ found in the file `/usr/share/common-licenses/Apache-2.0'.
+
+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
@@ -27,9 +41,7 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-Files: src/java/com/ctc/wstx/sr/StreamScanner.java
-Copyright: 2004 Tatu Saloranta <tatu.saloranta at iki.fi>
-License: LGPL-2.1+ or Apache-2.0
+License: LGPL-2.1+
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as published by
  the Free Software Foundation; either version 2.1 of the License, or (at
@@ -47,30 +59,3 @@ License: LGPL-2.1+ or Apache-2.0
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2.1'.
- .
- On Debian systems, the full text of the Apache License version 2 can be
- found in the file `/usr/share/common-licenses/Apache-2.0'.
-
-Files: debian/*
-Copyright: 2012 Alexandre Rossi <alexandre.rossi at gmail.com>
-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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/davmail.git