--- libformula-1.1.7.dfsg.orig/build.xml
+++ libformula-1.1.7.dfsg/build.xml
@@ -22,7 +22,7 @@
 	<!-- Import the common_build.xml file which contains all the default tasks -->
 	<import file="${common.build.file}"/>
 
-        <property name="javacchome" value="/home/src/ext/javacc"/>
+        <property name="javacchome" value="/usr/share/java"/>
     <!--
       AS STATED ABOVE, THE ONLY TASKS THAT SHOULD EXIST IN THIS BUILD FILE ARE
       THE TASKS THAT NEED TO DIFFER FROM THE DEFAULT IMPLEMENTATION OF THE TASKS
@@ -34,7 +34,7 @@
     <javacc
         target="source/org/pentaho/reporting/libraries/formula/parser/Parser.jj"
         outputdirectory="source/org/pentaho/reporting/libraries/formula/parser"
-        javacchome="${javacchome}"
+        javacchome="/usr/share/java"
     />
   </target>
 
--- libformula-1.1.7.dfsg.orig/source/org/pentaho/reporting/libraries/formula/parser/FormulaParseException.java
+++ libformula-1.1.7.dfsg/source/org/pentaho/reporting/libraries/formula/parser/FormulaParseException.java
@@ -68,8 +68,9 @@
     super(error.getMessage());
     this.error = error;
     this.parent = error;
-    this.parsePosition = new ParsePosition
-        (error.getErrorLine(), error.getErrorColumn(), error.getErrorLine(), error.getErrorColumn());
+//    this.parsePosition = new ParsePosition
+//        (error.getErrorLine(), error.getErrorColumn(), error.getErrorLine(), error.getErrorColumn());
+    this.parsePosition = getParsePosition();
   }
 
   public TokenMgrError getError()
