[pkg-java] r2662 - in branches/commons-pool/feature/debian: . debian

Marcus Better marcusb-guest at costa.debian.org
Thu Oct 26 20:20:04 UTC 2006


Author: marcusb-guest
Date: 2006-10-26 20:20:03 +0000 (Thu, 26 Oct 2006)
New Revision: 2662

Added:
   branches/commons-pool/feature/debian/build.properties
   branches/commons-pool/feature/debian/debian/dirs
   branches/commons-pool/feature/debian/debian/doc-base
   branches/commons-pool/feature/debian/debian/docs
   branches/commons-pool/feature/debian/debian/svn-deblayout
Removed:
   branches/commons-pool/feature/debian/debian/libcommons-pool-java.dirs
   branches/commons-pool/feature/debian/debian/libcommons-pool-java.docs
Modified:
   branches/commons-pool/feature/debian/build.xml
   branches/commons-pool/feature/debian/debian/
   branches/commons-pool/feature/debian/debian/changelog
   branches/commons-pool/feature/debian/debian/compat
   branches/commons-pool/feature/debian/debian/control
   branches/commons-pool/feature/debian/debian/copyright
   branches/commons-pool/feature/debian/debian/rules
   branches/commons-pool/feature/debian/debian/watch
Log:
New upstream version.

Added: branches/commons-pool/feature/debian/build.properties
===================================================================
--- branches/commons-pool/feature/debian/build.properties	                        (rev 0)
+++ branches/commons-pool/feature/debian/build.properties	2006-10-26 20:20:03 UTC (rev 2662)
@@ -0,0 +1 @@
+junit.jar=/usr/share/java/junit.jar

Modified: branches/commons-pool/feature/debian/build.xml
===================================================================
--- branches/commons-pool/feature/debian/build.xml	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/build.xml	2006-10-26 20:20:03 UTC (rev 2662)
@@ -93,7 +93,7 @@
                nonavbar="false"
                serialwarn="false"
                source="1.3">
-          <link href="http://java.sun.com/j2se/1.3/docs/api"/>
+          <link href="/usr/share/doc/classpath-doc/api"/>
       </javadoc>
    </target>
 
@@ -130,14 +130,16 @@
 
    <target name="test" depends="compile-test" description="runs (junit) unit tests">
       <echo message="Because we need to sleep to test the eviction threads, this takes a little while (around 35 seconds)..."/>
-      <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
-        <arg value="${test.entry}"/> 
+      <junit haltonerror="${test.failonerror}"
+             haltonfailure="${test.failonerror}"
+             printsummary="on">
+        <test name="${test.entry}"/> 
         <classpath>
           <pathelement location="${build.classes.dir}" /> 
           <pathelement location="${build.test-classes.dir}" /> 
           <pathelement path="${classpath}" /> 
         </classpath>
-      </java>
+      </junit>
    </target>
 
    <target name="build-jar" depends="compile">


Property changes on: branches/commons-pool/feature/debian/debian
___________________________________________________________________
Name: mergeWithUpstream
   - 1

Modified: branches/commons-pool/feature/debian/debian/changelog
===================================================================
--- branches/commons-pool/feature/debian/debian/changelog	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/changelog	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1,3 +1,14 @@
+commons-pool (1.3-1) unstable; urgency=low
+
+  * New upstream release.
+    - Build process doesn't use network anymore. (Closes: #395264)
+    - No dependency on commons-collections.
+  * debian/rules: Get rid of cdbs.
+  * debian/rules: Build with GCJ instead of Kaffe.
+  * Updated copyright information.
+
+ -- Marcus Better <marcus at better.se>  Thu, 26 Oct 2006 11:07:53 +0200
+
 commons-pool (1.2-4) unstable; urgency=low
 
   * debian/control, debian/rules: ant transition (changed deps:

Modified: branches/commons-pool/feature/debian/debian/compat
===================================================================
--- branches/commons-pool/feature/debian/debian/compat	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/compat	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1 +1 @@
-4
+5

Modified: branches/commons-pool/feature/debian/debian/control
===================================================================
--- branches/commons-pool/feature/debian/debian/control	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/control	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1,18 +1,21 @@
 Source: commons-pool
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Adam Heath <doogie at brainfood.com>, Marcus Better <marcus at better.se>
 Section: libs
 Priority: optional
-Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 1.1.3), ant, libcommons-collections-java, junit, dpatch, jikes
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
+Build-Depends-Indep: java-gcj-compat-dev, junit, classpath-doc
 
 Package: libcommons-pool-java
 Architecture: all
