Author: rene
Date: 2008-02-10 00:39:45 +0000 (Sun, 10 Feb 2008)
New Revision: 5657
Added:
trunk/jfreereport/
trunk/jfreereport/debian/patches/
trunk/jfreereport/debian/patches/00list
trunk/jfreereport/debian/patches/01_libdir.dpatch
trunk/jfreereport/debian/patches/02_jarnames.dpatch
trunk/jfreereport/debian/patches/03_source-target-1.3.dpatch
trunk/jfreereport/debian/patches/04_local_dtd.dpatch
trunk/pentaho-reporting-flow-engine/
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java-doc.docs
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java.dirs
trunk/pentaho-reporting-flow-engine/debian/patches/00list
trunk/pentaho-reporting-flow-engine/debian/patches/01_libdir.dpatch
trunk/pentaho-reporting-flow-engine/debian/patches/02_jarnames.dpatch
trunk/pentaho-reporting-flow-engine/debian/patches/03_source-target-1.3.dpatch
trunk/pentaho-reporting-flow-engine/debian/patches/04_local_dtd.dpatch
trunk/pentaho-reporting-flow-engine/debian/patches/05_no_gnujaxp.dpatch
Removed:
trunk/jfreereport/debian/README.Debian
trunk/jfreereport/debian_patch
trunk/libjfreereport-java/
trunk/pentaho-reportdesigner/
trunk/pentaho-reporting-flow-engine/debian/README.Debian
trunk/pentaho-reporting-flow-engine/debian/ant.properties
trunk/pentaho-reporting-flow-engine/debian/patches/01_build.xml_remove_executable_arg.patch
trunk/pentaho-reporting-flow-engine/debian/patches/10_ReportDialog_comment_WindowsLookAndFeel.patch
trunk/pentaho-reporting-flow-engine/debian/watch
Modified:
trunk/jfreereport/debian/changelog
trunk/jfreereport/debian/control
trunk/jfreereport/debian/libjfreereport-java-doc.docs
trunk/jfreereport/debian/libjfreereport-java.docs
trunk/jfreereport/debian/rules
trunk/pentaho-reporting-flow-engine/debian/changelog
trunk/pentaho-reporting-flow-engine/debian/compat
trunk/pentaho-reporting-flow-engine/debian/control
trunk/pentaho-reporting-flow-engine/debian/copyright
trunk/pentaho-reporting-flow-engine/debian/rules
Log:
commit "new" jfreereport, mv libjfreereport-java jfreereport for sourcepkg name
change; commit pentaho-reporting-flow-engine
Copied: trunk/jfreereport (from rev 5592, trunk/libjfreereport-java)
Deleted: trunk/jfreereport/debian/README.Debian
===================================================================
--- trunk/libjfreereport-java/debian/README.Debian 2008-02-04 13:30:11 UTC
(rev 5592)
+++ trunk/jfreereport/debian/README.Debian 2008-02-10 00:39:45 UTC (rev
5657)
@@ -1,4 +0,0 @@
-libjfreereport-java for Debian
-------------------------------
-
- -- Christian Bayle <[EMAIL PROTECTED]>, Sun, 6 Jul 2003 14:02:45 +0200
Modified: trunk/jfreereport/debian/changelog
===================================================================
--- trunk/libjfreereport-java/debian/changelog 2008-02-04 13:30:11 UTC (rev
5592)
+++ trunk/jfreereport/debian/changelog 2008-02-10 00:39:45 UTC (rev 5657)
@@ -1,3 +1,30 @@
+jfreereport (0.9.0-05-4) unstable; urgency=low
+
+ * fix dpatch creation oversight...
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 28 Nov 2007 15:21:26 +0100
+
+jfreereport (0.9.0-05-3) unstable; urgency=low
+
+ * fix manual to refer to the local DTDs - thanks Kumar Appaiah
+ (closes: #453205)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 28 Nov 2007 14:44:43 +0100
+
+jfreereport (0.9.0-05-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 05 Nov 2007 01:16:02 +0100
+
+jfreereport (0.9.0-05-1) experimental; urgency=low
+
+ * reintroduce
+ * add Debian Java Maintainers as Maintainer: and me as Uploader
+ * new upstream release
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 27 Aug 2007 21:30:40 +0200
+
libjfreereport-java (0.8.3c-5) unstable; urgency=high
* Recognize the JAVA_HOME directories for ibm-j2sdk1.4 and
@@ -33,6 +60,3 @@
-- Christian Bayle <[EMAIL PROTECTED]> Thu, 10 Jul 2003 02:04:27 +0200
-Local variables:
-mode: debian-changelog
-End:
Modified: trunk/jfreereport/debian/control
===================================================================
--- trunk/libjfreereport-java/debian/control 2008-02-04 13:30:11 UTC (rev
5592)
+++ trunk/jfreereport/debian/control 2008-02-10 00:39:45 UTC (rev 5657)
@@ -1,14 +1,16 @@
-Source: libjfreereport-java
-Section: contrib/libs
+Source: jfreereport
+Section: libs
Priority: optional
-Maintainer: Christian Bayle <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.4, ant, bsh,
libjcommon-java, libgnujaxp-java, libitext-java, libjakarta-poi-java,
libpixie-java, liblog4j1.2-java
+Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
+Uploaders: Rene Engelhard <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>> 5.0.0), java-gcj-compat-dev, ant, bsh,
libjcommon-java (>= 1.0.10), libitext-java, libjakarta-poi-java, libpixie-java
(>= 0.8.6), liblog4j1.2-java, dpatch, libjcommon-serializer-java,
libformula-java, libflute-1.3-jfree-java, libfonts-java, liblayout-java,
libloader-java, librepository-java, libxml-java, libsac-java, docbook-utils,
docbook-xml
Standards-Version: 3.6.1
Package: libjfreereport-java
-Section: contrib/libs
+Section: libs
Architecture: all
-Depends: j2re1.4 | java2-runtime, libjcommon-java, libgnujaxp-java,
libitext-java, libjakarta-poi-java, liblog4j1.2-java
+Depends: gij | java2-runtime, libjcommon-java (>= 1.0.10), libitext-java,
libjakarta-poi-java, liblog4j1.2-java, libjcommon-serializer-java,
libformula-java, libflute-1.3-jfree-java, libfonts-java, liblayout-java,
libloader-java, librepository-java, libxml-java, libsac-java
+Suggests: libjfreereport-java-doc
Description: report library for java
JFreeReport is a free Java report library. It has the following features:
* full on-screen print preview;
@@ -21,7 +23,7 @@
* extensive documentation in Acrobat PDF format, plus full Javadocs;
Package: libjfreereport-java-doc
-Section: contrib/doc
+Section: doc
Architecture: all
Description: report library for java documentation
JFreeReport is a free Java report library. It has the following features:
@@ -33,3 +35,7 @@
(PDF, HTML, CSV, Excel, plain text);
* support for servlets (uses the JFreeReport extensions)
* extensive documentation in Acrobat PDF format, plus full Javadocs;
+ .
+ This package contains the Javadoc, the Manual and the Developers Guide of
+ JFreeReport.
+
Modified: trunk/jfreereport/debian/libjfreereport-java-doc.docs
===================================================================
--- trunk/libjfreereport-java/debian/libjfreereport-java-doc.docs
2008-02-04 13:30:11 UTC (rev 5592)
+++ trunk/jfreereport/debian/libjfreereport-java-doc.docs 2008-02-10
00:39:45 UTC (rev 5657)
@@ -1,3 +1,3 @@
-jfreereport-0.8.3c/javadoc
-jfreereport-ext-0.8.3c/javadoc-ext
-jfreereport-0.8.3-intro.pdf
+javadoc
+docs/manual
+docs/devguide/developers-guide
Modified: trunk/jfreereport/debian/libjfreereport-java.docs
===================================================================
--- trunk/libjfreereport-java/debian/libjfreereport-java.docs 2008-02-04
13:30:11 UTC (rev 5592)
+++ trunk/jfreereport/debian/libjfreereport-java.docs 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -1 +1 @@
-jfreereport-0.8.3c/README
+README
Added: trunk/jfreereport/debian/patches/00list
===================================================================
--- trunk/jfreereport/debian/patches/00list (rev 0)
+++ trunk/jfreereport/debian/patches/00list 2008-02-10 00:39:45 UTC (rev
5657)
@@ -0,0 +1,4 @@
+01_libdir
+02_jarnames
+03_source-target-1.3
+04_local_dtd
Added: trunk/jfreereport/debian/patches/01_libdir.dpatch
===================================================================
--- trunk/jfreereport/debian/patches/01_libdir.dpatch
(rev 0)
+++ trunk/jfreereport/debian/patches/01_libdir.dpatch 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_libdir.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad jfreereport-0.9.0-05~/ant/build.properties
jfreereport-0.9.0-05/ant/build.properties
+--- jfreereport-0.9.0-05~/ant/build.properties 2007-06-13 14:30:51.000000000
+0200
++++ jfreereport-0.9.0-05/ant/build.properties 2007-08-27 22:04:54.000000000
+0200
+@@ -24,7 +24,7 @@
+ # All path settings are relative to the project root directory
+ # (..)
+ #
+-libdir=lib
++libdir=/usr/share/java
+
+ #
+ # If you specify a non-emty string, then dont forget the
Added: trunk/jfreereport/debian/patches/02_jarnames.dpatch
===================================================================
--- trunk/jfreereport/debian/patches/02_jarnames.dpatch
(rev 0)
+++ trunk/jfreereport/debian/patches/02_jarnames.dpatch 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_jarnames.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad jfreereport-0.9.0-05~/ant/build.properties
jfreereport-0.9.0-05/ant/build.properties
+--- jfreereport-0.9.0-05~/ant/build.properties 2007-06-13 14:30:51.000000000
+0200
++++ jfreereport-0.9.0-05/ant/build.properties 2007-08-27 22:12:27.000000000
+0200
+@@ -38,20 +38,20 @@
+ # Used libraries ...
+
+ # Used by: core libraries
+-jcommon-jar-file=jcommon-1.0.10.jar
+-jcommon-serializer-jar-file=jcommon-serializer-0.1.0.jar
+-libfonts-jar-file=liblayout-0.2.6.jar
+-liblayout-jar-file=libfonts-0.2.6.jar
+-libloader-jar-file=libloader-0.3.4.jar
+-libxml-jar-file=libxml-0.9.5.jar
+-libformula-jar-file=libformula-0.1.8.jar
+-librepository-jar-file=librepository-0.1.1.jar
+-flute-jar-file=flute-1.3-jfree-20061107.jar
++jcommon-jar-file=jcommon.jar
++jcommon-serializer-jar-file=jcommon-serializer.jar
++libfonts-jar-file=liblayout.jar
++liblayout-jar-file=libfonts.jar
++libloader-jar-file=libloader.jar
++libxml-jar-file=libxml.jar
++libformula-jar-file=libformula.jar
++librepository-jar-file=librepository.jar
++flute-jar-file=flute-1.3-jfree.jar
+
+ #
+ # Optional libraries
+-pixie-jar-file=optional/pixie-0.8.6.jar
+-commons-logging-jar-file=optional/commons-logging-1.0.4.jar
++pixie-jar-file=optional/pixie.jar
++commons-logging-jar-file=optional/commons-logging.jar
+ oscache-jar-file=optional/oscache-2.3-compat.jar
+
+ # Used by: module-parser
Added: trunk/jfreereport/debian/patches/03_source-target-1.3.dpatch
===================================================================
--- trunk/jfreereport/debian/patches/03_source-target-1.3.dpatch
(rev 0)
+++ trunk/jfreereport/debian/patches/03_source-target-1.3.dpatch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_source-target-1.3.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad jfreereport-0.9.0-05~/ant/build.properties
jfreereport-0.9.0-05/ant/build.properties
+--- jfreereport-0.9.0-05~/ant/build.properties 2007-06-13 14:30:51.000000000
+0200
++++ jfreereport-0.9.0-05/ant/build.properties 2007-08-27 22:04:28.000000000
+0200
+@@ -17,8 +17,8 @@
+
+ #
+ # Make sure that JDK 1.2 compatible class files are generated
+-build.target=1.2
+-build.source=1.2
++build.target=1.3
++build.source=1.3
+
+ #
+ # All path settings are relative to the project root directory
Added: trunk/jfreereport/debian/patches/04_local_dtd.dpatch
===================================================================
--- trunk/jfreereport/debian/patches/04_local_dtd.dpatch
(rev 0)
+++ trunk/jfreereport/debian/patches/04_local_dtd.dpatch 2008-02-10
00:39:45 UTC (rev 5657)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_local_dtd.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad jfreereport-0.9.0-05~/docs/devguide/developers-guide.xml
jfreereport-0.9.0-05/docs/devguide/developers-guide.xml
+--- jfreereport-0.9.0-05~/docs/devguide/developers-guide.xml 2005-03-08
18:42:01.000000000 +0100
++++ jfreereport-0.9.0-05/docs/devguide/developers-guide.xml 2007-11-28
14:17:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
++"/usr/share/xml/docbook/schema/dtd/4.3/docbookx.dtd" [
+ <!ENTITY chap1 SYSTEM "chapter1-styleguide.xml">
+ ]>
+ <book>
+diff -urNad jfreereport-0.9.0-05~/docs/manual.xml
jfreereport-0.9.0-05/docs/manual.xml
+--- jfreereport-0.9.0-05~/docs/manual.xml 2007-11-28 13:51:28.000000000
+0100
++++ jfreereport-0.9.0-05/docs/manual.xml 2007-11-28 14:16:42.000000000
+0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
++"docbook42.flat.dtd">
+ <book>
+ <bookinfo>
+ <title>JFreeReport Manual</title>
Modified: trunk/jfreereport/debian/rules
===================================================================
--- trunk/libjfreereport-java/debian/rules 2008-02-04 13:30:11 UTC (rev
5592)
+++ trunk/jfreereport/debian/rules 2008-02-10 00:39:45 UTC (rev 5657)
@@ -5,57 +5,44 @@
# Build
# Choose the VM
-JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm
/usr/lib/j2sdk1.4-blackdown
-export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] &&
echo $$j && exit 0; done)
+export JAVA_HOME ?= /usr/lib/jvm/java-gcj
export JAVA=$(JAVA_HOME)/bin/java
export JAVAC=$(JAVA_HOME)/bin/javac
export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.
-export LIBRARY = $(shell head -1 debian/control | sed 's/Source.
lib\(.*\)-java/\1/')
-export VERSION = $(shell head -1 debian/changelog | sed
's/.*(\(.*\)-.*).*/\1/' )
-export VERSIONEXT = $(shell ls jfreereport-ext-*.tar.gz | sed
's/jfreereport-ext-\(.*\).tar.gz/\1/' )
-export SRCDIR=$(LIBRARY)-$(VERSION)
-export SRCDIREXT=$(LIBRARY)-ext-$(VERSIONEXT)
export CURDIR=$(shell pwd)
+export SRCDIR=$(CURDIR)
+export LIBRARY=jfreereport
+export VERSION=0.9.0-05
+include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
dh_testdir
- # Add here commands to configure the package.
- mkdir $(SRCDIR)
- tar xvzf jfreereport-$(VERSION).tar.gz
- tar xvzf jfreereport-ext-$(VERSIONEXT).tar.gz
- ln -s $(SRCDIR) $(LIBRARY)
- sh ./debian_patch $(SRCDIR)/ant/build.xml
- sh ./debian_patch $(SRCDIREXT)/ant/build.xml
touch configure-stamp
build: configure build-stamp
build-stamp:
dh_testdir
- # Use debian jar to use debian jars
- cd $(SRCDIR)/ant; ant compile-demo
- cd $(SRCDIREXT)/ant; ant compile
+
+ cd ant; ant compile
+ cd ant; ant javadoc
+ cd docs && db2html manual.xml
+ cd docs/devguide && db2html developers-guide.xml
+
touch build-stamp
-javadoc:
- echo $(SRCDIR)/javadoc > debian/libjfreereport-java-doc.docs
- echo $(SRCDIREXT)/javadoc-ext >> debian/libjfreereport-java-doc.docs
- echo jfreereport-0.8.3-intro.pdf >> debian/libjfreereport-java-doc.docs
- echo $(SRCDIR)/README > debian/libjfreereport-java.docs
- # Ant
- cd $(SRCDIR)/ant; ant javadoc
- cd $(SRCDIREXT)/ant; ant javadoc
- mv $(SRCDIREXT)/javadoc $(SRCDIREXT)/javadoc-ext
-
-clean:
+clean: unpatch
dh_testdir
dh_testroot
-rm -f build-stamp
-rm -f configure-stamp
- -rm -rf $(SRCDIR) $(SRCDIREXT) $(LIBRARY)
+ rm -f jfreereport-0.9.0-05.jar
+ rm -rf docs/manual
+ rm -rf docs/devguide/developers-guide
+ rm -rf javadoc
dh_clean
install: build javadoc
@@ -63,39 +50,21 @@
dh_testroot
dh_clean -k
dh_installdirs
- #
- # Package
- #
+
install -m 644 $(SRCDIR)/$(LIBRARY)-$(VERSION).jar \
- debian/tmp/usr/share/java/
- install -m 644 $(SRCDIR)/$(LIBRARY)-$(VERSION)-demo.jar \
- debian/tmp/usr/share/java/
- ln -s $(LIBRARY)-$(VERSION).jar debian/tmp/usr/share/java/$(LIBRARY).jar
- install -m 644 $(SRCDIREXT)/$(LIBRARY)-ext-$(VERSIONEXT).jar \
- debian/tmp/usr/share/java/
- ln -s $(LIBRARY)-ext-$(VERSIONEXT).jar
debian/tmp/usr/share/java/$(LIBRARY)-ext.jar
+ debian/libjfreereport-java/usr/share/java/
+ ln -s $(LIBRARY)-$(VERSION).jar
debian/libjfreereport-java/usr/share/java/$(LIBRARY).jar
-# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
dh_installexamples
-# dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_installinfo
-# dh_undocumented
dh_installchangelogs
dh_link
dh_compress
dh_fixperms
dh_installdeb
-# dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
Deleted: trunk/jfreereport/debian_patch
===================================================================
--- trunk/libjfreereport-java/debian_patch 2008-02-04 13:30:11 UTC (rev
5592)
+++ trunk/jfreereport/debian_patch 2008-02-10 00:39:45 UTC (rev 5657)
@@ -1,41 +0,0 @@
-
-perl -pi -e
's:\${libdir}/\${BeanShell-jar}:/usr/share/java/\${BeanShell-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${GnuJAXP-jar}:/usr/share/java/\${GnuJAXP-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${iText-jar}:/usr/share/java/\${iText-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${JCommon-jar}:/usr/share/java/\${JCommon-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${Pixie-jar}:/usr/share/java/\${Pixie-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${POI-jar}:/usr/share/java/\${POI-jar}:g' $1
-
-perl -pi -e 's:bsh-1\.2b6\.jar:bsh.jar:g' $1
-perl -pi -e 's:itext-0\.99\.jar:itext.jar:g' $1
-perl -pi -e 's:pixie-0\.8\.0\.jar:pixie.jar:g' $1
-perl -pi -e 's:jcommon-0\.8\.3\.jar:jcommon.jar:g' $1
-perl -pi -e 's:jakarta-poi-1\.10\.0-dev-20030222\.jar:jakarta-poi.jar:g' $1
-perl -pi -e 's:log4j-1\.2\.3\.jar:log4j-1.2.jar:g' $1
-perl -pi -e 's:servlet\.jar:servlet-2.3.jar:g' $1
-
-# BEurk
-#perl -pi -e 's:.*Class-Path.*::' $1
-perl -pi -e 's:lib/jcommon.jar:jcommon.jar:' $1
-perl -pi -e 's:lib/\${BeanShell-jar}:\${BeanShell-jar}:g' $1
-perl -pi -e 's:lib/\${GnuJAXP-jar}:\${GnuJAXP-jar}:g' $1
-perl -pi -e 's:lib/\${iText-jar}:\${iText-jar}:g' $1
-perl -pi -e 's:lib/\${JCommon-jar}:\${JCommon-jar}:g' $1
-perl -pi -e 's:lib/\${Pixie-jar}:\${Pixie-jar}:g' $1
-perl -pi -e 's:lib/\${POI-jar}:\${POI-jar}:g' $1
-
-# Ext
-perl -pi -e
's:\${jfreereport-libdir}/\${BeanShell-jar}:/usr/share/java/\${BeanShell-jar}:g'
$1
-perl -pi -e
's:\${jfreereport-libdir}/\${GnuJAXP-jar}:/usr/share/java/\${GnuJAXP-jar}:g' $1
-perl -pi -e
's:\${jfreereport-libdir}/\${iText-jar}:/usr/share/java/\${iText-jar}:g' $1
-perl -pi -e
's:\${jfreereport-libdir}/\${JCommon-jar}:/usr/share/java/\${JCommon-jar}:g' $1
-perl -pi -e
's:\${jfreereport-libdir}/\${Pixie-jar}:/usr/share/java/\${Pixie-jar}:g' $1
-perl -pi -e
's:\${jfreereport-libdir}/\${POI-jar}:/usr/share/java/\${POI-jar}:g' $1
-
-perl -pi -e 's:\${libdir}/\${junit-jar}:/usr/share/java/\${junit-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${log4j-jar}:/usr/share/java/\${log4j-jar}:g' $1
-perl -pi -e 's:\${libdir}/\${servlet-jar}:/usr/share/java/\${servlet-jar}:g' $1
-
-#<pathelement location="${jfreereport-dir}/${JFreeReport-jar}"/>
-#<pathelement location="${jfreereport-dir}/${JFreeReport-demo-jar}"/>
-#<!-- <pathelement location="${libdir}/${JFreeChart-jar}"/> -->
Copied: trunk/pentaho-reporting-flow-engine (from rev 5656,
trunk/pentaho-reportdesigner)
Deleted: trunk/pentaho-reporting-flow-engine/debian/README.Debian
===================================================================
--- trunk/pentaho-reportdesigner/debian/README.Debian 2008-02-09 15:32:39 UTC
(rev 5656)
+++ trunk/pentaho-reporting-flow-engine/debian/README.Debian 2008-02-10
00:39:45 UTC (rev 5657)
@@ -1,10 +0,0 @@
-Pentaho-ReportDesigner
-======================
-
-This only preliminary work on the package, a lot of jars has to be
-removed from the package
-
-I renamed the jars "bar" so the build system can't find them but I know
-which are needed.
-
- -- Arnaud Vandyck <[EMAIL PROTECTED]>, Fri, 20 Jul 2007 11:41:45 +0200
Deleted: trunk/pentaho-reporting-flow-engine/debian/ant.properties
===================================================================
--- trunk/pentaho-reportdesigner/debian/ant.properties 2008-02-09 15:32:39 UTC
(rev 5656)
+++ trunk/pentaho-reporting-flow-engine/debian/ant.properties 2008-02-10
00:39:45 UTC (rev 5657)
@@ -1 +0,0 @@
-
Modified: trunk/pentaho-reporting-flow-engine/debian/changelog
===================================================================
--- trunk/pentaho-reportdesigner/debian/changelog 2008-02-09 15:32:39 UTC
(rev 5656)
+++ trunk/pentaho-reporting-flow-engine/debian/changelog 2008-02-10
00:39:45 UTC (rev 5657)
@@ -1,5 +1,75 @@
-pentaho-reportdesigner (1.5.5.239~0-0) UNRELEASED; urgency=low
+pentaho-reporting-flow-engine (0.9.2-2) experimental; urgency=low
- * Initial release (closes: #426546)
+ * conflict/provide/replace libjfreereport-java[-doc]
- -- Arnaud Vandyck <[EMAIL PROTECTED]> Fri, 20 Jul 2007 11:43:30 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 05 Feb 2008 17:05:57 +0100
+
+pentaho-reporting-flow-engine (0.9.2-1) experimental; urgency=low
+
+ * New upstream release
+ * update debian/ for JFreeReport -> Pentaho Reporting Flow Engine
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 28 Jan 2008 13:43:59 +0100
+
+jfreereport (0.9.0-05-4) unstable; urgency=low
+
+ * fix dpatch creation oversight...
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 28 Nov 2007 15:21:26 +0100
+
+jfreereport (0.9.0-05-3) unstable; urgency=low
+
+ * fix manual to refer to the local DTDs - thanks Kumar Appaiah
+ (closes: #453205)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 28 Nov 2007 14:44:43 +0100
+
+jfreereport (0.9.0-05-2) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 05 Nov 2007 01:16:02 +0100
+
+jfreereport (0.9.0-05-1) experimental; urgency=low
+
+ * reintroduce
+ * add Debian Java Maintainers as Maintainer: and me as Uploader
+ * new upstream release
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 27 Aug 2007 21:30:40 +0200
+
+libjfreereport-java (0.8.3c-5) unstable; urgency=high
+
+ * Recognize the JAVA_HOME directories for ibm-j2sdk1.4 and
+ blackdown-j2sdk1.4 (Closes: #306923)
+
+ -- Christian Bayle <[EMAIL PROTECTED]> Fri, 29 Apr 2005 20:33:22 +0200
+
+libjfreereport-java (0.8.3c-4) unstable; urgency=high
+
+ * Transition to liblog4j1.2-java (Closes: #306754)
+
+ -- Christian Bayle <[EMAIL PROTECTED]> Thu, 28 Apr 2005 22:50:59 +0200
+
+libjfreereport-java (0.8.3c-3) unstable; urgency=low
+
+ * Applied Andreas Jochens patch 'debian_patch' not executable and
+ missing Build-Depends on 'bsh' (Closes: bug#294043)
+
+ -- Christian Bayle <[EMAIL PROTECTED]> Tue, 8 Feb 2005 20:16:05 +0100
+
+libjfreereport-java (0.8.3c-2) unstable; urgency=low
+
+ * Added dependancy to libpixie-java
+ * Changed dependancy from liblog4j to liblog4j-java (Closes: bug#266073)
+ * libjfreereport-java only works with liblog4j 1.1.3 as suggested in
+ * bug #191175
+
+ -- Christian Bayle <[EMAIL PROTECTED]> Sun, 2 Jan 2005 23:56:17 +0100
+
+libjfreereport-java (0.8.3c-1) unstable; urgency=low
+
+ * Initial Release, closes ITP (Closes: bug#199757).
+
+ -- Christian Bayle <[EMAIL PROTECTED]> Thu, 10 Jul 2003 02:04:27 +0200
+
Modified: trunk/pentaho-reporting-flow-engine/debian/compat
===================================================================
--- trunk/pentaho-reportdesigner/debian/compat 2008-02-09 15:32:39 UTC (rev
5656)
+++ trunk/pentaho-reporting-flow-engine/debian/compat 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -1 +1 @@
-4
+5
Modified: trunk/pentaho-reporting-flow-engine/debian/control
===================================================================
--- trunk/pentaho-reportdesigner/debian/control 2008-02-09 15:32:39 UTC (rev
5656)
+++ trunk/pentaho-reporting-flow-engine/debian/control 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -1,54 +1,51 @@
-Source: pentaho-reportdesigner
-Section: contrib/libs
+Source: pentaho-reporting-flow-engine
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
-Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
-Build-Depends-Indep: java-gcj-compat-dev, ant, libjgoodies-looks-java
-Standards-Version: 3.7.2
+Uploaders: Rene Engelhard <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>> 5.0.0), java-gcj-compat-dev, ant, bsh,
libjcommon-java (>= 1.0.10), libitext-java, libjakarta-poi-java, libpixie-java
(>= 0.8.6), liblog4j1.2-java, dpatch, libjcommon-serializer-java,
libformula-java, libflute-1.3-jfree-java, libfonts-java (>= 0.3.2),
liblayout-java, libloader-java, librepository-java, libxml-java (>= 0.8.9),
libsac-java, docbook-utils, docbook-xml
+Standards-Version: 3.6.1
-Package: libpentaho-reportdesigner-java
+Package: libpentaho-reporting-flow-engine-java
+Section: libs
Architecture: all
-Section: contrib/libs
-Depends: gij | java-gcj-compat | java1-runtime | java2-runtime,
libjgoodies-looks-java
-Recommends:
-Suggests:
-Description: reporting module from pentaho suite
- Reporting module from the complete business intelligence
- platform Pentaho. It includes reporting, analysis (OLAP),
- dashboards, data mining and data integration (ETL).
- Use it as a full suite or as individual components that are
- accessible via web services. Ranked #1 in open source BI.
+Depends: gij | java2-runtime, libjcommon-java (>= 1.0.10), libitext-java,
libjakarta-poi-java, liblog4j1.2-java, libjcommon-serializer-java,
libformula-java, libflute-1.3-jfree-java, libfonts-java (>= 0.3.2),
liblayout-java, libloader-java, librepository-java, libxml-java (>= 0.8.9),
libsac-java
+Conflicts: libjfreereport-java
+Provides: libjfreereport-java
+Replaces: libjfreereport-java
+Suggests: libjfreereport-java-doc
+Description: report library for java
+ Pentaho Reporting Flow Engine is a free Java report library.
.
- Website: http://sourceforge.net/projects/pentaho
+ It has the following features:
+ * full on-screen print preview;
+ * data obtained via Swing's TableModel interface
+ (making it easy to print data directly from your application);
+ * XML-based report definitions;
+ * output to the screen, printer or various export formats
+ (PDF, HTML, CSV, Excel, plain text);
+ * support for servlets (uses the JFreeReport extensions)
+ * extensive documentation in Acrobat PDF format, plus full Javadocs;
-Package: libpentaho-reportdesigner-java-gcj
-Architecture: any
-Section: libs
-Depends: libpentaho-reportdesigner-java (>= ${source:Version}),
${misc:Depends}, ${shlibs:Depends}
-Description: reporting module from pentaho suite (native code)
- Reporting module from the complete business intelligence
- platform Pentaho. It includes reporting, analysis (OLAP),
- dashboards, data mining and data integration (ETL).
- Use it as a full suite or as individual components that are
- accessible via web services. Ranked #1 in open source BI.
- .
- This package contains the natively compiled code for use by gij.
- .
- Website: http://sourceforge.net/projects/pentaho
-
-Package: libpentaho-reportdesigner-java-doc
-Architecture: all
+Package: libpentaho-reporting-flow-engine-java-doc
Section: doc
-Suggests: libpentaho-reportdesigner-java
-Description: documentation for pentaho-reportdesigner
- Reporting module from the complete business intelligence
- platform Pentaho. It includes reporting, analysis (OLAP),
- dashboards, data mining and data integration (ETL).
- Use it as a full suite or as individual components that are
- accessible via web services. Ranked #1 in open source BI.
+Architecture: all
+Conflicts: libjfreereport-java-doc
+Provides: libjfreereport-java-doc
+Replaces: libjfreereport-java-doc
+Description: report library for java documentation
+ Pentaho Reporting Flow Engine is a free Java report library.
.
- This package contains the documentation in HTML format, the Javadoc API
- documentation and some examples.
- .
- Website: http://sourceforge.net/projects/pentaho
+ It has the following features:
+ * full on-screen print preview;
+ * data obtained via Swing's TableModel interface
+ (making it easy to print data directly from your application);
+ * XML-based report definitions;
+ * output to the screen, printer or various export formats
+ (PDF, HTML, CSV, Excel, plain text);
+ * support for servlets (uses the JFreeReport extensions)
+ * extensive documentation in Acrobat PDF format, plus full Javadocs;
+ .
+ This package contains the Javadoc, the Manual and the Developers Guide of
+ the Pentaho Reporting Flow Engine.
+
Modified: trunk/pentaho-reporting-flow-engine/debian/copyright
===================================================================
--- trunk/pentaho-reportdesigner/debian/copyright 2008-02-09 15:32:39 UTC
(rev 5656)
+++ trunk/pentaho-reporting-flow-engine/debian/copyright 2008-02-10
00:39:45 UTC (rev 5657)
@@ -1,37 +1,25 @@
-This package was debianized by Arnaud Vandyck <[EMAIL PROTECTED]> on
20-Jul-2007.
+This package was debianized by Christian Bayle <[EMAIL PROTECTED]>, Sun, 6
Jul 2003 14:02:45 +0200
-The source was downloaded from <http://sourceforge.net/projects/pentaho>.
+It was downloaded from http://www.jfree.org/jfreereport/index.html
-It is maintained by the Debian Java Maintainers
-<[EMAIL PROTECTED]>.
+Upstream Authors: Thomas Morgner, David Gilbert and others.
-Authors:
- bhagan-pentaho <[EMAIL PROTECTED]>
- Pentaho Build Guy <[EMAIL PROTECTED]>
- Doug Moran <[EMAIL PROTECTED]>
- Frederic Bernard-Payen <[EMAIL PROTECTED]>
- Gretchen Moran <[EMAIL PROTECTED]>
- jdixon-pentaho <[EMAIL PROTECTED]>
- Jake <[EMAIL PROTECTED]>
- Lance Walter <[EMAIL PROTECTED]>
- Marc Batchelor <[EMAIL PROTECTED]>
- Michael D'Amour <[EMAIL PROTECTED]>
- Undathar Adar <[EMAIL PROTECTED]>
- rdaley-pentaho <[EMAIL PROTECTED]>
- Anthony de Shazor <[EMAIL PROTECTED]>
- vq-pentaho <[EMAIL PROTECTED]>
- Will Gorman <[EMAIL PROTECTED]>
- Bill Seyler <[EMAIL PROTECTED]>
- zameur <[EMAIL PROTECTED]>
+Copyright:
- Copyright 2006 Pentaho Corporation. All rights reserved.
- This software was developed by Pentaho Corporation and is provided
- under the terms of the Mozilla Public License, Version 1.1, or any
- later version. You may not use this file except in compliance with the
- license. If you need a copy of the license, please go to
- http://www.mozilla.org/MPL/MPL-1.1.txt.
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
- Software distributed under the Mozilla Public License is distributed on
- an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- implied. Please refer to the license for the specific language
- governing your rights and limitations.
+ This package 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
Added:
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java-doc.docs
===================================================================
---
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java-doc.docs
(rev 0)
+++
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java-doc.docs
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,3 @@
+javadoc
+docs/manual
+docs/devguide/developers-guide
Added:
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java.dirs
===================================================================
---
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java.dirs
(rev 0)
+++
trunk/pentaho-reporting-flow-engine/debian/libpentaho-reporting-flow-engine-java.dirs
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1 @@
+/usr/share/java
Added: trunk/pentaho-reporting-flow-engine/debian/patches/00list
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/patches/00list
(rev 0)
+++ trunk/pentaho-reporting-flow-engine/debian/patches/00list 2008-02-10
00:39:45 UTC (rev 5657)
@@ -0,0 +1,5 @@
+01_libdir
+02_jarnames
+03_source-target-1.3
+04_local_dtd
+05_no_gnujaxp
Deleted:
trunk/pentaho-reporting-flow-engine/debian/patches/01_build.xml_remove_executable_arg.patch
===================================================================
---
trunk/pentaho-reportdesigner/debian/patches/01_build.xml_remove_executable_arg.patch
2008-02-09 15:32:39 UTC (rev 5656)
+++
trunk/pentaho-reporting-flow-engine/debian/patches/01_build.xml_remove_executable_arg.patch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -1,17 +0,0 @@
---- src/build.xml~ 2007-07-10 11:53:22.000000000 +0200
-+++ src/build.xml 2007-07-20 13:00:01.000000000 +0200
-@@ -60,7 +60,6 @@
- debug="true"
- source="1.5"
- target="1.5"
-- executable="${javac1.5.path}"
- compiler="modern"
- fork="true">
- </javac>
-@@ -267,4 +266,4 @@
- <target name="all" depends="createBinaryDistribution,
createSourceDistribution">
- </target>
-
--</project>
-\ No newline at end of file
-+</project>
Added: trunk/pentaho-reporting-flow-engine/debian/patches/01_libdir.dpatch
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/patches/01_libdir.dpatch
(rev 0)
+++ trunk/pentaho-reporting-flow-engine/debian/patches/01_libdir.dpatch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_libdir.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad jfreereport-0.9.0-05~/ant/build.properties
jfreereport-0.9.0-05/ant/build.properties
+--- jfreereport-0.9.0-05~/build.properties 2007-06-13 14:30:51.000000000
+0200
++++ jfreereport-0.9.0-05/build.properties 2007-08-27 22:04:54.000000000
+0200
+@@ -24,7 +24,7 @@
+ # All path settings are relative to the project root directory
+ # (..)
+ #
+-libdir=lib
++libdir=/usr/share/java
+
+ #
+ # If you specify a non-emty string, then dont forget the
Property changes on:
trunk/pentaho-reporting-flow-engine/debian/patches/01_libdir.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/pentaho-reporting-flow-engine/debian/patches/02_jarnames.dpatch
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/patches/02_jarnames.dpatch
(rev 0)
+++ trunk/pentaho-reporting-flow-engine/debian/patches/02_jarnames.dpatch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_jarnames.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad pentaho-reporting-flow-engine-0.9.2~/build.properties
pentaho-reporting-flow-engine-0.9.2/build.properties
+--- pentaho-reporting-flow-engine-0.9.2~/build.properties 2007-12-27
20:34:43.000000000 +0100
++++ pentaho-reporting-flow-engine-0.9.2/build.properties 2007-12-27
20:34:48.000000000 +0100
+@@ -39,22 +39,22 @@
+ # Used libraries ...
+
+ # Used by: core libraries
+-jcommon-jar-file=jcommon-1.0.10.jar
+-jcommon-serializer-jar-file=jcommon-serializer-0.1.0.jar
+-libfonts-jar-file=libfonts-0.3.2.jar
+-libfonts-core-jar-file=libfonts-0.3.2.jar
+-libfonts-itext-jar-file=libfonts-0.3.2.jar
+-liblayout-jar-file=liblayout-0.2.8.jar
+-libloader-jar-file=libloader-0.3.5.jar
+-libxml-jar-file=libxml-0.9.8.jar
+-libformula-jar-file=libformula-0.1.13.jar
+-librepository-jar-file=librepository-0.1.3.jar
+-flute-jar-file=flute-1.3-jfree-20061107.jar
++jcommon-jar-file=jcommon.jar
++jcommon-serializer-jar-file=jcommon-serializer.jar
++libfonts-jar-file=libfonts.jar
++libfonts-core-jar-file=libfonts.jar
++libfonts-itext-jar-file=libfonts.jar
++liblayout-jar-file=liblayout.jar
++libloader-jar-file=libloader.jar
++libxml-jar-file=libxml.jar
++libformula-jar-file=libformula.jar
++librepository-jar-file=librepository.jar
++flute-jar-file=flute-1.3-jfree.jar
+
+ #
+ # Optional libraries
+-pixie-jar-file=optional/pixie-0.8.8.jar
+-commons-logging-jar-file=optional/commons-logging-1.0.4.jar
++pixie-jar-file=optional/pixie.jar
++commons-logging-jar-file=optional/commons-logging.jar
+ oscache-jar-file=optional/oscache-2.3-compat.jar
+
+ # Used by: module-parser
+@@ -62,7 +62,7 @@
+ sac-jar-file=sac.jar
+
+ # Used by: output-pdf
+-itext-jar-file=itext-1.4.jar
++itext-jar-file=itext.jar
+
+ ##############################################################
+ #
Property changes on:
trunk/pentaho-reporting-flow-engine/debian/patches/02_jarnames.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added:
trunk/pentaho-reporting-flow-engine/debian/patches/03_source-target-1.3.dpatch
===================================================================
---
trunk/pentaho-reporting-flow-engine/debian/patches/03_source-target-1.3.dpatch
(rev 0)
+++
trunk/pentaho-reporting-flow-engine/debian/patches/03_source-target-1.3.dpatch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_source-target-1.3.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad pentaho-reporting-flow-engine-0.9.2~/build.properties
pentaho-reporting-flow-engine-0.9.2/build.properties
+--- pentaho-reporting-flow-engine-0.9.2~/build.properties 2007-12-27
20:36:01.000000000 +0100
++++ pentaho-reporting-flow-engine-0.9.2/build.properties 2007-12-27
20:36:10.000000000 +0100
+@@ -17,8 +17,8 @@
+
+ #
+ # Make sure that JDK 1.2 compatible class files are generated
+-build.target=1.2
+-build.source=1.2
++build.target=1.3
++build.source=1.3
+ build.retro.jdk=/opt/jdk1.2.2
+
+ #
Property changes on:
trunk/pentaho-reporting-flow-engine/debian/patches/03_source-target-1.3.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/pentaho-reporting-flow-engine/debian/patches/04_local_dtd.dpatch
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/patches/04_local_dtd.dpatch
(rev 0)
+++ trunk/pentaho-reporting-flow-engine/debian/patches/04_local_dtd.dpatch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_local_dtd.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad jfreereport-0.9.0-05~/docs/devguide/developers-guide.xml
jfreereport-0.9.0-05/docs/devguide/developers-guide.xml
+--- jfreereport-0.9.0-05~/docs/devguide/developers-guide.xml 2005-03-08
18:42:01.000000000 +0100
++++ jfreereport-0.9.0-05/docs/devguide/developers-guide.xml 2007-11-28
14:17:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"; [
++"/usr/share/xml/docbook/schema/dtd/4.3/docbookx.dtd" [
+ <!ENTITY chap1 SYSTEM "chapter1-styleguide.xml">
+ ]>
+ <book>
+diff -urNad jfreereport-0.9.0-05~/docs/manual.xml
jfreereport-0.9.0-05/docs/manual.xml
+--- jfreereport-0.9.0-05~/docs/manual.xml 2007-11-28 13:51:28.000000000
+0100
++++ jfreereport-0.9.0-05/docs/manual.xml 2007-11-28 14:16:42.000000000
+0100
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd";>
++"docbook42.flat.dtd">
+ <book>
+ <bookinfo>
+ <title>JFreeReport Manual</title>
Property changes on:
trunk/pentaho-reporting-flow-engine/debian/patches/04_local_dtd.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/pentaho-reporting-flow-engine/debian/patches/05_no_gnujaxp.dpatch
===================================================================
--- trunk/pentaho-reporting-flow-engine/debian/patches/05_no_gnujaxp.dpatch
(rev 0)
+++ trunk/pentaho-reporting-flow-engine/debian/patches/05_no_gnujaxp.dpatch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -0,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_no_gnujaxp.dpatch by Rene Engelhard <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad pentaho-reporting-flow-engine-0.9.2~/build.properties
pentaho-reporting-flow-engine-0.9.2/build.properties
+--- pentaho-reporting-flow-engine-0.9.2~/build.properties 2007-12-27
23:30:35.000000000 +0100
++++ pentaho-reporting-flow-engine-0.9.2/build.properties 2007-12-27
23:30:43.000000000 +0100
+@@ -58,7 +58,6 @@
+ oscache-jar-file=optional/oscache-2.3-compat.jar
+
+ # Used by: module-parser
+-jaxp-jar-file=gnujaxp.jar
+ sac-jar-file=sac.jar
+
+ # Used by: output-pdf
+diff -urNad pentaho-reporting-flow-engine-0.9.2~/build.xml
pentaho-reporting-flow-engine-0.9.2/build.xml
+--- pentaho-reporting-flow-engine-0.9.2~/build.xml 2007-10-18
08:20:01.000000000 +0200
++++ pentaho-reporting-flow-engine-0.9.2/build.xml 2007-12-27
23:30:56.000000000 +0100
+@@ -54,13 +54,11 @@
+ <isClassAvailableEx class-name="org.jfree.xmlns.LibXmlInfo"
+ property-name="lib.xmlns.present">
+ <test-classpath>
+- <pathelement location="${libdir}/${jaxp-jar-file}"/>
+ <pathelement location="${libdir}/${libxml-jar-file}"/>
+ <pathelement location="${libdir}/${jcommon-jar-file}"/>
+ <pathelement location="${libdir}/${libloader-jar-file}"/>
+ </test-classpath>
+ <additional-tests>
+- <available file="${libdir}/${jaxp-jar-file}"/>
+ <available file="${libdir}/${libxml-jar-file}"/>
+ <available file="${libdir}/${jcommon-jar-file}"/>
+ </additional-tests>
+@@ -145,7 +143,6 @@
+ <pathelement location="${libdir}/${liblayout-jar-file}"/>
+ <pathelement location="${libdir}/${libformula-jar-file}"/>
+ <pathelement location="${libdir}/${libxml-jar-file}"/>
+- <pathelement location="${libdir}/${jaxp-jar-file}"/>
+ <pathelement location="${libdir}/${librepository-jar-file}"/>
+ <pathelement location="${libdir}/${flute-jar-file}"/>
+ <pathelement location="${libdir}/${libfonts-core-jar-file}"/>
+@@ -188,7 +185,6 @@
+ <pathelement location="${libdir}/${liblayout-jar-file}"/>
+ <pathelement location="${libdir}/${libformula-jar-file}"/>
+ <pathelement location="${libdir}/${libxml-jar-file}"/>
+- <pathelement location="${libdir}/${jaxp-jar-file}"/>
+ <pathelement location="${libdir}/${librepository-jar-file}"/>
+ <pathelement location="${libdir}/${flute-jar-file}"/>
+ <pathelement location="${libdir}/${libfonts-core-jar-file}"/>
+@@ -230,7 +226,6 @@
+ <pathelement location="${libdir}/${liblayout-jar-file}"/>
+ <pathelement location="${libdir}/${libformula-jar-file}"/>
+ <pathelement location="${libdir}/${libxml-jar-file}"/>
+- <pathelement location="${libdir}/${jaxp-jar-file}"/>
+ <pathelement location="${libdir}/${librepository-jar-file}"/>
+ <pathelement location="${libdir}/${flute-jar-file}"/>
+ <pathelement location="${libdir}/${libfonts-core-jar-file}"/>
Property changes on:
trunk/pentaho-reporting-flow-engine/debian/patches/05_no_gnujaxp.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted:
trunk/pentaho-reporting-flow-engine/debian/patches/10_ReportDialog_comment_WindowsLookAndFeel.patch
===================================================================
---
trunk/pentaho-reportdesigner/debian/patches/10_ReportDialog_comment_WindowsLookAndFeel.patch
2008-02-09 15:32:39 UTC (rev 5656)
+++
trunk/pentaho-reporting-flow-engine/debian/patches/10_ReportDialog_comment_WindowsLookAndFeel.patch
2008-02-10 00:39:45 UTC (rev 5657)
@@ -1,11 +0,0 @@
---- src/org/pentaho/reportdesigner/crm/report/ReportDialog.java~
2007-07-20 11:42:26.000000000 +0000
-+++ src/org/pentaho/reportdesigner/crm/report/ReportDialog.java
2007-07-20 11:51:35.000000000 +0000
-@@ -506,7 +506,7 @@
- {
- UIManager.put("ClassLoader",
LookUtils.class.getClassLoader());//NON-NLS
- UIManager.put("jgoodies.popupDropShadowEnabled",
Boolean.FALSE);//NON-NLS
-- UIManager.setLookAndFeel(new WindowsLookAndFeel());
-+ //UIManager.setLookAndFeel(new WindowsLookAndFeel());
- }
- else if (osName != null &&
(osName.toLowerCase().contains("mac")))//NON-NLS
- {
Modified: trunk/pentaho-reporting-flow-engine/debian/rules
===================================================================
--- trunk/pentaho-reportdesigner/debian/rules 2008-02-09 15:32:39 UTC (rev
5656)
+++ trunk/pentaho-reporting-flow-engine/debian/rules 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -1,33 +1,75 @@
#!/usr/bin/make -f
-# debian/rules file for libpentaho-reportdesigner-java (uses cdbs)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/ant.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-JAVA_HOME := /usr/lib/jvm/java-gcj
+# Build
+# Choose the VM
+export JAVA_HOME ?= /usr/lib/jvm/java-gcj
+export JAVA=$(JAVA_HOME)/bin/java
+export JAVAC=$(JAVA_HOME)/bin/javac
+export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.
-include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
- with_gcj_native := yes
-endif
+export CURDIR=$(shell pwd)
+export SRCDIR=$(CURDIR)
+export LIBRARY=pentaho-reporting-flow-engine
+export VERSION=0.9.2
-DEB_JARS := looks
-DEB_ANT_BUILD_TARGET := createBinaryDistribution
-DEB_ANT_BUILDFILE := src/build.xml
+include /usr/share/dpatch/dpatch.make
-install/libpentaho-reportdesigner-java::
-# mkdir -p debian/libxerces2-java/usr/share/java
-# install -m 644 build/xercesImpl.jar
debian/libxerces2-java/usr/share/java/
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ touch configure-stamp
-ifeq ($(with_gcj_native),yes)
-install/libpentaho-reportdesigner-java-gcj::
install/libpentaho-reportdesigner-java
- dh_nativejava -plibpentaho-reportdesigner-java-gcj
-endif
-clean::
- rm -rf build
+build: configure build-stamp
+build-stamp:
+ dh_testdir
+
+ ant compile
+ ant javadoc
+ cd docs && db2html manual.xml
+ cd docs/devguide && db2html developers-guide.xml
+
+ touch build-stamp
-binary-post-install/libpentaho-reportdesigner-java-doc::
- dh_install -plibpentaho-reportdesigner-java-doc build/docs/javadocs/* \
- usr/share/doc/libpentaho-reportdesigner-java-doc/api
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ -rm -f build-stamp
+ -rm -f configure-stamp
+ rm -f $(LIBRARY)-$(VERSION).jar
+ rm -rf docs/manual
+ rm -rf docs/devguide/developers-guide
+ rm -rf javadoc
+ dh_clean
+
+install: build javadoc
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ install -m 644 $(SRCDIR)/$(LIBRARY)-$(VERSION).jar \
+ debian/lib$(LIBRARY)-java/usr/share/java/
+ ln -s $(LIBRARY)-$(VERSION).jar
debian/lib$(LIBRARY)-java/usr/share/java/$(LIBRARY).jar
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installchangelogs
+ dh_link
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+binary: binary-indep
+
+.PHONY: binary binary-indep clean
Deleted: trunk/pentaho-reporting-flow-engine/debian/watch
===================================================================
--- trunk/pentaho-reportdesigner/debian/watch 2008-02-09 15:32:39 UTC (rev
5656)
+++ trunk/pentaho-reporting-flow-engine/debian/watch 2008-02-10 00:39:45 UTC
(rev 5657)
@@ -1,8 +0,0 @@
-# watch control file for uscan
-version=2
-# Options
-
-# Site Version Script
-opts=dversionmangle=s/\.dfsg\.\d+$// \
-
http://heanet.dl.sourceforge.net/sourceforge/pentaho/PentahoReportDesignerSource-(.*)\.zip
debian uupdate
-
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
