[pkg-java] r10201 - in trunk/libjakarta-poi-java/debian: . patches

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Thu Aug 27 21:58:57 UTC 2009 

Author: drazzib-guest
Date: 2009-08-27 21:58:57 +0000 (Thu, 27 Aug 2009)
New Revision: 10201

Added:
   trunk/libjakarta-poi-java/debian/README.source
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install
   trunk/libjakarta-poi-java/debian/maven.rules
   trunk/libjakarta-poi-java/debian/orig-tar.exclude
   trunk/libjakarta-poi-java/debian/orig-tar.sh
   trunk/libjakarta-poi-java/debian/patches/series
Removed:
   trunk/libjakarta-poi-java/debian/README.Debian-source
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.2
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.lintian
Modified:
   trunk/libjakarta-poi-java/debian/changelog
   trunk/libjakarta-poi-java/debian/control
   trunk/libjakarta-poi-java/debian/copyright
   trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1
   trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch
   trunk/libjakarta-poi-java/debian/rules
   trunk/libjakarta-poi-java/debian/watch
Log:
[libjakarta-poi-java]

  * 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



Deleted: trunk/libjakarta-poi-java/debian/README.Debian-source
===================================================================
--- trunk/libjakarta-poi-java/debian/README.Debian-source	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/README.Debian-source	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,8 +0,0 @@
-Upstream does not distribute source releases. Therefore
-the upstream tarball was cleaned and repackaged.
-
-Steps to reproduce cleaning of upstream tarball:
-
-find -name *.jar -exec rm {} \;
-
- -- Wolfgang Baer <WBaer at gmx.de>  Tue, 25 Oct 2005 21:12:16 +0200

Copied: trunk/libjakarta-poi-java/debian/README.source (from rev 10197, trunk/libjakarta-poi-java/debian/README.Debian-source)
===================================================================
--- trunk/libjakarta-poi-java/debian/README.source	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/README.source	2009-08-27 21:58:57 UTC (rev 10201)
@@ -0,0 +1,20 @@
+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

Modified: trunk/libjakarta-poi-java/debian/changelog
===================================================================
--- trunk/libjakarta-poi-java/debian/changelog	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/changelog	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,3 +1,31 @@
+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 ]

Modified: trunk/libjakarta-poi-java/debian/control
===================================================================
--- trunk/libjakarta-poi-java/debian/control	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/control	2009-08-27 21:58:57 UTC (rev 10201)
@@ -2,9 +2,9 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java
-Standards-Version: 3.8.2
+Uploaders: Christian Bayle <bayle at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Rene Engelhard <rene at debian.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, junit, default-jdk, libcommons-logging-java, liblog4j1.2-java, libxalan2-java, libcommons-beanutils-java, libcommons-lang-java, quilt, maven-repo-helper
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjakarta-poi-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjakarta-poi-java/
 Homepage: http://poi.apache.org

Modified: trunk/libjakarta-poi-java/debian/copyright
===================================================================
--- trunk/libjakarta-poi-java/debian/copyright	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/copyright	2009-08-27 21:58:57 UTC (rev 10201)
@@ -2,9 +2,13 @@
 
 It was downloaded from <http://poi.apache.org>
 
-Upstream Authors: The Apache Software Foundation
+Upstream Authors:
+  Glen Stampoultzis <glens at apache.org>
+  Nick Burch <nick at apache.org>
+  Rainer Klute <klute at apache.org>
+  Yegor Kozlov <yegor at apache.org>
 
-Copyright: (C) 2003-2008 The Apache Software Foundation
+Copyright: (C) 2003-2009 The Apache Software Foundation
 
 License:
 
@@ -22,3 +26,19 @@
 
 The full text of the license can be found at
 `/usr/share/common-licenses/Apache-2.0'.
+
+
+Except "src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl"
+which is licenced under GPLv3:
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 3 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+The full text of the license can be found at
+`/usr/share/common-licenses/GPL-3'.

Modified: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.1	2009-08-27 21:58:57 UTC (rev 10201)
@@ -8,5 +8,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libjakarta-poi-java-doc/apidocs/index.html
-Files: /usr/share/doc/libjakarta-poi-java-doc/apidocs/*.html
+Index: /usr/share/doc/libjakarta-poi-java/api/index.html
+Files: /usr/share/doc/libjakarta-poi-java/api/*.html

Deleted: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.2
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.2	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.doc-base.2	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,12 +0,0 @@
-Document: libjakarta-poi-java-doc2
-Title: Manual for the Poor Obfuscation Implementation
-Author: The Apache Jakarta POI Development Team
-Abstract: This is the manual of libjakarta-poi-java, a library classes for 
- manipulating various file formats based upon Microsoft's OLE 2 Compound 
- Document format using pure Java. This includes Microsoft Office files such 
- as XLS and DOC.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjakarta-poi-java-doc/index.html
-Files: /usr/share/doc/libjakarta-poi-java-doc/*.*

Deleted: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1 +0,0 @@
-docs/*

Copied: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install (from rev 10197, trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.docs)
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.install	2009-08-27 21:58:57 UTC (rev 10201)
@@ -0,0 +1 @@
+build/tmp/site/build/site/apidocs/* /usr/share/doc/libjakarta-poi-java/api/

Deleted: trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.lintian
===================================================================
--- trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.lintian	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/libjakarta-poi-java-doc.lintian	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,2 +0,0 @@
-# part of manual - so no name change etc is possible
-libjakarta-poi-java-doc: html-changelog-without-text-version

Added: trunk/libjakarta-poi-java/debian/maven.rules
===================================================================
--- trunk/libjakarta-poi-java/debian/maven.rules	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/maven.rules	2009-08-27 21:58:57 UTC (rev 10201)
@@ -0,0 +1,2 @@
+log4j log4j jar s/1\.2\..*/1.2.x/
+