-Depends: java-common, libcommons-collections-java
-Description: A set of objects that implement the pooling pattern for java objects
+Suggests: java-virtual-machine, classpath-doc
+Depends: kaffe | java1-runtime | java2-runtime
+Description: pooling implementation for Java objects
  Pool provides an Object-pooling API, with three major aspects:
   1. A generic object pool interface that clients and implementors can use to
      provide easily interchangeable pooling implementations.
   2. A toolkit for creating modular object pools.
   3. Several general purpose pool implementations.
-
+ .
+  Homepage: http://jakarta.apache.org/commons/pool/

Modified: branches/commons-pool/feature/debian/debian/copyright
===================================================================
--- branches/commons-pool/feature/debian/debian/copyright	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/copyright	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1,67 +1,219 @@
-This is commons-pool, who's homepage is
-http://jakarta.apache.org/commons/pool/
+This package was debianized by Adam Heath <doogie at brainfood.com> on
+Sunday, July 21, 2002.
 
-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.
+It is currently maintained by the Debian Java Maintainers
+<pkg-java-maintainers at lists.alioth.debian.org>.
 
-The license of this package is the Apache Software License, version 1.1,
-which is included below verbatim.
+The source was downloaded from <http://jakarta.apache.org/commons/pool/>.
 
-The Apache Software License, Version 1.1
+Upstream authors: Craig McClanahan, David Weinrich, Dirk Verbeeck,
+Geir Magnusson, Morgan Delagrange, Robert Burrell Donkin, Rodney
+Waldhoff, Sandy McArthur, Todd Carmichael.
 
-Copyright (c) 1999-2001 The Apache Software Foundation.  All rights 
-reserved.
+Copyright (C) 1999-2006 The Apache Software Foundation.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+				  Apache License
+			    Version 2.0, January 2004
+			 http://www.apache.org/licenses/
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer. 
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-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.
+    1. Definitions.
 
-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.
+       "License" shall mean the terms and conditions for use, reproduction,
+       and distribution as defined by Sections 1 through 9 of this document.
 
-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.
+       "Licensor" shall mean the copyright owner or entity authorized by
+       the copyright owner that is granting the License.
 
-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.
+       "Legal Entity" shall mean the union of the acting entity and all
+       other entities that control, are controlled by, or are under common
+       control with that entity. For the purposes of this definition,
+       "control" means (i) the power, direct or indirect, to cause the
+       direction or management of such entity, whether by contract or
+       otherwise, or (ii) ownership of fifty percent (50%) or more of the
+       outstanding shares, or (iii) beneficial ownership of such entity.
 
-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.
-====================================================================
+       "You" (or "Your") shall mean an individual or Legal Entity
+       exercising permissions granted by this License.
 
-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/>.
+       "Source" form shall mean the preferred form for making modifications,
+       including but not limited to software source code, documentation
+       source, and configuration files.
 
+       "Object" form shall mean any form resulting from mechanical
+       transformation or translation of a Source form, including but
+       not limited to compiled object code, generated documentation,
+       and conversions to other media types.
 
+       "Work" shall mean the work of authorship, whether in Source or
+       Object form, made available under the License, as indicated by a
+       copyright notice that is included in or attached to the work
+       (an example is provided in the Appendix below).
 
