[pkg-java] r17012 - in tags/libapache-poi-java: . 3.9-1/debian 3.9-1/debian/patches

Emmanuel Bourg ebourg-guest at alioth.debian.org
Thu Jul 11 12:42:09 UTC 2013


Author: ebourg-guest
Date: 2013-07-11 12:42:09 +0000 (Thu, 11 Jul 2013)
New Revision: 17012

Added:
   tags/libapache-poi-java/3.9-1/
   tags/libapache-poi-java/3.9-1/debian/README.Debian
   tags/libapache-poi-java/3.9-1/debian/README.source
   tags/libapache-poi-java/3.9-1/debian/ant.properties
   tags/libapache-poi-java/3.9-1/debian/changelog
   tags/libapache-poi-java/3.9-1/debian/control
   tags/libapache-poi-java/3.9-1/debian/copyright
   tags/libapache-poi-java/3.9-1/debian/libapache-poi-java.classpath
   tags/libapache-poi-java/3.9-1/debian/links
   tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude
   tags/libapache-poi-java/3.9-1/debian/orig-tar.sh
   tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch
   tags/libapache-poi-java/3.9-1/debian/patches/05_use-local-ooxml-xsds.patch
   tags/libapache-poi-java/3.9-1/debian/patches/series
   tags/libapache-poi-java/3.9-1/debian/rules
   tags/libapache-poi-java/3.9-1/debian/watch
Removed:
   tags/libapache-poi-java/3.9-1/debian/README.Debian
   tags/libapache-poi-java/3.9-1/debian/README.source
   tags/libapache-poi-java/3.9-1/debian/ant.properties
   tags/libapache-poi-java/3.9-1/debian/changelog
   tags/libapache-poi-java/3.9-1/debian/control
   tags/libapache-poi-java/3.9-1/debian/copyright
   tags/libapache-poi-java/3.9-1/debian/links
   tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude
   tags/libapache-poi-java/3.9-1/debian/orig-tar.sh
   tags/libapache-poi-java/3.9-1/debian/patches/01_javac_encoding.patch
   tags/libapache-poi-java/3.9-1/debian/patches/02_classpath.patch
   tags/libapache-poi-java/3.9-1/debian/patches/03_no_ooxml.patch
   tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch
   tags/libapache-poi-java/3.9-1/debian/patches/series
   tags/libapache-poi-java/3.9-1/debian/rules
   tags/libapache-poi-java/3.9-1/debian/watch
Log:
[svn-buildpackage] Tagging libapache-poi-java 3.9-1

Deleted: tags/libapache-poi-java/3.9-1/debian/README.Debian
===================================================================
--- trunk/libapache-poi-java/debian/README.Debian	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/README.Debian	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,16 +0,0 @@
-libapache-poi-java for Debian
------------------------------
-
-Apache POI consists of three jars in /usr/share/java:
-
-poi.jar
-poi-scratchpad.jar
-poi-contrib.jar
-
-For poi.jar and 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 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

Copied: tags/libapache-poi-java/3.9-1/debian/README.Debian (from rev 17009, trunk/libapache-poi-java/debian/README.Debian)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/README.Debian	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/README.Debian	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,10 @@
+libapache-poi-java for Debian
+-----------------------------
+
+Apache POI consists of four jars in /usr/share/java. They require additional
+jars on the CLASSPATH to be used:
+
+    poi.jar               (requires commons-codec.jar, commons-logging.jar and log4j-1.2.jar)
+    poi-scratchpad.jar    (requires poi.jar)
+    poi-ooxml-schemas.jar (requires xmlbeans.jar)
+    poi-ooxml.jar         (requires poi.jar, poi-schemas.jar and dom4j.jar)

Deleted: tags/libapache-poi-java/3.9-1/debian/README.source
===================================================================
--- trunk/libapache-poi-java/debian/README.source	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/README.source	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,20 +0,0 @@
-Patch System
-============
-
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
-
-Upstream tarball
-================
-Upstream does not distribute source releases. Therefore
-the upstream tarball was cleaned and repackaged.
-
-Script to clean upstream tarball:
-debian/orig-tar.sh --upstream-version X.Y+dfsg ../poi-X.Y.tar.gz
-
-Detail of elements stripped from upstream tarball are listed in
-debian/orig-tar.exclude

Copied: tags/libapache-poi-java/3.9-1/debian/README.source (from rev 17008, trunk/libapache-poi-java/debian/README.source)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/README.source	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/README.source	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,18 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+
+Upstream tarball
+================
+
+The upstream tarball needs additional elements downloaded from the Internet
+to build the library. The debian/orig-tar.sh downloads and assembles them
+into a single archive. It's invoked with the get-orig-source target of
+debian/rules. Detail of elements stripped from upstream tarball are listed in
+debian/orig-tar.exclude

Deleted: tags/libapache-poi-java/3.9-1/debian/ant.properties
===================================================================
--- trunk/libapache-poi-java/debian/ant.properties	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/ant.properties	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,6 +0,0 @@
-disconnected=true
-jars.present=true
-halt.on.test.failure=false
-main.commons-logging.jar=/usr/share/java/commons-logging.jar
-main.log4j.jar=/usr/share/java/log4j-1.2.jar
-main.junit.jar=/usr/share/java/junit.jar

Copied: tags/libapache-poi-java/3.9-1/debian/ant.properties (from rev 17009, trunk/libapache-poi-java/debian/ant.properties)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/ant.properties	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/ant.properties	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,11 @@
+disconnected=true
+jars.present=true
+halt.on.test.failure=true
+main.ant.jar=/usr/share/java/ant.jar
+main.commons-codec.jar=/usr/share/java/commons-codec.jar
+main.commons-logging.jar=/usr/share/java/commons-logging.jar
+main.log4j.jar=/usr/share/java/log4j-1.2.jar
+main.junit.jar=/usr/share/java/junit.jar
+ooxml.xsds.tmp.dir=ooxml-xsds
+ooxml.dom4j.jar=/usr/share/java/dom4j.jar
+ooxml.xmlbeans.jar=/usr/share/java/xmlbeans.jar

