[pkg-java] r8505 - trunk/libcommons-discovery-java/debian

Tue Jun 16 21:43:43 UTC 2009

Author: varun
Date: 2009-06-16 21:43:43 +0000 (Tue, 16 Jun 2009)
New Revision: 8505

Modified:
   trunk/libcommons-discovery-java/debian/changelog
   trunk/libcommons-discovery-java/debian/compat
   trunk/libcommons-discovery-java/debian/control
   trunk/libcommons-discovery-java/debian/copyright
   trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base
Log:
Update the license to Apache License 2.0 (Closes: #532890)

Modified: trunk/libcommons-discovery-java/debian/changelog
===================================================================

--- trunk/libcommons-discovery-java/debian/changelog	2009-06-16 21:34:03 UTC (rev 8504)
+++ trunk/libcommons-discovery-java/debian/changelog	2009-06-16 21:43:43 UTC (rev 8505)
@@ -1,3 +1,9 @@
+libcommons-discovery-java (0.4-3) unstable; urgency=low
+
+  * Update the license to Apache License 2.0 (Closes: #532890)
+
+ -- Varun Hiremath <varun at debian.org>  Tue, 16 Jun 2009 17:38:09 -0400
+
 libcommons-discovery-java (0.4-2) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: trunk/libcommons-discovery-java/debian/compat
===================================================================
--- trunk/libcommons-discovery-java/debian/compat	2009-06-16 21:34:03 UTC (rev 8504)
+++ trunk/libcommons-discovery-java/debian/compat	2009-06-16 21:43:43 UTC (rev 8505)
@@ -1,2 +1,2 @@
-5
+7
 

Modified: trunk/libcommons-discovery-java/debian/control
===================================================================
--- trunk/libcommons-discovery-java/debian/control	2009-06-16 21:34:03 UTC (rev 8504)
+++ trunk/libcommons-discovery-java/debian/control	2009-06-16 21:43:43 UTC (rev 8505)
@@ -1,18 +1,18 @@
 Source: libcommons-discovery-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
+Build-Depends: debhelper (>= 7), cdbs
 Build-Depends-Indep: libcommons-logging-java, junit,  ant, ant-optional, default-jdk
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java
 Homepage: http://commons.apache.org/discovery/
 
 Package: libcommons-discovery-java
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless, libcommons-logging-java
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless, libcommons-logging-java
 Suggests: libcommons-discovery-java-doc
 Description: locates classes that implement a given Java interface
  The Discovery Component is about discovering, or finding,
@@ -35,7 +35,7 @@
 Package: libcommons-discovery-java-doc
 Section: doc
 Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Description: locates classes that implement a given Java interface (documentation)
  The Discovery Component is about discovering, or finding,
  implementations for pluggable interfaces. It provides facilities

Modified: trunk/libcommons-discovery-java/debian/copyright
===================================================================
--- trunk/libcommons-discovery-java/debian/copyright	2009-06-16 21:34:03 UTC (rev 8504)
+++ trunk/libcommons-discovery-java/debian/copyright	2009-06-16 21:43:43 UTC (rev 8505)
@@ -7,60 +7,14 @@
                   Manolache,  James Strachan <jstrachan at apache.org>,
                   Matthew Hawthorne <matth at apache.org>
 
-Copyright:
-
-$Header: /home/cvs/jakarta-commons/discovery/LICENSE.txt,v
-1.1 2002/07/25 02:36:45 jvanzyl Exp $
-$Revision$
-$Date$
-
-====================================================================
-
-The Apache Software License, Version 1.1
-
-Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
+Copyright: © 1999-2001 The Apache Software Foundation.  All rights
 reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+License: Apache-2.0
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
+  On Debian GNU/Linux system you can find the complete text of the
+  Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
 
-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.
-
-3. The end-user documentation included with the redistribution, if
-   any, must include the following acknowlegement:
-      "This product includes software developed by the
-       Apache Software Foundation (http://www.apache.org/)."
-   Alternately, this acknowlegement may appear in the software itself,
-   if and wherever such third-party acknowlegements normally appear.
-
-4. The names "The Jakarta Project", "Commons", and "Apache Software
-   Foundation" must not be used to endorse or promote products derived
-   from this software without prior written permission. For written
-   permission, please contact apache at apache.org.
-
-5. Products derived from this software may not be called "Apache"
-   nor may "Apache" appear in their names without prior written
-   permission of the Apache Group.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
-ITS 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.
 ====================================================================
 
 This software consists of voluntary contributions made by many

Modified: trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base
===================================================================
--- trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base	2009-06-16 21:34:03 UTC (rev 8504)
+++ trunk/libcommons-discovery-java/debian/libcommons-discovery-java-doc.doc-base	2009-06-16 21:43:43 UTC (rev 8505)
@@ -1,7 +1,7 @@
 Document: libcommons-discovery-java
 Title: Programmer API for Commons Discovery
 Author: The Apache Commons Discovery Team
-Abstract: This is the javadoc api of libcommons-discovery-java, a java library
+Abstract: This is the javadoc API of libcommons-discovery-java, a java library
  for discovering, or finding implementations for pluggable interfaces. It 
  provides facilities instantiating classes in general, and for lifecycle 
  management of singleton (factory) classes.


