[pkg-java] r16849 - trunk/derby/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-06-07 10:39:27 +0000 (Fri, 07 Jun 2013)
New Revision: 16849

Modified:
   trunk/derby/debian/copyright
Log:
Fixed lintian warnings on debian/copyright



Modified: trunk/derby/debian/copyright
===================================================================
--- trunk/derby/debian/copyright	2013-06-07 08:46:38 UTC (rev 16848)
+++ trunk/derby/debian/copyright	2013-06-07 10:39:27 UTC (rev 16849)
@@ -1,11 +1,34 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Derby
-Source: http://db.apache.org/derby/derby_downloads.html
+Source: http://db.apache.org/derby/
 
 Files: *
-Copyright: © The Derby Developers
-License: Apache License
+Copyright: 2004-2012, The Apache Software Foundation
+           1997-2004, International Business Machines Corporation
+License: Apache-2.0
+ On Debian systems you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
 
 Files: debian/*
-Copyright: © 2012 Tim Booth
-License: Simplified BSD
+Copyright: 2013, Emmanuel Bourg
+           2012-2013, Tim Booth
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met: 
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer. 
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution. 
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.