CVS commons-pool/debian

Thu Sep 22 21:39:31 UTC 2005

Update of /cvsroot/pkg-java/commons-pool/debian
In directory haydn:/tmp/cvs-serv26555/debian

Modified Files:
	changelog control copyright rules 
Log Message:
commons-pool (1.2-4) unstable; urgency=low

  * debian/control, debian/rules: ant transition (changed deps:
    libant1.6-java to ant)
  * debian/copyright: removed the CVS tags

 -- Arnaud Vandyck <avdyk at debian.org>  Thu, 22 Sep 2005 23:35:42 +0200

--- /cvsroot/pkg-java/commons-pool/debian/changelog	2005/02/07 11:32:55	1.3
+++ /cvsroot/pkg-java/commons-pool/debian/changelog	2005/09/22 21:39:31	1.4
@@ -1,3 +1,11 @@
+commons-pool (1.2-4) unstable; urgency=low
+
+  * debian/control, debian/rules: ant transition (changed deps:
+    libant1.6-java to ant)
+  * debian/copyright: removed the CVS tags
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Thu, 22 Sep 2005 23:35:42 +0200
+
 commons-pool (1.2-3) unstable; urgency=low
 
   * changed build-dep from libant1.5-java to libant1.6-java
--- /cvsroot/pkg-java/commons-pool/debian/control	2005/02/07 11:32:56	1.3
+++ /cvsroot/pkg-java/commons-pool/debian/control	2005/09/22 21:39:31	1.4
@@ -4,7 +4,7 @@
 Section: libs
 Priority: optional
 Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 1.1.3), libant1.6-java, libcommons-collections-java, junit, dpatch, jikes
+Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 1.1.3), ant, libcommons-collections-java, junit, dpatch, jikes
 
 Package: libcommons-pool-java
 Architecture: all
--- /cvsroot/pkg-java/commons-pool/debian/copyright	2005/02/07 11:32:56	1.3
+++ /cvsroot/pkg-java/commons-pool/debian/copyright	2005/09/22 21:39:31	1.4
@@ -1,74 +1,65 @@
 This is commons-pool, who's homepage is
-http://jakarta.apache.org/commons/pool/.  It was made into a debian package
-by Adam Heath <doogie at brainfood.com> on Sunday, July 21, 2002.  No upstream
-changes were done to the package.  The only things done were the addition
-of the debian directory, and a build.properties, to set the location of the
-files the source needs.
+http://jakarta.apache.org/commons/pool/
+
+It was made into a debian package by Adam Heath <doogie at brainfood.com>
+on Sunday, July 21, 2002.  No upstream changes were done to the package.
+The only things done were the addition of the debian directory, and a
+build.properties, to set the location of the files the source needs.
 
 The license of this package is the Apache Software License, version 1.1,
 which is included below verbatim.
 
----------------------------------------------------------------------------
-/*
- * $Header: /cvsroot/pkg-java/commons-pool/debian/copyright,v 1.3 2005/02/07 11:32:56 avdyk Exp $
- * $Revision: 1.3 $
- * $Date: 2005/02/07 11:32:56 $
- *
- * ====================================================================
- * 
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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:
- *
- * 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.
- *
- * 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
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */ 
+The Apache Software License, Version 1.1
+
+Copyright (c) 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:
+
+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.
+
+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
+individuals on behalf of the Apache Software Foundation.  For more
+information on the Apache Software Foundation, please see
+<http://www.apache.org/>.
 
 
 
--- /cvsroot/pkg-java/commons-pool/debian/rules	2005/02/07 11:32:56	1.3
+++ /cvsroot/pkg-java/commons-pool/debian/rules	2005/09/22 21:39:31	1.4
@@ -14,9 +14,8 @@
 include /usr/share/dpatch/dpatch.make
 
 JAVA_HOME_DIRS       := /usr/lib/kaffe
-#JAVACMD							 := /usr/bin/java-sablevm
-ANT_HOME             := /usr/share/ant1.6
-DEB_JARS             := commons-collections junit /usr/share/ant1.6/lib/ant-launcher.jar
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := commons-collections junit $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_COMPILER     := jikes
 DEB_ANT_BUILD_TARGET := dist
 

