[pkg-java] r13844 - trunk/tomcat-native/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-07-10 21:53:56 +0000 (Sun, 10 Jul 2011)
New Revision: 13844

Modified:
   trunk/tomcat-native/debian/changelog
   trunk/tomcat-native/debian/copyright
Log:
d/copyright: Update to DEP-5 format.

Modified: trunk/tomcat-native/debian/changelog
===================================================================
--- trunk/tomcat-native/debian/changelog	2011-07-10 20:09:38 UTC (rev 13843)
+++ trunk/tomcat-native/debian/changelog	2011-07-10 21:53:56 UTC (rev 13844)
@@ -1,10 +1,11 @@
-tomcat-native (1.1.20-3) UNRELEASED; urgency=low
+tomcat-native (1.1.20-3) unstable; urgency=low
 
   * Switch to 3.0 quilt source format.
   * d/patches/drop_sslv2_support.diff: Drop support for SSLv2
     (Closes: #622141).
+  * d/copyright: Update to DEP-5 format.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 13 Apr 2011 20:19:54 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 10 Jul 2011 23:42:01 +0200
 
 tomcat-native (1.1.20-2) unstable; urgency=low
 

Modified: trunk/tomcat-native/debian/copyright
===================================================================
--- trunk/tomcat-native/debian/copyright	2011-07-10 20:09:38 UTC (rev 13843)
+++ trunk/tomcat-native/debian/copyright	2011-07-10 21:53:56 UTC (rev 13844)
@@ -1,34 +1,18 @@
-This package was debianized by Michael Koch <konqueror at gmx.de> on
-Sat, 07 Jun 2008 15:16:14 +0200.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Apache Tomcat Native Library
+Upstream-Contact: <http://tomcat.apache.org/native-doc/>
+Source: http://www.apache.org/dist/tomcat/tomcat-connectors/native/
 
-It was downloaded from http://tomcat.apache.org/download-native.cgi
+Files: *
+Copyright: Copyright (C) 2004-2011 The Apache Software Foundation.
+License: Apache-2.0
 
-Upstream Author: 
+Files: debian/*
+Copyright: 2008-2009, Michael Koch <konqueror at gmx.de>
+Copyright: 2010-2011, Damien Raude-Morvan
+License: Apache-2.0
 
-    Apache Software Foundation
+License: Apache-2.0
+  A complete copy of the Apache License, Version 2.0, can be found in
+  /usr/share/common-licenses/Apache-2.0 on Debian Systems.
 
-Copyright: 
-
-    Copyright (C) 2004-2009 Apache Software Foundation
-
-License:
-
-   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.
-
-A complete copy of the Apache License, Version 2.0, can be found in
-/usr/share/common-licenses/Apache-2.0 on Debian Systems.
-
-The Debian packaging is
-Copyright (C) 2008, Michael Koch <konqueror at gmx.de>
-Copyright (C) 2009, Damien Raude-Morvan <drazzib at debian.org>
-and is also licensed under the Apache License, Version 2.0.