--- libformula-1.1.7.dfsg.orig/debian/ant.properties
+++ libformula-1.1.7.dfsg/debian/ant.properties
@@ -0,0 +1,3 @@
+antcontrib.build.cache.dir=/usr/share/java
+build.target=1.5
+build.source=1.5
--- libformula-1.1.7.dfsg.orig/debian/watch
+++ libformula-1.1.7.dfsg/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/jfreereport/libformula-([[:digit:].]+)\.tar\.gz
--- libformula-1.1.7.dfsg.orig/debian/dirs
+++ libformula-1.1.7.dfsg/debian/dirs
@@ -0,0 +1 @@
+usr/share/java
--- libformula-1.1.7.dfsg.orig/debian/libformula-java-doc.javadoc
+++ libformula-1.1.7.dfsg/debian/libformula-java-doc.javadoc
@@ -0,0 +1 @@
+bin/javadoc/docs/api /usr/share/doc/libformula-java/api
--- libformula-1.1.7.dfsg.orig/debian/copyright
+++ libformula-1.1.7.dfsg/debian/copyright
@@ -0,0 +1,23 @@
+This package was debianized by Rene Engelhard <rene@debian.org>  
+Wed Aug 22 01:23:45 +0200
+
+It was downloaded from <http://sourceforge.net/projects/jfreereport/>
+
+Upstream Authors: Thomas Morgner, David Gilbert and others
+
+Copyright:
+
+    (C) Copyright 2006, by Pentaho Corporation and Contributors.
+
+    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.
+
+    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.
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
--- libformula-1.1.7.dfsg.orig/debian/rules
+++ libformula-1.1.7.dfsg/debian/rules
@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+# debian/rules file for libfonts-java (uses cdbs)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-nodeps.jar jcommon libbase commons-logging junit ant-contrib ant-junit
+DEB_ANT_BUILD_TARGET := compile-jj compile jar javadoc
+DEB_ANT_CHECK_TARGET := test
+
+DEB_UPSTREAM_VERSION := 1.1-SNAPSHOT
+
+clean::
+	-rm -rf build
+	-rm -rf javadoc
+	-rm -f libformula-$(DEB_UPSTREAM_VERSION).jar
+	# don't use them, go sure
+	-rm -f lib/* lib/optional/* test-lib/*
+	for i in TokenMgrError.java ParseException.java Token.java JavaCharStream.java \
+		GeneratedFormulaParser.java GeneratedFormulaParserConstants.java \
+		GeneratedFormulaParserTokenManager.java; do \
+		rm -f source/org/pentaho/reporting/libraries/formula/parser/$$i; \
+	done
+
+install/libformula-java::
+	install -m 644 dist/libformula-$(DEB_UPSTREAM_VERSION).jar debian/libformula-java/usr/share/java/libformula-$(DEB_UPSTREAM_VERSION).jar
+	ln -s libformula-$(DEB_UPSTREAM_VERSION).jar debian/libformula-java/usr/share/java/libformula.jar
+	jh_classpath -plibformula-java --classpath="/usr/share/java/jcommon.jar" debian/libformula-java/usr/share/java/libformula-$(DEB_UPSTREAM_VERSION).jar
+	jh_depends
+
+install/libformula-java-doc::
+	jh_installjavadoc
+
--- libformula-1.1.7.dfsg.orig/debian/libformula-java-doc.doc-base.javadoc
+++ libformula-1.1.7.dfsg/debian/libformula-java-doc.doc-base.javadoc
@@ -0,0 +1,9 @@
+Document: libformula-java-doc
+Title: API JavaDoc for libformula-java-doc
+Author: 
+Abstract: This the API JavaDoc for libformula-java-doc
+Section: Programming/Java
+
+Format: HTML
+Index: //usr/share/doc/libformula-java/api
+Files: //usr/share/doc/libformula-java/api/*.html
--- libformula-1.1.7.dfsg.orig/debian/compat
+++ libformula-1.1.7.dfsg/debian/compat
@@ -0,0 +1 @@
+5
--- libformula-1.1.7.dfsg.orig/debian/changelog
+++ libformula-1.1.7.dfsg/debian/changelog
@@ -0,0 +1,65 @@
+libformula (1.1.7.dfsg-2) unstable; urgency=low
+
+  * merge libbase 1.1.6-2 changes 
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 01 Nov 2011 15:06:17 +0000
+
+libformula (1.1.7.dfsg-1) unstable; urgency=low
+
+  * remove test-lib/junit-3.8.1.jar
+  * build-depend on junit; prepare to and run ant test
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 27 Sep 2011 22:31:57 +0000
+
+libformula (1.1.7-1) unstable; urgency=low
+
+  * New upstream release 
+  * switch back to Debian Java Maintainers, me as Uploader
+  * remove JRE depends
+  * add classpath to jar using jh_classpath
+  * use jh_depends / ${java:Depends} 
+
+ -- Rene Engelhard <rene@debian.org>  Sun, 25 Sep 2011 15:51:54 +0000
+
+libformula (0.1.14-4) unstable; urgency=low
+
+  * QA upload.
+  * Orphaning package.
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 07 Aug 2011 18:52:07 +0200
+
+libformula (0.1.14-3) unstable; urgency=low
+
+  * (Build-)Depends on default-jdk.
+  * Build Java 5-compatible class files.
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror@gmx.de>  Thu, 24 Sep 2009 11:28:59 +0200
+
+libformula (0.1.14-2) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * (Build-)depend on default-jre/-jdk.
+
+  [ Torsten Werner ]
+  * Add myself to Uploaders.
+  * Add missing Depends: ${misc:Depends}.
+  * Update Build-Depends: debhelper (>= 5).
+  * Add Vcs-* headers.
+  * Update Standards-Version: 3.8.2.
+  * Change Section: java.
+
+ -- Torsten Werner <twerner@debian.org>  Sun, 02 Aug 2009 23:04:52 +0200
+
+libformula (0.1.14-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 25 Apr 2008 18:21:41 +0200
+
+libformula (0.1.8-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Rene Engelhard <rene@debian.org>  Sat, 06 Oct 2007 16:10:58 +0200
--- libformula-1.1.7.dfsg.orig/debian/.javahelper_clean
+++ libformula-1.1.7.dfsg/debian/.javahelper_clean
@@ -0,0 +1,3 @@
+debian/libformula-java-doc.doc-base.javadoc
+debian/libformula-java-doc.doc-base.javadoc
+debian/libformula-java-doc.doc-base.javadoc
--- libformula-1.1.7.dfsg.orig/debian/control
+++ libformula-1.1.7.dfsg/debian/control
@@ -0,0 +1,38 @@
+Source: libformula
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Rene Engelhard <rene@debian.org>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10), javacc, ant-optional, libbase-java, libcommons-logging-java, javahelper, junit, ant-contrib
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libformula
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libformula/
+
+Package: libformula-java
+Architecture: all
+Depends: libjcommon-java (>= 1.0.10-1),
+ ${misc:Depends}
+Suggests: libformula-java-doc
+Description: Excel(tm) style formula expressions library
+ LibFormula provides Excel-Style-Expressions. The implementation provided
+ here is very generic and can be used in any application that needs to
+ compute formulas.
+ .
+ The syntax is based on the OpenFormula-specifications, but with carefully
+ pruning away all the spreadsheet specific parts (like references to
+ cell-ranges).
+
+Package: libformula-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: Excel(tm) style formula expressions library
+ LibFormula provides Excel-Style-Expressions. The implementation provided
+ here is very generic and can be used in any application that needs to
+ compute formulas.
+ .
+ The syntax is based on the OpenFormula-specifications, but with carefully
+ pruning away all the spreadsheet specific parts (like references to
+ cell-ranges).
+ .
+ This package contains the Javadoc.
--- libformula-1.1.7.dfsg.orig/debian/libformula-java-doc.docs
+++ libformula-1.1.7.dfsg/debian/libformula-java-doc.docs
@@ -0,0 +1 @@
+javadoc/*