Deleted: tags/libapache-poi-java/3.9-1/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/changelog	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,183 +0,0 @@
-libapache-poi-java (3.6+dfsg-3) UNRELEASED; urgency=low
-
-  * Team upload.
-  * Update debian/copyright to DEP5 format; clarify license of 
-    chunks_parse_cmds.tbl.  (Closes: #659067)
-
- -- tony mancill <tmancill at debian.org>  Sat, 11 Feb 2012 09:25:33 -0800
-
-libapache-poi-java (3.6+dfsg-2) unstable; urgency=low
-
-  * Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
-    Replaces, and Provides.
-  * Keep some compatibility symlinks in /usr/share/java.
-  * Remove Java runtime from Depends.
-  * Switch to source format 3.0.
-  * Remove Christian from Uploaders list.
-  * Switch to debhelper level 7.
-  * Update Standards-Version: 3.9.2.
-
- -- Torsten Werner <twerner at debian.org>  Wed, 07 Sep 2011 22:08:56 +0200
-
-libjakarta-poi-java (3.6+dfsg-1) unstable; urgency=low
-
-  * New upstream release.
-    - refresh all patches
-  * Remove Arnaud Vandyck from Uploaders
-  * Fix debian/watch to track upstream tarballs naming changes
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 Dec 2009 23:18:25 +0100
-
-libjakarta-poi-java (3.5+dfsg-1) unstable; urgency=low
-
-  * New upstream release.
-    - 01_javac_encoding: refreshed
-    - 02_classpath: use Debian JAR for build
-    - 03_no_ooxml: disable ooxml module (use non-free JARs)
-    - 04_jar_names: strip DSTAMP for JARs filenames
-  * Update my email address
-  * debian/orig-tar.exclude: Update exclusion file list
-
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 01 Oct 2009 00:36:43 +0200
-
-libjakarta-poi-java (3.2+dfsg-1) unstable; urgency=low
-
-  * New upstream release (Closes: #499729).
-    - POI documentation manual is not built anymore (depends on Forrest)
-      so remove corresponding doc-base and lintian override.
-    - Strip MS Office files from upstream tarball (.ppt, .vsd & so)
-  * Add myself to Uploaders
-  * Update Standards-Version to 3.8.3:
-    - Rename README.Debian-source to README.source to comply with policy
-    - Add recommended get-orig-source target (with orig-tar.sh script)
-  * Maven POMs:
-    - Add a Build-Depends dependency on maven-repo-helper
-    - Use mh_installpom and mh_installjar to install the POM and the jar to the
-      Maven repository
-    - Use maven-dist Ant target to generate all pom.xml files
-  * Use quilt as patch system:
-    - Add a Build-Depends on quilt
-    - Refresh all patches
-    - Use patchsys-quilt.mk in debian/rules
-    - Describe patch system in debian/README.source
-  * Install API documentation in /usr/share/doc/libjakarta-poi-java/api/
-  * Update debian/copyright:
-    - Update copyright years
-    - Include detailled upstream Authors (from KEYS file)
-    - Include GPLv3 copyright for a resource file of HDGF part of POI
-
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 27 Aug 2009 23:24:48 +0200
-
-libjakarta-poi-java (3.0.2.dfsg-2) unstable; urgency=low
-
-  [ Matthias Klose ]
-  * (Build-)depend on default-jre/-jdk.
-
-  [ Torsten Werner ]
-  * Add myself to Uploaders.
-  * Add missing Depends: ${misc:Depends}.
-  * Change debhelper compat level to 5.
-  * Add Vcs-* and Homepage headers.
-  * Update Standards-Version: 3.8.2.
-  * Do no longer quote the full text of the Apache license.
-  * Change Section: java.
-
- -- Torsten Werner <twerner at debian.org>  Tue, 04 Aug 2009 22:17:13 +0200
-
-libjakarta-poi-java (3.0.2.dfsg-1) unstable; urgency=low
-
-  * New upstream release.
-  * Fixed debian/changelog to have proper copyright.
-  * Delete empty directory from documentation.
-  * Removed old entry from lintian overrides file.
-
- -- Michael Koch <konqueror at gmx.de>  Thu, 14 Feb 2008 15:40:22 +0100
-
-libjakarta-poi-java (3.0.1.dfsg-2) unstable; urgency=low
-
-  * Improved wtch file to remove '.dfsg' in debian version.
-  * Updated Standards-Version to 3.7.3.
-
- -- Michael Koch <konqueror at gmx.de>  Fri, 28 Dec 2007 11:23:11 +0100
-
-libjakarta-poi-java (3.0.1.dfsg-1) unstable; urgency=low
-
-  * oops, of course we need to remove lib/*.jar and src/contrib/lib/* from the orig
-
- -- Rene Engelhard <rene at debian.org>  Mon, 24 Sep 2007 19:24:21 +0200
-
-libjakarta-poi-java (3.0.1-2) unstable; urgency=low
-
-  * Fix build for environments without locale set. Closes: #443034.
-  * Removed Wolfgang from Uploaders and added myself.
-
- -- Michael Koch <konqueror at gmx.de>  Tue, 18 Sep 2007 20:33:07 +0200
-
-libjakarta-poi-java (3.0.1-1) unstable; urgency=low
-
-  * New upstream release (closes: #436974)
-  * add myself to Uploaders
-  * add watch file 
-
- -- Rene Engelhard <rene at debian.org>  Wed, 05 Sep 2007 00:27:43 +0200
-
-libjakarta-poi-java (2.5.1-3) unstable; urgency=low
-
-  * Standards-Version: updated to 3.7.2, no change needed
-  * built with java-gcj-compat-dev
-  * no more run the tests (closes: #393151). I was able to run a lot of
-    tests with java-gcj-compat, but got a problem 'cannot open
-    display'. Maybe it'll be a problem with pbuilders.
-  * removed the patches
-
- -- Arnaud Vandyck <avdyk at debian.org>  Mon, 30 Oct 2006 14:19:36 +0100
-
-libjakarta-poi-java (2.5.1-2) unstable; urgency=low
-
-  * Upload to unstable 
-
- -- Wolfgang Baer <WBaer at gmx.de>  Thu,  2 Feb 2006 15:37:06 +0100
-
-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)
-
- -- Christian Bayle <bayle at debian.org>  Thu, 28 Apr 2005 21:59:48 +0200
-
-libjakarta-poi-java (1.10.0-3) unstable; urgency=low
-
-  * Missing comma in Build-Depends-Indep line of control file
-  (Closes: bug#254881) 
-
- -- Christian Bayle <bayle at debian.org>  Thu, 24 Jun 2004 22:33:36 +0200
-
-libjakarta-poi-java (1.10.0-2) unstable; urgency=low
-
-  * Removed depends on doc package (Closes: #202399) 
-
- -- Christian Bayle <bayle at debian.org>  Tue, 22 Jul 2003 22:03:01 +0200
-
-libjakarta-poi-java (1.10.0-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Christian Bayle <bayle at debian.org>  Sat,  5 Jul 2003 15:42:08 +0200

Copied: tags/libapache-poi-java/3.9-1/debian/changelog (from rev 17011, trunk/libapache-poi-java/debian/changelog)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/changelog	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/changelog	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,207 @@
+libapache-poi-java (3.9-1) unstable; urgency=low
+
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Refreshed the patches
+    - Removed poi-contrib.jar (merged into poi.jar and poi-examples.jar)
+    - Removed the unused dependencies on commons-beanutils, commons-lang
+      and xalan
+    - Added a dependency on libcommons-codec-java
+    - Added the new excelant component (Excel Ant tasks)
+  * Removed the patches 01_javac_encoding.patch and 02_classpath.patch
+  * Enabled the unit tests
+  * Added the classpath attribute in the manifests
+  * Enabled the ooxml modules (Closes: #658288)
+    - Removed the patch 03_no_ooxml.patch
+    - Updated debian/orig-tar.sh to fetch the OOXML schemas from the ECMA site
+    - Added a dependency on libxmlbeans-java
+    - Updated debian/copyright to document the license of the OOXML schemas
+  * debian/control:
+    - Updated Standards-Version to 3.9.4 (no changes)
+    - Use canonical URLs for the Vcs-* fields
+    - Removed Michael Koch from the uploaders (Closes: #654046)
+    - Improved the package description
+  * debian/rules: Improved the clean target
+  * Updated the debian/README.* files
+
+  [ tony mancill ]
+  * Update debian/copyright to DEP5 format; clarify license of 
+    chunks_parse_cmds.tbl.  (Closes: #659067)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 09 Jul 2013 23:10:21 +0200
+
+libapache-poi-java (3.6+dfsg-2) unstable; urgency=low
+
+  * Rename package from jakarta-poi to apache-poi. Add appropriate Conflicts,
+    Replaces, and Provides.
+  * Keep some compatibility symlinks in /usr/share/java.
+  * Remove Java runtime from Depends.
+  * Switch to source format 3.0.
+  * Remove Christian from Uploaders list.
+  * Switch to debhelper level 7.
+  * Update Standards-Version: 3.9.2.
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 07 Sep 2011 22:08:56 +0200
+
+libjakarta-poi-java (3.6+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    - refresh all patches
+  * Remove Arnaud Vandyck from Uploaders
+  * Fix debian/watch to track upstream tarballs naming changes
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 30 Dec 2009 23:18:25 +0100
+
+libjakarta-poi-java (3.5+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+    - 01_javac_encoding: refreshed
+    - 02_classpath: use Debian JAR for build
+    - 03_no_ooxml: disable ooxml module (use non-free JARs)
+    - 04_jar_names: strip DSTAMP for JARs filenames
+  * Update my email address
+  * debian/orig-tar.exclude: Update exclusion file list
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 01 Oct 2009 00:36:43 +0200
+
+libjakarta-poi-java (3.2+dfsg-1) unstable; urgency=low
+
+  * New upstream release (Closes: #499729).
+    - POI documentation manual is not built anymore (depends on Forrest)
+      so remove corresponding doc-base and lintian override.
+    - Strip MS Office files from upstream tarball (.ppt, .vsd & so)
+  * Add myself to Uploaders
+  * Update Standards-Version to 3.8.3:
+    - Rename README.Debian-source to README.source to comply with policy
+    - Add recommended get-orig-source target (with orig-tar.sh script)
+  * Maven POMs:
+    - Add a Build-Depends dependency on maven-repo-helper
+    - Use mh_installpom and mh_installjar to install the POM and the jar to the
+      Maven repository
+    - Use maven-dist Ant target to generate all pom.xml files
+  * Use quilt as patch system:
+    - Add a Build-Depends on quilt
+    - Refresh all patches
+    - Use patchsys-quilt.mk in debian/rules
+    - Describe patch system in debian/README.source
+  * Install API documentation in /usr/share/doc/libjakarta-poi-java/api/
+  * Update debian/copyright:
+    - Update copyright years
+    - Include detailled upstream Authors (from KEYS file)
+    - Include GPLv3 copyright for a resource file of HDGF part of POI
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Thu, 27 Aug 2009 23:24:48 +0200
+
+libjakarta-poi-java (3.0.2.dfsg-2) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * (Build-)depend on default-jre/-jdk.
+
+  [ Torsten Werner ]
+  * Add myself to Uploaders.
+  * Add missing Depends: ${misc:Depends}.
+  * Change debhelper compat level to 5.
+  * Add Vcs-* and Homepage headers.
+  * Update Standards-Version: 3.8.2.
+  * Do no longer quote the full text of the Apache license.
+  * Change Section: java.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 04 Aug 2009 22:17:13 +0200
+
+libjakarta-poi-java (3.0.2.dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed debian/changelog to have proper copyright.
+  * Delete empty directory from documentation.
+  * Removed old entry from lintian overrides file.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 14 Feb 2008 15:40:22 +0100
+
+libjakarta-poi-java (3.0.1.dfsg-2) unstable; urgency=low
+
+  * Improved wtch file to remove '.dfsg' in debian version.
+  * Updated Standards-Version to 3.7.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 28 Dec 2007 11:23:11 +0100
+
+libjakarta-poi-java (3.0.1.dfsg-1) unstable; urgency=low
+
+  * oops, of course we need to remove lib/*.jar and src/contrib/lib/* from the orig
+
+ -- Rene Engelhard <rene at debian.org>  Mon, 24 Sep 2007 19:24:21 +0200
+
+libjakarta-poi-java (3.0.1-2) unstable; urgency=low
+
+  * Fix build for environments without locale set. Closes: #443034.
+  * Removed Wolfgang from Uploaders and added myself.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 18 Sep 2007 20:33:07 +0200
+
+libjakarta-poi-java (3.0.1-1) unstable; urgency=low
+
+  * New upstream release (closes: #436974)
+  * add myself to Uploaders
+  * add watch file 
+
+ -- Rene Engelhard <rene at debian.org>  Wed, 05 Sep 2007 00:27:43 +0200
+
+libjakarta-poi-java (2.5.1-3) unstable; urgency=low
+
+  * Standards-Version: updated to 3.7.2, no change needed
+  * built with java-gcj-compat-dev
+  * no more run the tests (closes: #393151). I was able to run a lot of
+    tests with java-gcj-compat, but got a problem 'cannot open
+    display'. Maybe it'll be a problem with pbuilders.
+  * removed the patches
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Mon, 30 Oct 2006 14:19:36 +0100
+
+libjakarta-poi-java (2.5.1-2) unstable; urgency=low
+
+  * Upload to unstable 
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu,  2 Feb 2006 15:37:06 +0100
+
+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)
+
+ -- Christian Bayle <bayle at debian.org>  Thu, 28 Apr 2005 21:59:48 +0200
+
+libjakarta-poi-java (1.10.0-3) unstable; urgency=low
+
+  * Missing comma in Build-Depends-Indep line of control file
+  (Closes: bug#254881) 
+
+ -- Christian Bayle <bayle at debian.org>  Thu, 24 Jun 2004 22:33:36 +0200
+
+libjakarta-poi-java (1.10.0-2) unstable; urgency=low
+
+  * Removed depends on doc package (Closes: #202399) 
+
+ -- Christian Bayle <bayle at debian.org>  Tue, 22 Jul 2003 22:03:01 +0200
+
+libjakarta-poi-java (1.10.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Christian Bayle <bayle at debian.org>  Sat,  5 Jul 2003 15:42:08 +0200

Deleted: tags/libapache-poi-java/3.9-1/debian/control
===================================================================
--- trunk/libapache-poi-java/debian/control	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/control	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,38 +0,0 @@
-Source: libapache-poi-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, maven-repo-helper
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libapache-poi-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libapache-poi-java/
-Homepage: http://poi.apache.org
-
-Package: libapache-poi-java
-Architecture: all
-Depends: libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, ${misc:Depends}
-Suggests: libapache-poi-java-doc
-Conflicts: libjakarta-poi-java
-Replaces: libjakarta-poi-java
-Provides: libjakarta-poi-java
-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.
- .
- OLE 2 Compound Document Format based files include
- most Microsoft Office files such as XLS and DOC. 
-
-Package: libapache-poi-java-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: libapache-poi-java
-Conflicts: libjakarta-poi-java-doc
-Replaces: libjakarta-poi-java-doc
-Provides: libjakarta-poi-java-doc
-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.
- .
- This package includes the documentation.

Copied: tags/libapache-poi-java/3.9-1/debian/control (from rev 17009, trunk/libapache-poi-java/debian/control)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/control	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/control	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,76 @@
+Source: libapache-poi-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Rene Engelhard <rene at debian.org>,
+           Torsten Werner <twerner at debian.org>,
+           Damien Raude-Morvan <drazzib at debian.org>,
+           Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant,
+               ant-optional,
+               cdbs,
+               debhelper (>= 7),
+               default-jdk,
+               javahelper,
+               junit,
+               libcommons-codec-java,
+               libcommons-logging-java,
+               libdom4j-java,
+               liblog4j1.2-java,
+               libxmlbeans-java,
+               maven-repo-helper
+Standards-Version: 3.9.4
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libapache-poi-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-poi-java/
+Homepage: http://poi.apache.org
+
+Package: libapache-poi-java
+Architecture: all
+Depends: ant,
+         libcommons-codec-java,
+         libcommons-logging-java,
+         libdom4j-java,
+         liblog4j1.2-java,
+         libxmlbeans-java,
+         ${misc:Depends}
+Suggests: libapache-poi-java-doc
+Conflicts: libjakarta-poi-java
+Replaces: libjakarta-poi-java
+Provides: libjakarta-poi-java
+Description: Apache POI - Java API for Microsoft Documents
+ Apache POI provides a Java API for manipulating various file formats based upon
+ the Office Open XML standards (OOXML) and Microsoft's OLE 2 Compound Document
+ format (OLE2).
+ .
+ Apache POI supports the following formats:
+  * Word (DOC, DOCX)
+  * Excel (XLS, XLSX)
+  * PowerPoint (PPT, PPTX)
+  * Visio (VSD)
+  * Publisher (PUB)
+  * Outlook
+  * TNEF (Transport Neutral Encoding Format)
+
+Package: libapache-poi-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libapache-poi-java
+Conflicts: libjakarta-poi-java-doc
+Replaces: libjakarta-poi-java-doc
+Provides: libjakarta-poi-java-doc
+Description: Apache POI - Java API for Microsoft Documents (Documentation)
+ Apache POI provides a Java API for manipulating various file formats based upon
+ the Office Open XML standards (OOXML) and Microsoft's OLE 2 Compound Document
+ format (OLE2).
+ .
+ Apache POI supports the following formats:
+  * Word (DOC, DOCX)
+  * Excel (XLS, XLSX)
+  * PowerPoint (PPT, PPTX)
+  * Visio (VSD)
+  * Publisher (PUB)
+  * Outlook
+  * TNEF (Transport Neutral Encoding Format)
+ .
+ This package contains the documentation for libapache-poi-java.

Deleted: tags/libapache-poi-java/3.9-1/debian/copyright
===================================================================
--- trunk/libapache-poi-java/debian/copyright	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/copyright	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,36 +0,0 @@
-Format: http://dep.debian.net/deps/dep5/
-Upstream-Name: Apache POI - the Java API for Microsoft Documents
-Source: http://poi.apache.org
-
-Files: *
-Copyright: 2003- The Apache Software Foundation
-  2003- Glen Stampoultzis <glens at apache.org>
-  2003- Nick Burch <nick at apache.org>
-  2003- Rainer Klute <klute at apache.org>
-  2003- Yegor Kozlov <yegor at apache.org>
-License: Apache-2.0
-
-Files: src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
-Copyright: 2006-2007 Valek Filippov (frob at df.ru)
-License:  Apache-2.0 or GPL-3
-
-Files: debian/*
-Copyright: 2003- Christian Bayle <bayle at debian.org>
-  2005- Wolfgang Baer <WBaer at gmx.de>
-  2006- Arnaud Vandyck <avdyk at debian.org>
-  2007- Michael Koch <konqueror at gmx.de>
-  2007- Rene Engelhard <rene at debian.org>
-  2009- Damien Raude-Morvan <drazzib at debian.org>
-  2009- Torsten Werner <twerner at debian.org>
-  2012- tony mancill <tmancill at debian.org>
-License: Apache-2.0
-X-Comment: It is assumed that package maintainers have licensed their work
- under terms compatible with upstream licensing terms.
-
-License: Apache-2.0
-  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'
-
-License: GPL-3
-  On Debian GNU/Linux system you can find the complete text of the
-  GPL-3 license in '/usr/share/common-licenses/GPL-3'

Copied: tags/libapache-poi-java/3.9-1/debian/copyright (from rev 17008, trunk/libapache-poi-java/debian/copyright)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/copyright	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/copyright	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,48 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache POI
+Source: http://poi.apache.org
+
+Files: *
+Copyright: 2003-2012, The Apache Software Foundation
+License: Apache-2.0
+
+Files: src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
+Copyright: 2006-2007, Valek Filippov (frob at df.ru)
+License:  Apache-2.0 or GPL-3
+
+Files: ooxml-xsds/*
+Copyright: 2006, Ecma International
+License:
+ The Office Open XML schema definitions used by Apache POI are
+ a part of the Office Open XML ECMA Specification (ECMA-376, [1]).
+ As defined in section 9.4 of the ECMA bylaws [2], this specification
+ is available to all interested parties without restriction:
+ .
+     9.4 All documents when approved shall be made available to
+         all interested parties without restriction.
+ .
+ [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
+ [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
+
+
+Files: debian/*
+Copyright: 2003, Christian Bayle <bayle at debian.org>
+           2005, Wolfgang Baer <WBaer at gmx.de>
+           2006, Arnaud Vandyck <avdyk at debian.org>
+           2007, Michael Koch <konqueror at gmx.de>
+           2007, Rene Engelhard <rene at debian.org>
+           2009, Damien Raude-Morvan <drazzib at debian.org>
+           2009, Torsten Werner <twerner at debian.org>
+           2012, tony mancill <tmancill at debian.org>
+           2013, Emmanuel Bourg <ebourg at apache.org>
+License: Apache-2.0
+X-Comment: It is assumed that package maintainers have licensed their work
+ under terms compatible with upstream licensing terms.
+
+License: Apache-2.0
+  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'
+
+License: GPL-3
+  On Debian GNU/Linux system you can find the complete text of the
+  GPL-3 license in '/usr/share/common-licenses/GPL-3'

Copied: tags/libapache-poi-java/3.9-1/debian/libapache-poi-java.classpath (from rev 17009, trunk/libapache-poi-java/debian/libapache-poi-java.classpath)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/libapache-poi-java.classpath	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/libapache-poi-java.classpath	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,5 @@
+/usr/share/java/poi.jar commons-logging.jar log4-1.2.jar
+/usr/share/java/poi-ooxml.jar poi.jar poi-ooxml-schemas.jar dom4j.jar
+/usr/share/java/poi-ooxml-schemas.jar xmlbeans.jar
+/usr/share/java/poi-scratchpad.jar poi.jar
+/usr/share/java/poi-excelant.jar poi.jar poi-ooxml.jar ant.jar

Deleted: tags/libapache-poi-java/3.9-1/debian/links
===================================================================
--- trunk/libapache-poi-java/debian/links	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/links	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,4 +0,0 @@
-# some compatibility symlinks
-/usr/share/java/poi.jar            /usr/share/java/jakarta-poi.jar
-/usr/share/java/poi-contrib.jar    /usr/share/java/jakarta-contrib-poi.jar
-/usr/share/java/poi-scratchpad.jar /usr/share/java/jakarta-scratchpad-poi.jar

Copied: tags/libapache-poi-java/3.9-1/debian/links (from rev 17008, trunk/libapache-poi-java/debian/links)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/links	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/links	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,3 @@
+# some compatibility symlinks
+/usr/share/java/poi.jar            /usr/share/java/jakarta-poi.jar
+/usr/share/java/poi-scratchpad.jar /usr/share/java/jakarta-scratchpad-poi.jar

Deleted: tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude
===================================================================
--- trunk/libapache-poi-java/debian/orig-tar.exclude	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,13 +0,0 @@
-lib/*
-docs/*
-test-data/*
-*.jar
-*.ppt
-*.pptx
-*.doc
-*.docx
-*.dotx
-*.xls
-*.xlsx
-*.vsd
-*.pub

Copied: tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude (from rev 17008, trunk/libapache-poi-java/debian/orig-tar.exclude)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/orig-tar.exclude	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,2 @@
+lib/*
+*.jar

Deleted: tags/libapache-poi-java/3.9-1/debian/orig-tar.sh
===================================================================
--- trunk/libapache-poi-java/debian/orig-tar.sh	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/orig-tar.sh	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-# $2 = version
-# $3 = file
-DIR=libjakarta-poi-java-$2.orig
-TAR=libjakarta-poi-java_$2+dfsg.orig.tar.gz
-TAG=REL_`echo $2 | sed "s/\./_/"`
-
-svn export http://svn.apache.org/repos/asf/poi/tags/$TAG $DIR
-GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
-fi

Copied: tags/libapache-poi-java/3.9-1/debian/orig-tar.sh (from rev 17010, trunk/libapache-poi-java/debian/orig-tar.sh)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/orig-tar.sh	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/orig-tar.sh	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+VERSION=$2
+
+DIR=apache-poi-$VERSION
+TAR=../libapache-poi-java_$VERSION.orig.tar.gz
+TAG=REL_`echo $VERSION | sed "s/\./_/"`
+
+# Checkout the code from svn
+svn export http://svn.apache.org/repos/asf/poi/tags/$TAG $DIR
+
+# Fetch the OOXML schemas from the ECMA site.
+# These files are available to all interested parties without
+# restriction according to the ECMA bylaws:
+# http://www.ecma-international.org/memento/Ecmabylaws.htm#art9.4
+wget 'http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%204%20(PDF).zip'
+unzip 'Office Open XML 1st edition Part 4 (PDF).zip' OfficeOpenXML-XMLSchema.zip
+unzip OfficeOpenXML-XMLSchema.zip -d $DIR/ooxml-xsds
+rm *.zip
+
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi

Deleted: tags/libapache-poi-java/3.9-1/debian/patches/01_javac_encoding.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/01_javac_encoding.patch	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/patches/01_javac_encoding.patch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,96 +0,0 @@
-Description: set encoding of each call to "javac" when compiling source code
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update:2009-10-01
---- a/build.xml
-+++ b/build.xml
-@@ -423,7 +423,7 @@
-                destdir="${main.output.dir}"
-                srcdir="${main.src}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath refid="main.classpath"/>
-         </javac>
-         <javac target="${jdk.version.class}"
-@@ -431,7 +431,7 @@
-                destdir="${main.output.test.dir}"
-                srcdir="${main.src.test}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath>
-                 <path refid="main.classpath"/>
-                 <pathelement path="${main.output.dir}"/>
-@@ -448,7 +448,7 @@
-                destdir="${scratchpad.output.dir}"
-                srcdir="${scratchpad.src}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath refid="scratchpad.classpath"/>
-         </javac>
-         <javac target="${jdk.version.class}"
-@@ -456,7 +456,7 @@
-                destdir="${scratchpad.output.test.dir}"
-                srcdir="${scratchpad.src.test}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath>
-                 <path refid="scratchpad.classpath"/>
-                 <pathelement location="${scratchpad.output.dir}"/>
-@@ -474,7 +474,7 @@
-                destdir="${contrib.output.dir}"
-                srcdir="${contrib.src}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath refid="contrib.classpath"/>
-         </javac>
-         <javac target="${jdk.version.class}"
-@@ -483,7 +483,7 @@
-                destdir="${contrib.output.test.dir}"
-                srcdir="${contrib.src.test}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath>
-                 <path refid="contrib.classpath"/>
-                 <pathelement path="${contrib.output.dir}"/>
-@@ -497,7 +497,7 @@
-                destdir="${examples.output.dir}"
-                srcdir="${examples.src}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath>
-                 <path refid="ooxml.classpath"/>
-                 <pathelement path="${ooxml.output.dir}"/>
-@@ -510,7 +510,7 @@
-                source="${jdk.version.source}"
-                destdir="${ooxml.output.dir}"
-                srcdir="${ooxml.src}"
--               debug="${compile.debug}">
-+               debug="${compile.debug}" encoding="iso-8859-1">
-             <classpath refid="ooxml.classpath"/>
-         </javac>
-         <javac target="${jdk.version.class}"
-@@ -518,7 +518,7 @@
-                destdir="${ooxml.output.test.dir}"
-                srcdir="${ooxml.src.test}"
-                debug="${compile.debug}"
--               fork="yes">
-+               fork="yes" encoding="iso-8859-1">
-             <classpath>
-                 <path refid="ooxml.classpath"/>
-                 <pathelement path="${ooxml.output.dir}"/>
-@@ -544,7 +544,7 @@
-         <!-- Compile -->
-         <javac target="${jdk.version.class}" source="${jdk.version.source}"
-                failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
--               srcdir="${main.output.dir}"/>
-+               srcdir="${main.output.dir}" encoding="iso-8859-1"/>
-         <!-- Tidy up -->
-         <delete file="${version.java}"/>
-     </target>

Deleted: tags/libapache-poi-java/3.9-1/debian/patches/02_classpath.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/02_classpath.patch	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/patches/02_classpath.patch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,19 +0,0 @@
-Description: define classpath of build (using properties from
- debian/ant.properties)
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update:2009-10-01
---- a/build.xml
-+++ b/build.xml
-@@ -166,9 +166,8 @@
-     </propertyset>
- 
-     <path id="main.classpath">
--        <fileset dir="${main.lib}">
--            <include name="*.jar"/>
--        </fileset>
-+       <pathelement location="${main.commons-logging.jar}"/>
-+       <pathelement location="${main.log4j.jar}"/>
-     </path>
- 
-     <path id="scratchpad.classpath">

Deleted: tags/libapache-poi-java/3.9-1/debian/patches/03_no_ooxml.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/03_no_ooxml.patch	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/patches/03_no_ooxml.patch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,46 +0,0 @@
-Description: disable build of "example" and "ooxml" modules
- ooxml depends on non-DFSG-free jars.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update:2009-12-30
---- a/build.xml
-+++ b/build.xml
-@@ -411,10 +411,10 @@
-     </target>
- 
-     <target name="compile" depends="init, compile-main,
--    compile-scratchpad, compile-contrib, compile-examples"
-+    compile-scratchpad, compile-contrib"
-             description="Compiles the POI main classes, scratchpad, contrib and examples"/>
- 
--    <target name="compile-all" depends="compile,compile-ooxml-lite"/>
-+    <target name="compile-all" depends="compile"/>
- 
-     <target name="compile-main">
-         <javac target="${jdk.version.class}"
-@@ -895,21 +895,25 @@
-             <fileset dir="${scratchpad.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
-+	<!--
-         <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${ooxml.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
-+	-->
-         <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-${DSTAMP}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${examples.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
-+	<!--
-         <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}-${DSTAMP}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${ooxml.lite.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
-+	-->
-     </target>
- 
-     <target name="jar-src" description="Sources for Maven">

Deleted: tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/04_jar_names.patch	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,48 +0,0 @@
-Description: remove ${DSTAMP} suffix added to JARs
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: no
-Last-Update:2009-10-01
---- a/build.xml
-+++ b/build.xml
-@@ -880,35 +880,35 @@
-             <attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
-             <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-         </manifest>
--        <jar destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"
-+        <jar destfile="${dist.dir}/${jar.name}-${version.id}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${main.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
--        <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}-${DSTAMP}.jar"
-+        <jar destfile="${dist.dir}/${jar.name}-contrib-${version.id}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${contrib.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
--        <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
-+        <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${scratchpad.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
- 	<!--
--        <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"
-+        <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${ooxml.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
- 	-->
--        <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-${DSTAMP}.jar"
-+        <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${examples.output.dir}"/>
-             <metainf dir="legal/"/>
-         </jar>
- 	<!--
--        <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}-${DSTAMP}.jar"
-+        <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}.jar"
-              manifest="build/poi-manifest.mf">
-             <fileset dir="${ooxml.lite.output.dir}"/>
-             <metainf dir="legal/"/>

Copied: tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch (from rev 17010, trunk/libapache-poi-java/debian/patches/04_jar_names.patch)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/patches/04_jar_names.patch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,45 @@
+Description: remove ${DSTAMP} suffix added to JARs
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: no
+Last-Update:2013-07-10
+--- a/build.xml
++++ b/build.xml
+@@ -958,32 +958,32 @@
+             <attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
+             <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
+         </manifest>
+-        <jar destfile="${dist.dir}/${jar.name}-${version.id}-${DSTAMP}.jar"
++        <jar destfile="${dist.dir}/${jar.name}-${version.id}.jar"
+              manifest="build/poi-manifest.mf">
+             <fileset dir="${main.output.dir}"/>
+             <metainf dir="legal/"/>
+         </jar>
+-        <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}-${DSTAMP}.jar"
++        <jar destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"
+              manifest="build/poi-manifest.mf">
+             <fileset dir="${scratchpad.output.dir}"/>
+             <metainf dir="legal/"/>
+         </jar>
+-        <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}-${DSTAMP}.jar"
++        <jar destfile="${dist.dir}/${jar.name}-ooxml-${version.id}.jar"
+              manifest="build/poi-manifest.mf">
+             <fileset dir="${ooxml.output.dir}"/>
+             <metainf dir="legal/"/>
+         </jar>
+-        <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}-${DSTAMP}.jar"
++        <jar destfile="${dist.dir}/${jar.name}-examples-${version.id}.jar"
+              manifest="build/poi-manifest.mf">
+             <fileset dir="${examples.output.dir}"/>
+             <metainf dir="legal/"/>
+         </jar>
+-        <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}-${DSTAMP}.jar"
++        <jar destfile="${dist.dir}/${jar.name}-ooxml-schemas-${version.id}.jar"
+              manifest="build/poi-manifest.mf">
+             <fileset dir="${ooxml.lite.output.dir}"/>
+             <metainf dir="legal/"/>
+         </jar>
+-        <jar destfile="${dist.dir}/${jar.name}-excelant-${version.id}-${DSTAMP}.jar"
++        <jar destfile="${dist.dir}/${jar.name}-excelant-${version.id}.jar"
+              manifest="build/poi-manifest.mf">
+             <fileset dir="${excelant.output.dir}"/>
+             <metainf dir="legal/"/>

Copied: tags/libapache-poi-java/3.9-1/debian/patches/05_use-local-ooxml-xsds.patch (from rev 17009, trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/patches/05_use-local-ooxml-xsds.patch	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/patches/05_use-local-ooxml-xsds.patch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,22 @@
+Description: Patch to use the local OOXML schema instead of fetching the files from the ECMA site at build time
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -401,7 +401,7 @@
+             </or>
+         </condition>
+     </target>
+-    <target name="compile-ooxml-xsds" unless="ooxml-compiled-xsds.present"
++    <target name="compile-ooxml-xsds"
+             depends="check-jars,fetch-jars,check-compiled-ooxml-xsds"
+             description="Unpacks the OOXML xsd files, and compiles them into XmlBeans">
+         <property name="ooxml.xsds.tmp.dir" location="build/ooxml-xsds"/>
+@@ -418,7 +418,6 @@
+            <equals arg1="${sun.arch.data.model}" arg2="64" />
+         </condition>
+ 
+-        <unzip src="${ooxml.xsds.izip}" dest="${ooxml.xsds.tmp.dir}"/>
+         <!--
+               schema="build/ooxml-xsds/"
+               schema="build/ooxml-xsds/sml-workbook.xsd"

Deleted: tags/libapache-poi-java/3.9-1/debian/patches/series
===================================================================
--- trunk/libapache-poi-java/debian/patches/series	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/patches/series	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,4 +0,0 @@
-01_javac_encoding.patch 
-02_classpath.patch
-03_no_ooxml.patch
-04_jar_names.patch

Copied: tags/libapache-poi-java/3.9-1/debian/patches/series (from rev 17009, trunk/libapache-poi-java/debian/patches/series)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/patches/series	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/patches/series	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,2 @@
+04_jar_names.patch
+05_use-local-ooxml-xsds.patch

Deleted: tags/libapache-poi-java/3.9-1/debian/rules
===================================================================
--- trunk/libapache-poi-java/debian/rules	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/rules	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,35 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
-
-PACKAGE := apache-poi
-MAVEN_DIST := build/dist
-POM_DIR := $(MAVEN_DIST)
-JAR_DIR := $(MAVEN_DIST)
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar $(ANT_HOME)/lib/ant-nodeps.jar junit xalan2
-DEB_ANT_BUILD_TARGET := jar maven-poms javadocs
-#DEB_ANT_CHECK_TARGET := test
-
-ANT_ARGS := -Dversion.id=$(VERSION)
-
-clean::
-	-test -d docs/skin/css && rmdir docs/skin/css
-	-rm -rf debian/tmp
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-$(VERSION).pom
-	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-contrib-$(VERSION).pom
-	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-scratchpad-$(VERSION).pom
-	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-contrib-$(VERSION).pom $(JAR_DIR)/poi-contrib-$(VERSION).jar
-	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar
-
-get-orig-source:
-	debian/orig-tar.sh --upstream-version $(VERSION)

Copied: tags/libapache-poi-java/3.9-1/debian/rules (from rev 17010, trunk/libapache-poi-java/debian/rules)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/rules	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/rules	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+dfsg//')
+
+PACKAGE := apache-poi
+MAVEN_DIST := build/dist
+POM_DIR := $(MAVEN_DIST)
+JAR_DIR := $(MAVEN_DIST)
+
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+
+DEB_JARS := ant ant-junit
+DEB_ANT_BUILD_TARGET := jar maven-poms javadocs
+DEB_ANT_CHECK_TARGET := test
+#DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+
+ANT_ARGS := -Dversion.id=$(VERSION)
+
+clean::
+	mh_clean
+	-test -d docs/skin/css && rmdir docs/skin/css
+	-rm -rf debian/tmp
+	rm -f ooxml-lib/*.jar
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-$(VERSION).pom
+	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-scratchpad-$(VERSION).pom
+	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-ooxml-$(VERSION).pom
+	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-ooxml-schemas-$(VERSION).pom
+	mh_installpom -plib$(PACKAGE)-java $(POM_DIR)/poi-excelant-$(VERSION).pom
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-ooxml-$(VERSION).pom $(JAR_DIR)/poi-ooxml-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-ooxml-schemas-$(VERSION).pom $(JAR_DIR)/poi-ooxml-schemas-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l $(POM_DIR)/poi-excelant-$(VERSION).pom $(JAR_DIR)/poi-ooxml-schemas-$(VERSION).jar
+	
+	jh_classpath -plib$(PACKAGE)-java
+
+get-orig-source:
+	debian/orig-tar.sh --upstream-version $(VERSION)

Deleted: tags/libapache-poi-java/3.9-1/debian/watch
===================================================================
--- trunk/libapache-poi-java/debian/watch	2013-07-09 10:56:19 UTC (rev 17005)
+++ tags/libapache-poi-java/3.9-1/debian/watch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -1,3 +0,0 @@
-version=3
-opts=dversionmangle=s/\+dfsg$// \
-	http://www.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz

Copied: tags/libapache-poi-java/3.9-1/debian/watch (from rev 17008, trunk/libapache-poi-java/debian/watch)
===================================================================
--- tags/libapache-poi-java/3.9-1/debian/watch	                        (rev 0)
+++ tags/libapache-poi-java/3.9-1/debian/watch	2013-07-11 12:42:09 UTC (rev 17012)
@@ -0,0 +1,2 @@
+version=3
+http://archive.apache.org/dist/poi/release/src/poi-src-([\d\.]*)-(?:.*).*.tar.gz




More information about the pkg-java-commits mailing list