CVS libjakarta-poi-java/debian

Wolfgang B??r wbaer-guest at haydn.debian.org
Tue Nov 15 10:42:44 UTC 2005


Update of /cvsroot/pkg-java/libjakarta-poi-java/debian
In directory haydn:/tmp/cvs-serv30435/debian

Modified Files:
	README.Debian changelog control copyright 
	libjakarta-poi-java-doc.docs libjakarta-poi-java.dirs rules 
Added Files:
	README.Debian-source ant.properties compat 
	libjakarta-poi-java-doc.doc-base.1 
	libjakarta-poi-java-doc.doc-base.2 
	libjakarta-poi-java-doc.lintian 
Log Message:
libjakarta-poi-java (2.5.1-1) experimental; urgency=low

  * New upstream release
  * Move to main - build with kaffe
  * Apache 2.0 License, adjusted debian/copyright
  * Move package to pkg-java-maintainers for comaintenance, 
    added Christian Bayle and myself as uploaders
  * New build dependencies (some are also dependencies) 
    libcommons-logging-java, liblog4j1.2-java, ant-optional, junit, cdbs,
    libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
  * Added compat file for debhelper 4 compatibility
  * Updated README.Debian with information about different classpaths 
    dependend on used jakarta-poi jar files (main, scratchpad, contrib)
  * Enabled and run unit tests
  * Register manual and api with doc-base
  * Standards-Version 3.6.2 (no changes)


--- /cvsroot/pkg-java/libjakarta-poi-java/debian/README.Debian	2003/07/15 21:09:40	1.1
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/README.Debian	2005/11/15 10:42:44	1.2
@@ -1,4 +1,18 @@
 libjakarta-poi-java for Debian
 ------------------------------
 
