[pkg-java] r10207 - in trunk/jasperreports/debian: . patches

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Sun Aug 30 11:46:41 UTC 2009 

Author: drazzib-guest
Date: 2009-08-30 11:46:41 +0000 (Sun, 30 Aug 2009)
New Revision: 10207

Added:
   trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.api
   trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config
   trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema
   trunk/jasperreports/debian/libjasperreports-java.poms
   trunk/jasperreports/debian/maven.rules
   trunk/jasperreports/debian/orig-tar.exclude
   trunk/jasperreports/debian/orig-tar.sh
   trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
   trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
   trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
   trunk/jasperreports/debian/patches/09_use_commons_codec.diff
Removed:
   trunk/jasperreports/debian/libjasperreports-java-doc.doc-base
   trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff
   trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff
   trunk/jasperreports/debian/patches/05_use_itext_2.diff
Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/control
   trunk/jasperreports/debian/copyright
   trunk/jasperreports/debian/patches/02_use_debian_asm.diff
   trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff
   trunk/jasperreports/debian/patches/06_configure_javaflow.diff
   trunk/jasperreports/debian/patches/series
   trunk/jasperreports/debian/rules
   trunk/jasperreports/debian/watch
Log:
[jasperreports]

* New upstream release
* Use maven-repo-helper
* Repack upstream tarball
* Clean debian/copyright


Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/changelog	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,4 +1,4 @@
-jasperreports (2.0.5-1) unstable; urgency=low
+jasperreports (3.5.3+dfsg-1) unstable; urgency=low
 
   * Initial release. (Closes: #281346)
 

Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/control	2009-08-30 11:46:41 UTC (rev 10207)
@@ -4,21 +4,29 @@
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at drazzib.com>
 Build-Depends: cdbs, quilt, debhelper (>= 7), default-jdk, ant
-Build-Depends-Indep: ant-optional, antlr, libasm2-java, bsh,
-  libjfreechart-java, libjcommon-java,
+Build-Depends-Indep: ant-optional, bsh, libasm2-java, groovy, libjcommon-java,
+  libspring-core-2.5-java, libspring-beans-2.5-java,
   libcommons-digester-java, libcommons-collections-java, libcommons-logging-java,
-  libcommons-beanutils-java, libjexcelapi-java, groovy, libjarjar-java,
-  libhibernate3-java, libjakarta-poi-java, libitext-java, glassfish-javaee,
-  libbatik-java (>= 1.7), libxml-commons-external-java, libjaxen-java, libxalan2-java,
-  libecj-java, libcommons-javaflow-java
+  libcommons-beanutils-java, libcommons-codec-java, libcommons-javaflow-java,
+  libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
+  libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
+  libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
+  glassfish-javaee, maven-repo-helper
 Standards-Version: 3.8.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports
-Homepage: http://www.jasperforge.org/jasperreports
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
+Homepage: http://jasperforge.org/jasperreports
 
 Package: libjasperreports-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless
+Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless,
+  libcommons-digester-java, libcommons-collections-java, libcommons-logging-java,
+  libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java,
+  libjcommon-java
+Recommends: libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
+  libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java
+Suggests: bsh, libasm2-java, groovy,
+  libspring-core-2.5-java, libspring-beans-2.5-java
 Description: Java reporting generator library
  JasperReports is a Java reporting generator library. XML report templates
  are used to generate ready to print documents using data from customizable data
@@ -36,4 +44,4 @@
  sources, including JDBC. The output can be delivered to the screen,
  printer, or stored in PDF, HTML, XLS, CSV, and XML format.
  .
- This package contains Javadoc API for JasperReports.
+ This package contains Javadoc API and Schema Reference for JasperReports.

Modified: trunk/jasperreports/debian/copyright
===================================================================
--- trunk/jasperreports/debian/copyright	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/copyright	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,13 +1,28 @@
 This package was debianized by Damien Raude-Morvan <drazzib at drazzib.com> on
 Thu, 27 Aug 2008 20:59:38 +0200.
 
-It was downloaded from http://jasperforge.org/plugins/esp_frs/?group_id=102
+It was downloaded from
+    http://sourceforge.net/projects/jasperreports/files/
 
-Upstream Author:
-    JasperSoft Corporation.
+Upstreams Authors:
+    Teodor Danciu <teodord at users.sourceforge.net>
+    Lucian Chirita <lucianc at users.sourceforge.net>
+    Sanda Zaharia <shertage at users.sourceforge.net>
+    Ionut Nedelcu <ionutned at users.sourceforge.net>
+    Flavius Sana <flavius_sana at users.sourceforge.net>
+    Peter Severin <peter_p_s at users.sourceforge.net>
+    Barry Klawans <bklawans at users.sourceforge.net>
+    Peter Risko <peter at risko.hu>
+    Michael Guenther <m.guenther at users.sourceforge.net>
+    Manuel Paul <mpaul at ratundtat.com>
+    Marcel Overdijk <marceloverdijk at hotmail.com>
+    Gaganis Giorgos <gaganis at users.sourceforge.net>
+    John Bindel <jbindel at works.com>
+    Michael McMahon <Michael.McMahon at activewire.net>
 
 Copyright:
-    Copyright (C) 2001-2006 JasperSoft Corporation
+    Copyright (C) 2001-2009 JasperSoft Corporation
+    Copyright (C) 2005 Works
 
 License:
 
@@ -28,5 +43,15 @@
 The full text of the LGPL 2.1 license can be found in
 `/usr/share/common-licenses/LGPL-2.1' on Debian systems.
 
-The Debian packaging is Copyright 2008, Damien Raude-Morvan <drazzib at drazzib.com> and
-is licensed under the LGPL 2.1, see `/usr/share/common-licenses/LGPL-2.1'.
+Note:
+  The upstream tarball as been stripped to make a DFSG-compliant version.
+  Items removed from upstream :
+  - all packaged JAR
+  - generated Javadoc
+  - non-DFSG-compliant Base64 encoder/decoder under W3C license
+  Repacking can be done using debian/orig-tar.sh script.
+  Excluded files are listed in debian/orig-tar.exclude.
+
+The Debian packaging is
+Copyright 2008 Damien Raude-Morvan <drazzib at drazzib.com>
+and is licensed under the LGPL 2.1, see `/usr/share/common-licenses/LGPL-2.1'.

Deleted: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,9 +0,0 @@
-Document: libjasperreports-java-doc
-Title: API Javadoc for JasperReports
-Author: JasperReports developers
-Abstract: This is the API Javadoc provided by the JasperReports library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libjasperreports-java/api/index.html
-Files: /usr/share/doc/libjasperreports-java/api/*

Copied: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.api (from rev 10200, trunk/jasperreports/debian/libjasperreports-java-doc.doc-base)
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.api	                        (rev 0)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.api	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,9 @@
+Document: libjasperreports-java-doc
+Title: API Javadoc for JasperReports
+Author: JasperReports developers
+Abstract: This is the API Javadoc provided by the JasperReports library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjasperreports-java/api/index.html
+Files: /usr/share/doc/libjasperreports-java/api/*

Added: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config	                        (rev 0)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,9 @@
+Document: libjasperreports-java-config
+Title: Config Reference for JasperReports
+Author: JasperReports developers
+Abstract: This is the Config Reference provided by the JasperReports library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html
+Files: /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html

Added: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema	                        (rev 0)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,9 @@
+Document: libjasperreports-java-schema
+Title: Schema Reference for JasperReports
+Author: JasperReports developers
+Abstract: This is the Schema Reference provided by the JasperReports library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html
+Files: /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html

Added: trunk/jasperreports/debian/libjasperreports-java.poms
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java.poms	                        (rev 0)
+++ trunk/jasperreports/debian/libjasperreports-java.poms	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1 @@
+pom.xml

Added: trunk/jasperreports/debian/maven.rules
===================================================================
--- trunk/jasperreports/debian/maven.rules	                        (rev 0)
+++ trunk/jasperreports/debian/maven.rules	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,4 @@
+s/ant/org.apache.ant/ * * s/.*/debian/
+junit junit jar s/3\..*/3.x/
+commons-collections commons-collections jar s/2\..*/2.x/
+javax.servlet servlet-api jar *

Added: trunk/jasperreports/debian/orig-tar.exclude
===================================================================
--- trunk/jasperreports/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/jasperreports/debian/orig-tar.exclude	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,4 @@
+lib/*
+build/*
+dist/*
+src/org/w3c/tools/codec/Base64*

Added: trunk/jasperreports/debian/orig-tar.sh
===================================================================
--- trunk/jasperreports/debian/orig-tar.sh	                        (rev 0)
+++ trunk/jasperreports/debian/orig-tar.sh	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+# $3 = file
+DIR=jasperreports-$2.orig
+TAR=jasperreports_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar zxf $3
+mv jasperreports-* $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/jasperreports/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Deleted: trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff
===================================================================
--- trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,18 +0,0 @@
-Description: build.xml: exclude OLAP and JPA modules of JasperReports.
-Fowarded: no
-Origin: vendor
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-07-16
---- a/build.xml
-+++ b/build.xml
-@@ -13,8 +13,8 @@
- 			</or>
- 		</condition>
- 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4">
--			<exclude name="**/olap/**/*.java" unless="using.jdk.1.5"/>
--			<exclude name="**/JRJpa*.java" unless="using.jdk.1.5"/>
-+			<exclude name="**/olap/**/*.java"/>
-+			<exclude name="**/JRJpa*.java"/>
- 			<classpath>
- 				<pathelement location="./build/classes"/>
- 				<fileset dir="./lib">

Copied: trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff (from rev 10200, trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff)
===================================================================
--- trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,17 @@
+Description: build.xml: exclude OLAP and JPA modules of JasperReports.
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-08-30
+--- a/build.xml
++++ b/build.xml
+@@ -13,8 +13,8 @@
+ 			</or>
+ 		</condition>
+ 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
+-			<exclude name="**/olap/**/*.java" unless="using.jdk.1.5"/>
+-			<exclude name="**/JRJpa*.java" unless="using.jdk.1.5"/>
++			<exclude name="**/olap/**/*.java"/>
++			<exclude name="**/JRJpa*.java"/>
+ 			<classpath>
+ 				<pathelement location="./build/classes"/>
+ 				<fileset dir="./lib">

Modified: trunk/jasperreports/debian/patches/02_use_debian_asm.diff
===================================================================
--- trunk/jasperreports/debian/patches/02_use_debian_asm.diff	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/02_use_debian_asm.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -16,7 +16,7 @@
  
  import java.io.ByteArrayInputStream;
  import java.io.File;
-@@ -172,4 +172,4 @@
+@@ -171,4 +171,4 @@
  	}
  
  

Modified: trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff
===================================================================
--- trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -2,7 +2,6 @@
  - Use ImageIO included JDK 1.4 for converting BI to PNG bytes array
  - Strip try { } catch code as IOException is not throw anymore by JDK 1.4
 Fowarded: no
-Origin: vendor
 Author: Damien Raude-Morvan <drazzib at drazzib.com>
 Last-Update: 2009-07-16
 --- a/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java

Deleted: trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff
===================================================================
--- trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,18 +0,0 @@
-Description: setUseNewGroovy(boolean) doesn't exist anymore in Groovy 1.5 included
- in Debian.
-Fowarded: yes
-Bug: http://jasperforge.org/tracker/index.php?func=detail&aid=2620&group_id=102&atid=612
-Origin: upstream, http://jasperforge.org/svn/repos/jasperreports/trunk/jasperreports/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-07-16
---- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
-+++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
-@@ -73,7 +73,7 @@
- 	protected String compileUnits(JRCompilationUnit[] units, String classpath, File tempDirFile) throws JRException
- 	{
- 		CompilerConfiguration config = new CompilerConfiguration();
--		config.setUseNewGroovy(true);
-+		//config.setUseNewGroovy(true);
- 		//config.setClasspath(classpath);
- 		CompilationUnit unit = new CompilationUnit(config);
- 		

Deleted: trunk/jasperreports/debian/patches/05_use_itext_2.diff
===================================================================
--- trunk/jasperreports/debian/patches/05_use_itext_2.diff	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/05_use_itext_2.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,52 +0,0 @@
-Description: Update JRPdfExporter to the new iText 2 API (methods renamed).
-Forwarded: no
-Origin: vendor
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-07-16
---- a/src/net/sf/jasperreports/engine/export/JRPdfExporter.java
-+++ b/src/net/sf/jasperreports/engine/export/JRPdfExporter.java
-@@ -1279,8 +1279,8 @@
- 
- 						image.scaleToFit(availableImageWidth, availableImageHeight);
- 
--						xoffset = (int)(xalignFactor * (availableImageWidth - image.plainWidth()));
--						yoffset = (int)(yalignFactor * (availableImageHeight - image.plainHeight()));
-+						xoffset = (int)(xalignFactor * (availableImageWidth - image.getPlainWidth()));
-+						yoffset = (int)(yalignFactor * (availableImageHeight - image.getPlainHeight()));
- 
- 						xoffset = (xoffset < 0 ? 0 : xoffset);
- 						yoffset = (yoffset < 0 ? 0 : yoffset);
-@@ -1293,8 +1293,8 @@
- 				{
- 					chunk = new Chunk(image, 0, 0);
- 
--					scaledWidth = image.scaledWidth();
--					scaledHeight = image.scaledHeight();
-+					scaledWidth = image.getScaledWidth();
-+					scaledHeight = image.getScaledHeight();
- 				}
- 			}
- 			else
-@@ -1655,11 +1655,11 @@
- 		{
- 			if (TextAttribute.SUPERSCRIPT_SUPER.equals(script))
- 			{
--				chunk.setTextRise(font.leading(1f)/2);
-+				chunk.setTextRise(font.getCalculatedLeading(1f)/2);
- 			}
- 			else if (script != null && TextAttribute.SUPERSCRIPT_SUB.equals(script))
- 			{
--				chunk.setTextRise(-font.leading(1f)/2);
-+				chunk.setTextRise(-font.getCalculatedLeading(1f)/2);
- 			}
- 		}
- 
-@@ -1711,7 +1711,7 @@
- 				);
- 
- 			// check if FontFactory didn't find the font
--			if (font.getBaseFont() == null && font.family() == Font.UNDEFINED)
-+			if (font.getBaseFont() == null && font.getFamily() == Font.UNDEFINED)
- 			{
- 				font = null;
- 			}

Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,15 +1,20 @@
-Description: build.xml: configure javaflow ant task (include missing elements from
- upstream classpath).
+Description: build.xml: configure <javaflow> ant task.
+ Include missing elements from upstream classpath.
 Author: Damien Raude-Morvan <drazzib at drazzib.com>
 Forwarded: not-needed
-Origin: vendor
 Last-Update: 2009-07-16
 --- a/build.xml
 +++ b/build.xml
-@@ -80,12 +80,24 @@
- 		</copy>
+@@ -88,12 +88,24 @@
+ 		</replace>
  
  		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
+-			<include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
+-			<include name="net/sf/jasperreports/engine/fill/JRVerticalFiller.class"/>
+-			<include name="net/sf/jasperreports/engine/fill/JRHorizontalFiller.class"/>
+-			<include name="net/sf/jasperreports/engine/fill/JRFillSubreport.class"/>
+-			<include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
+-			<include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
 +                        <include name="net/sf/jasperreports/engine/JRStyle.class"/>
 +                        <include name="net/sf/jasperreports/engine/JRTemplateReference.class"/>
 +                        <include name="net/sf/jasperreports/engine/JRStyleSetter.class"/>
@@ -17,12 +22,12 @@
 +                        <include name="net/sf/jasperreports/engine/base/JRBasePrintPage.class"/>
 +                        <include name="net/sf/jasperreports/engine/base/JRVirtualPrintPage.class"/>
 +                        <include name="net/sf/jasperreports/engine/util/FormatFactory.class"/>
- 			<include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
- 			<include name="net/sf/jasperreports/engine/fill/JRVerticalFiller.class"/>
- 			<include name="net/sf/jasperreports/engine/fill/JRHorizontalFiller.class"/>
- 			<include name="net/sf/jasperreports/engine/fill/JRFillSubreport.class"/>
- 			<include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
- 			<include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
++                        <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>
++                        <include name="net/sf/jasperreports/engine/fill/JRVerticalFiller.class"/>
++                        <include name="net/sf/jasperreports/engine/fill/JRHorizontalFiller.class"/>
++                        <include name="net/sf/jasperreports/engine/fill/JRFillSubreport.class"/>
++                        <include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/>
++                        <include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/>
 +                        <include name="net/sf/jasperreports/engine/fill/JRFillBand.class"/>
 +                        <include name="net/sf/jasperreports/engine/fill/JRFillGroup.class"/>
 +                        <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/>

Added: trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,256 @@
+Description:
+  - build.xml: exclude Barcode4J and Barbecue modules of JasperReports.
+  - Disable Barcode4J and Barbecue classes in
+    src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+    and src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-08-30
+--- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
++++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+@@ -31,12 +31,6 @@
+ import java.util.HashMap;
+ import java.util.List;
+ 
+-import net.sf.jasperreports.components.barbecue.BarbecueCompiler;
+-import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter;
+-import net.sf.jasperreports.components.barbecue.BarbecueFillFactory;
+-import net.sf.jasperreports.components.barcode4j.BarcodeCompiler;
+-import net.sf.jasperreports.components.barcode4j.BarcodeDesignConverter;
+-import net.sf.jasperreports.components.barcode4j.BarcodeFillFactory;
+ import net.sf.jasperreports.components.list.FillListFactory;
+ import net.sf.jasperreports.components.list.ListComponent;
+ import net.sf.jasperreports.components.list.ListComponentCompiler;
+@@ -102,23 +96,6 @@
+ 		listManager.setComponentFillFactory(new FillListFactory());
+ 		componentManagers.put(LIST_COMPONENT_NAME, listManager);
+ 		
+-		DefaultComponentManager barbecueManager = new DefaultComponentManager();
+-		barbecueManager.setDesignConverter(new BarbecueDesignConverter());
+-		barbecueManager.setComponentCompiler(new BarbecueCompiler());
+-		barbecueManager.setComponentXmlWriter(xmlHandler);
+-		barbecueManager.setComponentFillFactory(new BarbecueFillFactory());
+-		componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager);
+-		
+-		DefaultComponentManager barcode4jManager = new DefaultComponentManager();
+-		barcode4jManager.setDesignConverter(new BarcodeDesignConverter());
+-		barcode4jManager.setComponentCompiler(new BarcodeCompiler());
+-		barcode4jManager.setComponentXmlWriter(xmlHandler);
+-		barcode4jManager.setComponentFillFactory(new BarcodeFillFactory());
+-		for (int i = 0; i < BARCODE4J_COMPONENT_NAMES.length; i++)
+-		{
+-			componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager);
+-		}
+-		
+ 		bundle.setComponentManagers(componentManagers);
+ 		
+ 		REGISTRY = new ExtensionsRegistry()
+--- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
++++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+@@ -29,24 +29,6 @@
+ 
+ import java.io.IOException;
+ 
+-import net.sf.jasperreports.components.barbecue.BarbecueComponent;
+-import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
+-import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
+-import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
+-import net.sf.jasperreports.components.barcode4j.CodabarComponent;
+-import net.sf.jasperreports.components.barcode4j.Code128Component;
+-import net.sf.jasperreports.components.barcode4j.Code39Component;
+-import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
+-import net.sf.jasperreports.components.barcode4j.EAN128Component;
+-import net.sf.jasperreports.components.barcode4j.EAN13Component;
+-import net.sf.jasperreports.components.barcode4j.EAN8Component;
+-import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
+-import net.sf.jasperreports.components.barcode4j.PDF417Component;
+-import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
+-import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
+-import net.sf.jasperreports.components.barcode4j.UPCAComponent;
+-import net.sf.jasperreports.components.barcode4j.UPCEComponent;
+-import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
+ import net.sf.jasperreports.components.list.DesignListContents;
+ import net.sf.jasperreports.components.list.ListComponent;
+ import net.sf.jasperreports.components.list.ListContents;
+@@ -78,8 +60,6 @@
+ 	public void configureDigester(Digester digester)
+ 	{
+ 		addListRules(digester);
+-		addBarbecueRules(digester);
+-		addBarcode4jRules(digester);
+ 	}
+ 
+ 	protected void addListRules(Digester digester)
+@@ -93,103 +73,6 @@
+ 		digester.addSetNext(listContentsPattern, "setContents");
+ 	}
+ 
+-	protected void addBarbecueRules(Digester digester)
+-	{
+-		String barcodePattern = "*/componentElement/barbecue";
+-		digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class);
+-		digester.addSetProperties(barcodePattern,
+-				//properties to be ignored by this rule
+-				new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime}, 
+-				new String[0]);
+-		digester.addRule(barcodePattern, 
+-				new XmlConstantPropertyRule(
+-						JRXmlConstants.ATTRIBUTE_evaluationTime,
+-						JRXmlConstants.getEvaluationTimeMap()));
+-
+-		String barcodeExpressionPattern = barcodePattern + "/codeExpression";
+-		digester.addFactoryCreate(barcodeExpressionPattern, 
+-				JRExpressionFactory.StringExpressionFactory.class.getName());
+-		digester.addCallMethod(barcodeExpressionPattern, "setText", 0);
+-		digester.addSetNext(barcodeExpressionPattern, "setCodeExpression", 
+-				JRExpression.class.getName());
+-
+-		String applicationIdentifierExpressionPattern = barcodePattern 
+-				+ "/applicationIdentifierExpression";
+-		digester.addFactoryCreate(applicationIdentifierExpressionPattern, 
+-				JRExpressionFactory.StringExpressionFactory.class.getName());
+-		digester.addCallMethod(applicationIdentifierExpressionPattern, "setText", 0);
+-		digester.addSetNext(applicationIdentifierExpressionPattern, 
+-				"setApplicationIdentifierExpression", 
+-				JRExpression.class.getName());
+-	}
+-
+-	protected void addBarcode4jRules(Digester digester)
+-	{
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/Codabar", 
+-				CodabarComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/Code128", 
+-				Code128Component.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/EAN128", 
+-				EAN128Component.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/DataMatrix", 
+-				DataMatrixComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/RoyalMailCustomer", 
+-				RoyalMailCustomerComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/USPSIntelligentMail", 
+-				USPSIntelligentMailComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/Code39", Code39Component.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/Interleaved2Of5", Interleaved2Of5Component.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/UPCA", UPCAComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/UPCE", UPCEComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/EAN13", EAN13Component.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/EAN8", EAN8Component.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/POSTNET", POSTNETComponent.class);
+-		addBaseBarcode4jRules(digester, 
+-				"*/componentElement/PDF417", PDF417Component.class);
+-	}
+-	
+-	protected void addBaseBarcode4jRules(Digester digester, 
+-			String barcodePattern, Class barcodeComponentClass)
+-	{
+-		digester.addObjectCreate(barcodePattern, barcodeComponentClass);
+-		digester.addSetProperties(barcodePattern,
+-				//properties to be ignored by this rule
+-				new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime}, 
+-				new String[0]);
+-		//rule to set evaluation time
+-		digester.addRule(barcodePattern, 
+-				new XmlConstantPropertyRule(
+-						JRXmlConstants.ATTRIBUTE_evaluationTime,
+-						JRXmlConstants.getEvaluationTimeMap()));
+-		
+-		String codeExpressionPattern = barcodePattern + "/codeExpression";
+-		digester.addFactoryCreate(codeExpressionPattern, 
+-				JRExpressionFactory.StringExpressionFactory.class.getName());
+-		digester.addCallMethod(codeExpressionPattern, "setText", 0);
+-		digester.addSetNext(codeExpressionPattern, "setCodeExpression", 
+-				JRExpression.class.getName());
+-		
+-		String patternExpressionPattern = barcodePattern + "/patternExpression";
+-		digester.addFactoryCreate(patternExpressionPattern, 
+-				JRExpressionFactory.StringExpressionFactory.class.getName());
+-		digester.addCallMethod(patternExpressionPattern, "setText", 0);
+-		digester.addSetNext(patternExpressionPattern, "setPatternExpression", 
+-				JRExpression.class.getName());
+-	}
+-	
+ 	public void writeToXml(ComponentKey componentKey, Component component,
+ 			JRXmlWriter reportWriter) throws IOException
+ 	{
+@@ -198,18 +81,6 @@
+ 			ListComponent list = (ListComponent) component;
+ 			writeList(list, componentKey, reportWriter);
+ 		}
+-		else if (component instanceof BarbecueComponent)
+-		{
+-			BarbecueComponent barcode = (BarbecueComponent) component;
+-			writeBarbecue(barcode, componentKey, reportWriter);
+-		}
+-		else if (component instanceof BarcodeComponent)
+-		{
+-			BarcodeComponent barcode = (BarcodeComponent) component;
+-			BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter(
+-					reportWriter, barcode, componentKey);
+-			barcodeWriter.writeBarcode();
+-		}
+ 	}
+ 
+ 	protected void writeList(ListComponent list, ComponentKey componentKey,
+@@ -234,38 +105,4 @@
+ 		writer.closeElement();
+ 	}
+ 
+-	protected void writeBarbecue(BarbecueComponent barcode, ComponentKey componentKey,
+-			JRXmlWriter reportWriter) throws IOException
+-	{
+-		JRXmlWriteHelper writer = reportWriter.getXmlWriteHelper();
+-		
+-		XmlNamespace namespace = new XmlNamespace(
+-				ComponentsExtensionsRegistryFactory.NAMESPACE, 
+-				componentKey.getNamespacePrefix(),
+-				ComponentsExtensionsRegistryFactory.XSD_LOCATION);
+-		
+-		writer.startElement("barbecue", namespace);
+-		
+-		writer.addAttribute("type", barcode.getType());
+-		writer.addAttribute("drawText", barcode.isDrawText());
+-		writer.addAttribute("checksumRequired", barcode.isChecksumRequired());
+-		writer.addAttribute("barWidth", barcode.getBarWidth());
+-		writer.addAttribute("barHeight", barcode.getBarHeight());
+-		if (barcode.getEvaluationTime() != JRExpression.EVALUATION_TIME_NOW)
+-		{
+-			writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime, 
+-					barcode.getEvaluationTime(),
+-					JRXmlConstants.getEvaluationTimeMap());
+-		}
+-		writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup, 
+-				barcode.getEvaluationGroup());
+-
+-		writer.writeExpression("codeExpression", 
+-				barcode.getCodeExpression(), false);
+-		writer.writeExpression("applicationIdentifierExpression", 
+-				barcode.getApplicationIdentifierExpression(), false);
+-		
+-		writer.closeElement();
+-	}
+-	
+ }
+--- a/build.xml
++++ b/build.xml
+@@ -15,6 +15,8 @@
+ 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
+ 			<exclude name="**/olap/**/*.java"/>
+ 			<exclude name="**/JRJpa*.java"/>
++			<exclude name="**/barcode4j/*.java"/>
++			<exclude name="**/barbecue/*.java"/>
+ 			<classpath>
+ 				<pathelement location="./build/classes"/>
+ 				<fileset dir="./lib">

Added: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,14 @@
+Description: build.xml: Don't pass Xmx128m to <javadoc> task.
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-08-30
+--- a/build.xml
++++ b/build.xml
+@@ -306,7 +306,6 @@
+ 				use="true"
+ 				windowtitle="JasperReports API version ${version}"
+ 				excludepackagenames="org.w3c.tools.codec"
+-				maxmemory="128m"
+ 				encoding="ISO-8859-1">
+ 			<doctitle><![CDATA[<span style="font-family:verdana,arial,helvetica,sans-serif;font-size:16pt;font-style:normal;color:#000000;"><b><font color="#808080">Jasper</font><font color="#990000">Reports</font></b></span><br><span style="font-family:verdana,arial,helvetica,sans-serif;font-size:10pt;font-weight:bold;color:#000000;">version ${version}</span>]]></doctitle>
+ 			<bottom><![CDATA[<span style="font-decoration:none;font-family:verdana,arial,helvetica,sans-serif;font-size:8pt;font-style:normal;color:#000000;">&copy; 2001-2009 JasperSoft Corporation <a href="http://www.jaspersoft.com" target="_blank" style="color:#000000;">www.jaspersoft.com</a></span>]]></bottom>

Added: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2009-08-30 11:46:41 UTC (rev 10207)
@@ -0,0 +1,115 @@
+Description: Use Commons Codec Base64 decode/encode
+  instead of non-DFSG-free W3C one (removed from tarball).
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Forwarded: no
+Last-Update: 2009-08-29
+--- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
++++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+@@ -90,7 +90,7 @@
+ import net.sf.jasperreports.engine.util.JRXmlWriteHelper;
+ import net.sf.jasperreports.engine.xml.JRXmlConstants;
+ 
+-import org.w3c.tools.codec.Base64Encoder;
++import org.apache.commons.codec.binary.Base64;
+ 
+ 
+ /**
+@@ -818,13 +818,8 @@
+ 			{
+ 				try
+ 				{
+-					ByteArrayInputStream bais = new ByteArrayInputStream(renderer.getImageData());
+-					ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-					
+-					Base64Encoder encoder = new Base64Encoder(bais, baos);
+-					encoder.process();
+-					
+-					imageSource = new String(baos.toByteArray(), DEFAULT_XML_ENCODING);
++					byte[] byteOut = Base64.decodeBase64(renderer.getImageData());
++					imageSource = new String(byteOut, DEFAULT_XML_ENCODING);
+ 				}
+ 				catch (IOException e)
+ 				{
+--- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
++++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+@@ -36,9 +36,7 @@
+ import java.util.HashMap;
+ import java.util.Map;
+ 
+-import org.w3c.tools.codec.Base64Decoder;
+-import org.w3c.tools.codec.Base64Encoder;
+-import org.w3c.tools.codec.Base64FormatException;
++import org.apache.commons.codec.binary.Base64;
+ 
+ import net.sf.jasperreports.engine.JRRuntimeException;
+ 
+@@ -463,12 +461,9 @@
+ 		{
+ 			try
+ 			{
+-				ByteArrayInputStream dataIn = new ByteArrayInputStream(data.getBytes());
+-				ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
+-				Base64Decoder dec = new Base64Decoder(dataIn, bytesOut);
+-				dec.process();
++				byte[] bytesOut = Base64.decodeBase64(data.getBytes());
+ 				
+-				ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
++				ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut);
+ 				ObjectInputStream objectIn = new ObjectInputStream(bytesIn);
+ 				return objectIn.readObject();
+ 			}
+@@ -480,10 +475,6 @@
+ 			{
+ 				throw new JRRuntimeException(e);
+ 			}
+-			catch (Base64FormatException e)
+-			{
+-				throw new JRRuntimeException(e);
+-			}
+ 		}
+ 
+ 		public String serialize(Object value)
+@@ -495,13 +486,8 @@
+ 				objectOut.writeObject(value);
+ 				objectOut.close();
+ 				
+-				ByteArrayInputStream bytesIn = new ByteArrayInputStream(bytesOut.toByteArray());
+-				ByteArrayOutputStream dataOut = new ByteArrayOutputStream();				
+-				
+-				Base64Encoder enc = new Base64Encoder(bytesIn, dataOut);
+-				enc.process();
+-				
+-				return new String(dataOut.toByteArray(), "UTF-8");
++				byte[] dataOut = Base64.decodeBase64(bytesOut.toByteArray());	
++				return new String(dataOut, "UTF-8");
+ 			}
+ 			catch (NotSerializableException e)
+ 			{
+--- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
++++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+@@ -34,8 +34,7 @@
+ import net.sf.jasperreports.engine.JRImageRenderer;
+ import net.sf.jasperreports.engine.JRPrintImage;
+ 
+-import org.w3c.tools.codec.Base64Decoder;
+-
++import org.apache.commons.codec.binary.Base64;
+ 
+ /**
+  * @author Teodor Danciu (teodord at users.sourceforge.net)
+@@ -83,13 +82,8 @@
+ 		{
+ 			try
+ 			{
+-				ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
+-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-				
+-				Base64Decoder decoder = new Base64Decoder(bais, baos);
+-				decoder.process();
+-				
+-				printImage.setRenderer(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR));
++				byte[] decodedBytes =  Base64.decodeBase64(imageSource.getBytes("UTF-8")); //FIXMENOW other encodings ?
++				printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes));//, JRImage.ON_ERROR_TYPE_ERROR));
+ 			}
+ 			catch (Exception e)
+ 			{

Modified: trunk/jasperreports/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/patches/series	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,6 +1,7 @@
-01_dont_build_olap_and_jpa.diff
+01_exclude_olap_and_jpa.diff
 02_use_debian_asm.diff
 03_use_pngencoder_from_jcommon.diff
-04_remove_setusenewgroovy.diff
-05_use_itext_2.diff
 06_configure_javaflow.diff
+07_exclude_barcode4j_and_barbecue.diff
+08_no_maxmemory_for_javadoc.diff
+09_use_commons_codec.diff

Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/rules	2009-08-30 11:46:41 UTC (rev 10207)
@@ -4,41 +4,41 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
 
-DEB_JARS             := ant-trax antlr asm2 bsh jfreechart jcommon \
-                        commons-digester commons-javaflow \
-                        commons-collections commons-logging commons-beanutils \
-                        jxl groovy jarjar hibernate3 jakarta-poi itext \
-                        glassfish-javaee batik-all xml-apis-ext jaxen xalan2 \
-                        eclipse-ecj
+DEB_JARS := ant-trax bsh asm2 groovy jcommon \
+            spring-core-2.5 spring-beans-2.5 \
+            commons-digester commons-collections commons-logging \
+            commons-beanutils commons-codec commons-javaflow \
+            eclipse-ecj xalan2 jaxen xml-apis-ext \
+            jxl jakarta-poi itext \
+            batik-all jfreechart hibernate3 \
+            glassfish-javaee
 
 DEB_ANT_BUILD_TARGET := jar docs
 DEB_ANT_CLEAN_TARGET := clean
 
-API_DOCS             := dist/javadoc/*
-REF_DOCS             := dist/quick.reference-*.html
+API_DOCS := dist/javadoc/*
+SCHEMA_DOC := dist/jasperreports-*-schema.reference.html
+CONFIG_DOC := dist/jasperreports-*-config.reference.html
+VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e s/\+dfsg//)
 
 binary-post-install/libjasperreports-java::
-	dh_install -plibjasperreports-java dist/jasperreports-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_install -plibjasperreports-java dist/jasperreports-$(DEB_UPSTREAM_VERSION)-applet.jar usr/share/java
-	dh_install -plibjasperreports-java dist/jasperreports-$(DEB_UPSTREAM_VERSION)-javaflow.jar usr/share/java
-	dh_link -plibjasperreports-java usr/share/java/jasperreports-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jasperreports.jar
-	dh_link -plibjasperreports-java usr/share/java/jasperreports-$(DEB_UPSTREAM_VERSION)-applet.jar usr/share/java/jasperreports-applet.jar
-	dh_link -plibjasperreports-java usr/share/java/jasperreports-$(DEB_UPSTREAM_VERSION)-javaflow.jar usr/share/java/jasperreports-javaflow.jar
+	mh_installpoms -plibjasperreports-java
+	mh_installjar -plibjasperreports-java -l pom.xml dist/jasperreports-$(VERSION).jar
+	dh_install -plibjasperreports-java dist/jasperreports-$(VERSION)-applet.jar /usr/share/java/
+	dh_link /usr/share/java/jasperreports-$(VERSION)-applet.jar /usr/share/java/jasperreports-applet.jar
+	dh_install -plibjasperreports-java dist/jasperreports-$(VERSION)-javaflow.jar /usr/share/java/
+	dh_link /usr/share/java/jasperreports-$(VERSION)-javaflow.jar /usr/share/java/jasperreports-javaflow.jar
 
 binary-post-install/libjasperreports-java-doc::
-	dh_install -plibjasperreports-java-doc $(API_DOCS) usr/share/doc/libjasperreports-java/api/
-	dh_install -plibjasperreports-java-doc $(REF_DOCS) usr/share/doc/libjasperreports-java/
+	dh_install -plibjasperreports-java-doc $(API_DOCS) /usr/share/doc/libjasperreports-java/api/
+	dh_install -plibjasperreports-java-doc $(SCHEMA_DOC) /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html
+	dh_install -plibjasperreports-java-doc $(CONFIG_DOC) /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html
 
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
-	uscan --force-download --rename
-	mkdir orig_tmp
-	(cd orig_tmp && \
-	tar -xzf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz && \
-	find ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION) -name "*.jar" -delete && \
-	rm -rf ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/build && \
-	rm -rf ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/dist && \
-	tar -czf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION))
-	rm -rf orig_tmp
+	uscan --force-download

Modified: trunk/jasperreports/debian/watch
===================================================================
--- trunk/jasperreports/debian/watch	2009-08-30 10:07:36 UTC (rev 10206)
+++ trunk/jasperreports/debian/watch	2009-08-30 11:46:41 UTC (rev 10207)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/jasperreports/jasperreports-(2.+)-project\.tar\.gz debian uupdate
+opts=dversionmangle=s/\+dfsg$// \
+     http://sf.net/jasperreports/jasperreports-(.+)-project\.tar\.gz debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list