+       "Derivative Works" shall mean any work, whether in Source or Object
+       form, that is based on (or derived from) the Work and for which the
+       editorial revisions, annotations, elaborations, or other modifications
+       represent, as a whole, an original work of authorship. For the purposes
+       of this License, Derivative Works shall not include works that remain
+       separable from, or merely link (or bind by name) to the interfaces of,
+       the Work and Derivative Works thereof.
 
+       "Contribution" shall mean any work of authorship, including
+       the original version of the Work and any modifications or additions
+       to that Work or Derivative Works thereof, that is intentionally
+       submitted to Licensor for inclusion in the Work by the copyright owner
+       or by an individual or Legal Entity authorized to submit on behalf of
+       the copyright owner. For the purposes of this definition, "submitted"
+       means any form of electronic, verbal, or written communication sent
+       to the Licensor or its representatives, including but not limited to
+       communication on electronic mailing lists, source code control systems,
+       and issue tracking systems that are managed by, or on behalf of, the
+       Licensor for the purpose of discussing and improving the Work, but
+       excluding communication that is conspicuously marked or otherwise
+       designated in writing by the copyright owner as "Not a Contribution."
 
+       "Contributor" shall mean Licensor and any individual or Legal Entity
+       on behalf of whom a Contribution has been received by Licensor and
+       subsequently incorporated within the Work.
+
+    2. Grant of Copyright License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       copyright license to reproduce, prepare Derivative Works of,
+       publicly display, publicly perform, sublicense, and distribute the
+       Work and such Derivative Works in Source or Object form.
+
+    3. Grant of Patent License. Subject to the terms and conditions of
+       this License, each Contributor hereby grants to You a perpetual,
+       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+       (except as stated in this section) patent license to make, have made,
+       use, offer to sell, sell, import, and otherwise transfer the Work,
+       where such license applies only to those patent claims licensable
+       by such Contributor that are necessarily infringed by their
+       Contribution(s) alone or by combination of their Contribution(s)
+       with the Work to which such Contribution(s) was submitted. If You
+       institute patent litigation against any entity (including a
+       cross-claim or counterclaim in a lawsuit) alleging that the Work
+       or a Contribution incorporated within the Work constitutes direct
+       or contributory patent infringement, then any patent licenses
+       granted to You under this License for that Work shall terminate
+       as of the date such litigation is filed.
+
+    4. Redistribution. You may reproduce and distribute copies of the
+       Work or Derivative Works thereof in any medium, with or without
+       modifications, and in Source or Object form, provided that You
+       meet the following conditions:
+
+       (a) You must give any other recipients of the Work or
+	   Derivative Works a copy of this License; and
+
+       (b) You must cause any modified files to carry prominent notices
+	   stating that You changed the files; and
+
+       (c) You must retain, in the Source form of any Derivative Works
+	   that You distribute, all copyright, patent, trademark, and
+	   attribution notices from the Source form of the Work,
+	   excluding those notices that do not pertain to any part of
+	   the Derivative Works; and
+
+       (d) If the Work includes a "NOTICE" text file as part of its
+	   distribution, then any Derivative Works that You distribute must
+	   include a readable copy of the attribution notices contained
+	   within such NOTICE file, excluding those notices that do not
+	   pertain to any part of the Derivative Works, in at least one
+	   of the following places: within a NOTICE text file distributed
+	   as part of the Derivative Works; within the Source form or
+	   documentation, if provided along with the Derivative Works; or,
+	   within a display generated by the Derivative Works, if and
+	   wherever such third-party notices normally appear. The contents
+	   of the NOTICE file are for informational purposes only and
+	   do not modify the License. You may add Your own attribution
+	   notices within Derivative Works that You distribute, alongside
+	   or as an addendum to the NOTICE text from the Work, provided
+	   that such additional attribution notices cannot be construed
+	   as modifying the License.
+
+       You may add Your own copyright statement to Your modifications and
+       may provide additional or different license terms and conditions
+       for use, reproduction, or distribution of Your modifications, or
+       for any such Derivative Works as a whole, provided Your use,
+       reproduction, and distribution of the Work otherwise complies with
+       the conditions stated in this License.
+
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+       any Contribution intentionally submitted for inclusion in the Work
+       by You to the Licensor shall be under the terms and conditions of
+       this License, without any additional terms or conditions.
+       Notwithstanding the above, nothing herein shall supersede or modify
+       the terms of any separate license agreement you may have executed
+       with Licensor regarding such Contributions.
+
+    6. Trademarks. This License does not grant permission to use the trade
+       names, trademarks, service marks, or product names of the Licensor,
+       except as required for reasonable and customary use in describing the
+       origin of the Work and reproducing the content of the NOTICE file.
+
+    7. Disclaimer of Warranty. Unless required by applicable law or
+       agreed to in writing, Licensor provides the Work (and each
+       Contributor provides its Contributions) on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+       implied, including, without limitation, any warranties or conditions
+       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+       PARTICULAR PURPOSE. You are solely responsible for determining the
+       appropriateness of using or redistributing the Work and assume any
+       risks associated with Your exercise of permissions under this License.
+
+    8. Limitation of Liability. In no event and under no legal theory,
+       whether in tort (including negligence), contract, or otherwise,
+       unless required by applicable law (such as deliberate and grossly
+       negligent acts) or agreed to in writing, shall any Contributor be
+       liable to You for damages, including any direct, indirect, special,
+       incidental, or consequential damages of any character arising as a
+       result of this License or out of the use or inability to use the
+       Work (including but not limited to damages for loss of goodwill,
+       work stoppage, computer failure or malfunction, or any and all
+       other commercial damages or losses), even if such Contributor
+       has been advised of the possibility of such damages.
+
+    9. Accepting Warranty or Additional Liability. While redistributing
+       the Work or Derivative Works thereof, You may choose to offer,
+       and charge a fee for, acceptance of support, warranty, indemnity,
+       or other liability obligations and/or rights consistent with this
+       License. However, in accepting such obligations, You may act only
+       on Your own behalf and on Your sole responsibility, not on behalf
+       of any other Contributor, and only if You agree to indemnify,
+       defend, and hold each Contributor harmless for any liability
+       incurred by, or claims asserted against, such Contributor by reason
+       of your accepting any such warranty or additional liability.
+
+    END OF TERMS AND CONDITIONS
+
+    APPENDIX: How to apply the Apache License to your work.
+
+       To apply the Apache License to your work, attach the following
+       boilerplate notice, with the fields enclosed by brackets "[]"
+       replaced with your own identifying information. (Don't include
+       the brackets!)  The text should be enclosed in the appropriate
+       comment syntax for the file format. We also recommend that a
+       file or class name and description of purpose be included on the
+       same "printed page" as the copyright notice for easier
+       identification within third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    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.
+
+The contributions to the Debian packaging by Marcus Better are
+Copyright (C) 2006 Marcus Better <marcus at better.se> and are licensed
+under the Apache License, Version 2.0.

