[commons-email] 01/03: Fill in debian/copyright

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository commons-email.

commit 43359e7f18d81620b575f7830fcc96c1e86549cb
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Fri Dec 22 20:55:56 2017 +0000

    Fill in debian/copyright
---
 debian/changelog |  1 +
 debian/copyright | 40 ++++++++++------------------------------
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5772b01..2fe573b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,6 @@ commons-email (1.5-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #884968)
   * Add debian/watch
+  * Fill in debian/copyright
 
  -- Christopher Hoskin <mans0954 at debian.org>  Wed, 20 Dec 2017 22:47:20 +0000
diff --git a/debian/copyright b/debian/copyright
index 65462f1..0fc9bc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,18 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: commons-email
-Source: <url://example.com>
+Source: https://commons.apache.org/proper/commons-email/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+Copyright: 2001-2017 The Apache Software Foundation
+License: Apache-2.0
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
 Files: debian/*
 Copyright: 2017 Christopher Hoskin <mans0954 at debian.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 <https://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: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
+
+
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid picking licenses with terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.

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