[tomcat8] 03/04: Updated debian/copyright for the new release

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit d38c686bc6bf82382271526eddf99c13d84fc2f5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 12 17:23:32 2013 +0200

    Updated debian/copyright for the new release
---
 debian/changelog |    1 +
 debian/copyright |   24 +++++-------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8539a98..fbe3981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
     - Switch to Java 7
     - Updated the watch file to match the Tomcat 8 releases
     - Refreshed the patches
+    - Updated debian/copyright
   * Use XZ compression for the upstream tarball
   * Replaced Sun Microsystems with Oracle
 
diff --git a/debian/copyright b/debian/copyright
index eddeb29..96d9816 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
-Upstream-Name: Tomcat7
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Tomcat 8
 Upstream-Contact: Merten Falk <nevesenin at cpan.org>
-Source: http://tomcat.apache.org/download-70.cgi
+Source: http://tomcat.apache.org/download-80.cgi
 Upstream-Authors:
     Alex Chaffee
     Alex Cruikshank [alex at epitonic.com]
@@ -85,14 +85,12 @@ Upstream-Authors:
     Rainer Jung
     Rajiv Mordani
     Remy Maucharat
-    Remy Maucherat
     Richard A. Sitze
     Robert Field (inner SDEInstaller class)
     Rod Waldhoff
     Scott Sanders
     Sean C. Sullivan
     Sean Legassick
-    Sean Legassick
     Shawn Bayern
     Stan Bailes
     Stefan Freyr Stefansson
@@ -106,7 +104,7 @@ Upstream-Authors:
     Yoav Shapira <yoavs at apache.org>
 
 Files: *
-Copyright: 2000-2011 Apache Software Foundation.
+Copyright: 2000-2013 Apache Software Foundation.
   2002, International Business Machines Corporation.
 License: Apache-2.0
 
@@ -119,17 +117,5 @@ Copyright:
 License: Apache-2.0
 
 License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian GNU/Linux and Ubuntu systems, the complete text of the Apache 2.0 
+ On Debian and Ubuntu systems, the complete text of the Apache 2.0 
  License can be found in the `/usr/share/common-licenses/Apache-2.0' file.

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