Copied: branches/commons-pool/feature/debian/debian/dirs (from rev 2661, branches/commons-pool/feature/debian/debian/libcommons-pool-java.dirs)
===================================================================
--- branches/commons-pool/feature/debian/debian/dirs	                        (rev 0)
+++ branches/commons-pool/feature/debian/debian/dirs	2006-10-26 20:20:03 UTC (rev 2662)
@@ -0,0 +1,2 @@
+usr/share/java
+usr/share/doc

Added: branches/commons-pool/feature/debian/debian/doc-base
===================================================================
--- branches/commons-pool/feature/debian/debian/doc-base	                        (rev 0)
+++ branches/commons-pool/feature/debian/debian/doc-base	2006-10-26 20:20:03 UTC (rev 2662)
@@ -0,0 +1,9 @@
+Document: libcommons-pool-java
+Title: API Javadoc for libcommons-pool-java
+Author: libcommons-pool-java developers
+Abstract: This is the API Javadoc provided by the libcommons-pool-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-pool-java/api/index.html
+Files: /usr/share/doc/libcommons-pool-java/api/*

Copied: branches/commons-pool/feature/debian/debian/docs (from rev 2661, branches/commons-pool/feature/debian/debian/libcommons-pool-java.docs)
===================================================================
--- branches/commons-pool/feature/debian/debian/docs	                        (rev 0)
+++ branches/commons-pool/feature/debian/debian/docs	2006-10-26 20:20:03 UTC (rev 2662)
@@ -0,0 +1,3 @@
+README.txt
+RELEASE-NOTES.txt
+dist/docs/api

Deleted: branches/commons-pool/feature/debian/debian/libcommons-pool-java.dirs
===================================================================
--- branches/commons-pool/feature/debian/debian/libcommons-pool-java.dirs	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/libcommons-pool-java.dirs	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1,2 +0,0 @@
-usr/share/java
-usr/share/doc

Deleted: branches/commons-pool/feature/debian/debian/libcommons-pool-java.docs
===================================================================
--- branches/commons-pool/feature/debian/debian/libcommons-pool-java.docs	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/libcommons-pool-java.docs	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1 +0,0 @@
-README.txt

Modified: branches/commons-pool/feature/debian/debian/rules
===================================================================
--- branches/commons-pool/feature/debian/debian/rules	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/rules	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1,31 +1,64 @@
 #!/usr/bin/make -f
-# debian/rules for libcommons-pool-java
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+JAVA_HOME	:= /usr/lib/jvm/java-gcj
+DEB_JARS_BASE	:= /usr/share/java
+JAVACMD  	:= $(JAVA_HOME)/bin/java
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
+DEB_JARS  	:= ant ant-launcher ant-junit junit
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
+		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+		if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+		if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+		if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+		done; \
+		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
 
-#added for dpatch
-include /usr/share/dpatch/dpatch.make
+ANT_INVOKE	:= $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+		org.apache.tools.ant.Main $(DEB_ANT_ARGS)
 
-JAVA_HOME_DIRS       := /usr/lib/kaffe
-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
 
-LIBRARY=commons-pool
-VERSION=1.2
+BASENAME	:= commons-pool
+PKGNAME		:= lib$(BASENAME)-java
+INSTALLDIR	:= $(CURDIR)/debian/$(PKGNAME)
+JAVALIBDIR	:= $(INSTALLDIR)/usr/share/java
 
-install/lib${LIBRARY}-java::
-	install -m 644 dist/${LIBRARY}.jar debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
-	echo "usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar" > debian/lib${LIBRARY}-java.links
-	cp -a dist/docs/ debian/lib${LIBRARY}-java/usr/share/doc/lib${LIBRARY}-java/
+VERSION		:= $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
-clean::
-	-rm debian/lib${LIBRARY}-java.links
+build: build-stamp
+build-stamp:
+	dh_testdir
+	$(ANT_INVOKE) dist test
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	$(ANT_INVOKE) clean
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	install -m 644 dist/$(BASENAME)-$(VERSION).jar $(JAVALIBDIR)
+	ln -s $(BASENAME)-$(VERSION).jar $(JAVALIBDIR)/$(BASENAME).jar
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

Added: branches/commons-pool/feature/debian/debian/svn-deblayout
===================================================================
--- branches/commons-pool/feature/debian/debian/svn-deblayout	                        (rev 0)
+++ branches/commons-pool/feature/debian/debian/svn-deblayout	2006-10-26 20:20:03 UTC (rev 2662)
@@ -0,0 +1,2 @@
+buildArea=../../build-area
+origDir=..

Modified: branches/commons-pool/feature/debian/debian/watch
===================================================================
--- branches/commons-pool/feature/debian/debian/watch	2006-10-26 09:31:28 UTC (rev 2661)
+++ branches/commons-pool/feature/debian/debian/watch	2006-10-26 20:20:03 UTC (rev 2662)
@@ -1,2 +1,2 @@
-version=2
-http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-(.*)-src\.tar\.gz debian uupdate
+version=3
+http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-(.*)-src.tar.gz




More information about the pkg-java-commits mailing list