- -- Christian Bayle <bayle at debian.org>, Sat,  5 Jul 2003 15:42:08 +0200
+Jakarta POI consists of three jars in /usr/share/java:
+
+jakarta-poi.jar
+jakarta-poi-scratchpad.jar
+jakarta-poi-contrib.jar
+
+For jakarta-poi.jar and jakarta-poi-scratchpad.jar a CLASSPATH 
+with the jar files of libcommons-logging-java, liblog4j1.2-java
+and libxalan2-java is enough.
+
+If you want to use the jakarta-poi-contrib.jar you need to 
+additionally include the jar files of libcommons-beanutils-java 
+and libcommons-lang-java into your CLASSPATH.
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 25 Oct 2005 21:12:16 +0200
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/changelog	2005/04/28 20:59:42	1.4
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/changelog	2005/11/15 10:42:44	1.5
@@ -1,3 +1,22 @@
+libjakarta-poi-java (2.5.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Move to main - build with kaffe
+  * Apache 2.0 License, adjusted debian/copyright
+  * Move package to pkg-java-maintainers for comaintenance, 
+    added Christian Bayle and myself as uploaders
+  * New build dependencies (some are also dependencies) 
+    libcommons-logging-java, liblog4j1.2-java, ant-optional, junit, cdbs,
+    libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
+  * Added compat file for debhelper 4 compatibility
+  * Updated README.Debian with information about different classpaths 
+    dependend on used jakarta-poi jar files (main, scratchpad, contrib)
+  * Enabled and run unit tests
+  * Register manual and api with doc-base
+  * Standards-Version 3.6.2 (no changes)
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Tue, 25 Oct 2005 21:12:16 +0200
+
 libjakarta-poi-java (1.10.0-4) unstable; urgency=high
 
   * Fixed FTBFS: Missing Build-Depends on 'ant' (Closes: #306750)
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/control	2005/04/28 20:59:42	1.4
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/control	2005/11/15 10:42:44	1.5
@@ -1,28 +1,29 @@
 Source: libjakarta-poi-java
-Section: contrib/libs
+Section: libs
 Priority: optional
-Maintainer: Christian Bayle <bayle at debian.org>
-Build-Depends-Indep: debhelper, ant, jikes-sablevm , sablevm, fastjar, j2sdk1.4, gjdoc
-Standards-Version: 3.5.8
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Christian Bayle <bayle at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, ant-optional, junit, kaffe, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
+Standards-Version: 3.6.2
 
 Package: libjakarta-poi-java
-Section: contrib/libs
+Section: libs
 Architecture: all
-Depends: gij-3.2 | j2re1.4 | java1-runtime | java2-runtime
+Depends: kaffe | java1-runtime | java2-runtime, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
+Suggests: java-virtual-machine, libjakarta-poi-java-doc
 Description: Poor Obfuscation Implementation
- The POI project consists of APIs for manipulating various
- file formats based upon Microsoft's OLE 2
- Compound Document format using pure Java.
+ The POI project consists of APIs for manipulating various file formats 
+ based upon Microsoft's OLE 2 Compound Document format using pure Java.
+ .
  OLE 2 Compound Document Format based files include
  most Microsoft Office files such as XLS and DOC. 
 
 Package: libjakarta-poi-java-doc
-Section: contrib/doc
+Section: doc
 Architecture: all
+Suggests: libjakarta-poi-java
 Description: Poor Obfuscation Implementation Documentation
- The POI project consists of APIs for manipulating various
- file formats based upon Microsoft's OLE 2
- Compound Document format using pure Java.
- OLE 2 Compound Document Format based files include
- most Microsoft Office files such as XLS and DOC. 
-
+ The POI project consists of APIs for manipulating various file formats 
+ based upon Microsoft's OLE 2 Compound Document format using pure Java.
+ .
+ This package includes the documentation.
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/copyright	2003/07/15 21:09:40	1.1
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/copyright	2005/11/15 10:42:44	1.2
@@ -1,61 +1,182 @@
 This package was debianized by Christian Bayle <bayle at debian.org>, Sat,  5 Jul 2003 15:42:08 +0200
 
-It was downloaded from http://jakarta.apache.org/poi/
+It was downloaded from <http://jakarta.apache.org/poi/>
 
 Upstream Authors: The Apache Software Foundation
 
 Copyright:
 
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 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 acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache POI" 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",
- *    "Apache POI", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * 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/>.
- */
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "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.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "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.
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs	2003/07/15 21:09:40	1.1
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs	2005/11/15 10:42:44	1.2
@@ -1 +1 @@
-jakarta-poi-1.10.0/build/docs
+docs/*
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/libjakarta-poi-java.dirs	2003/07/15 21:09:40	1.1
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/libjakarta-poi-java.dirs	2005/11/15 10:42:44	1.2
@@ -1 +1 @@
-/usr/share/java
+usr/share/java
--- /cvsroot/pkg-java/libjakarta-poi-java/debian/rules	2005/04/28 20:59:42	1.3
+++ /cvsroot/pkg-java/libjakarta-poi-java/debian/rules	2005/11/15 10:42:44	1.4
@@ -1,88 +1,30 @@
 #!/usr/bin/make -f
+# debian/rules file for jakarta-poi (uses cdbs)
+
+export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Build 
-# Choose the VM
-JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
-export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
-export JAVADOC=javadoc
-export LIBRARY = $(shell head -1 debian/control | sed 's/Source. lib\(.*\)-java/\1/')
-export VERSION = $(shell head -1 debian/changelog | sed 's/.*(\(.*\)-.*).*/\1/' )
-export SRCDIR=$(LIBRARY)-$(VERSION)
-export DATE=$(shell date +%Y%m%d)
-
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	mkdir $(SRCDIR)
-	(cd $(SRCDIR); tar xvzf ../jakarta-poi*dev-src.tar.gz)
-	tar xvzf jakarta-poi-cents.tar.gz
-	#find $(SRCDIR) -name "*.jar" -exec rm -f {} \;
-	touch configure-stamp
-
-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-	(cd $(SRCDIR) && ant compile jar)
-	touch build-stamp
-
-javadoc: 
-	-rm debian/libjakarta-poi*docs
-	echo $(SRCDIR)/build/docs > debian/libjakarta-poi-java-doc.docs
-	# This fails to create doc
-	(cd $(SRCDIR) && ant docs javadocs)
-
-clean:
-	dh_testdir
-	dh_testroot
-	-rm -f build-stamp
-	-rm -f configure-stamp
-	-rm -rf $(SRCDIR)
-	dh_clean
-
-install: build javadoc
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	#
-	# Package 
-	#
-	install -m 644 $(SRCDIR)/build/*.jar \
-	debian/tmp/usr/share/java/
-	ln -s $(LIBRARY)-$(VERSION)-dev-$(DATE).jar debian/tmp/usr/share/java/$(LIBRARY).jar
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-#	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
+JAVA_HOME := /usr/lib/kaffe
+ANT_HOME := /usr/share/ant
 
-binary: binary-indep 
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-junit.jar junit xalan2
+DEB_ANT_BUILD_TARGET := compile jar test
 
-.PHONY: binary binary-indep clean
+install/libjakarta-poi-java::
+	install -m 644 build/dist/poi-$(VERSION)*.jar debian/libjakarta-poi-java/usr/share/java/jakarta-poi-$(VERSION).jar
+	ln -s jakarta-poi-$(VERSION).jar debian/libjakarta-poi-java/usr/share/java/jakarta-poi.jar
+	install -m 644 build/dist/poi-contrib*.jar debian/libjakarta-poi-java/usr/share/java/jakarta-poi-contrib-$(VERSION).jar
+	ln -s jakarta-poi-contrib-$(VERSION).jar debian/libjakarta-poi-java/usr/share/java/jakarta-poi-contrib.jar
+	install -m 644 build/dist/poi-scrat*.jar debian/libjakarta-poi-java/usr/share/java/jakarta-poi-scratchpad-$(VERSION).jar
+	ln -s jakarta-poi-scratchpad-$(VERSION).jar debian/libjakarta-poi-java/usr/share/java/jakarta-poi-scratchpad.jar
+
+install/libjakarta-poi-java-doc::
+	# install lintian overrides
+	install -d $(CURDIR)/debian/libjakarta-poi-java-doc/usr/share/lintian/overrides/
+	install -m 644 $(CURDIR)/debian/libjakarta-poi-java-doc.lintian $(CURDIR)/debian/libjakarta-poi-java-doc/usr/share/lintian/overrides/libjakarta-poi-java-doc



More information about the pkg-java-commits mailing list