Added: trunk/libjakarta-poi-java/debian/orig-tar.exclude
===================================================================
--- trunk/libjakarta-poi-java/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/orig-tar.exclude	2009-08-27 21:58:57 UTC (rev 10201)
@@ -0,0 +1,12 @@
+lib/*
+docs/*
+src/contrib/poi-ruby/*.jar
+*.jar
+*.ppt
+*.pptx
+*.doc
+*.docx
+*.xls
+*.xlsx
+*.vsd
+*.pub

Added: trunk/libjakarta-poi-java/debian/orig-tar.sh
===================================================================
--- trunk/libjakarta-poi-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/orig-tar.sh	2009-08-27 21:58:57 UTC (rev 10201)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+# $3 = file
+DIR=libjakarta-poi-java-$2.orig
+TAR=libjakarta-poi-java_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxf $3
+mv poi-* $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


Property changes on: trunk/libjakarta-poi-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/patches/01_javac_encoding.patch	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,6 +1,6 @@
---- build.xml.orig	2007-09-18 20:27:20.000000000 +0200
-+++ build.xml	2007-09-18 20:27:22.000000000 +0200
-@@ -291,12 +291,12 @@
+--- a/build.xml
++++ b/build.xml
+@@ -274,12 +274,12 @@
      </copy>
      <javac target="${jdk.version.class}" source="${jdk.version.source}"
        failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
@@ -15,8 +15,8 @@
        <classpath>
          <path refid="main.classpath"/>
          <pathelement location="${main.output.dir}"/>
-@@ -308,12 +308,12 @@
-   <target name="compile-scratchpad" depends="init">
+@@ -291,12 +291,12 @@
+   <target name="compile-scratchpad" depends="init,compile-main">
      <javac target="${jdk.version.class}" source="${jdk.version.source}"
        failonerror="true" destdir="${scratchpad.output.dir}" debug="on"
 -      fork="yes" srcdir="${scratchpad.src}">
@@ -29,8 +29,8 @@
 +      fork="yes" srcdir="${scratchpad.src.test}" encoding="iso-8859-1">
        <classpath>
          <path refid="scratchpad.classpath"/>
-         <pathelement location="${scratchpad.output.dir}"/>
-@@ -342,12 +342,12 @@
+         <pathelement location="${main.output.test.dir}"/>
+@@ -323,12 +323,12 @@
    <target name="compile-contrib" depends="init">
      <javac target="${jdk.version.class}" source="${jdk.version.source}"
        failonerror="true" destdir="${contrib.output.dir}" debug="on" fork="yes"
@@ -45,7 +45,7 @@
        <classpath>
          <path refid="contrib.classpath"/>
          <pathelement location="${contrib.output.dir}"/>
-@@ -358,7 +358,7 @@
+@@ -339,7 +339,7 @@
  
    <target name="compile-examples" depends="init">
      <javac target="${jdk.version.class}" source="${jdk.version.source}"

Added: trunk/libjakarta-poi-java/debian/patches/series
===================================================================
--- trunk/libjakarta-poi-java/debian/patches/series	                        (rev 0)
+++ trunk/libjakarta-poi-java/debian/patches/series	2009-08-27 21:58:57 UTC (rev 10201)
@@ -0,0 +1 @@
+01_javac_encoding.patch 

Modified: trunk/libjakarta-poi-java/debian/rules
===================================================================
--- trunk/libjakarta-poi-java/debian/rules	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/rules	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,33 +1,37 @@
 #!/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\- | sed -e s/\.dfsg//)
-
 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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | sed -e s/\+dfsg//)
 
+PACKAGE := jakarta-poi
+MAVEN_DIST := build/maven-dist/org.apache.poi
+POM_DIR := $(MAVEN_DIST)/poms
+JAR_DIR := $(MAVEN_DIST)/jars
+
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit xalan2
-DEB_ANT_BUILD_TARGET := compile jar #test
+DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar $(ANT_HOME)/lib/ant-nodeps.jar junit xalan2
+DEB_ANT_BUILD_TARGET := compile maven-dist javadocs
+#DEB_ANT_CHECK_TARGET := test
 
+ANT_ARGS := -Dversion.id=$(VERSION)
+
 clean::
-	-test -d docs/skin/css && rmdir docs/skin/css )
+	-test -d docs/skin/css && rmdir docs/skin/css
+	-rm -rf debian/tmp
 
-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
+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 -njakarta-poi -l $(POM_DIR)/poi-$(VERSION).pom $(JAR_DIR)/poi-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -njakarta-contrib-poi -l $(POM_DIR)/poi-contrib-$(VERSION).pom $(JAR_DIR)/poi-contrib-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -njakarta-scratchpad-poi -l $(POM_DIR)/poi-scratchpad-$(VERSION).pom $(JAR_DIR)/poi-scratchpad-$(VERSION).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
+get-orig-source:
+	uscan --force-download

Modified: trunk/libjakarta-poi-java/debian/watch
===================================================================
--- trunk/libjakarta-poi-java/debian/watch	2009-08-27 04:33:28 UTC (rev 10200)
+++ trunk/libjakarta-poi-java/debian/watch	2009-08-27 21:58:57 UTC (rev 10201)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.dfsg$// \
-	http://www.apache.org/dist/poi/release/src/poi-src-(.*)-FINAL-.*.tar.gz debian uupdate
+opts=dversionmangle=s/\+dfsg$// \
+	http://www.apache.org/dist/poi/release/src/poi-src-(.*)-FINAL-.*.tar.gz debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list