--- libjibx1.1-java-1.1.6a.orig/debian/control
+++ libjibx1.1-java-1.1.6a/debian/control
@@ -0,0 +1,50 @@
+Source: libjibx1.1-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Eric Lavarde <deb@zorglub.s.bawue.de>, Michael Koch <konqueror@gmx.de>, Steffen Moeller <moeller@debian.org>
+Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt
+Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java, libqdox-java, libdom4j-java
+Standards-Version: 3.8.4
+Homepage: http://jibx.sf.net/
+Vcs-svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libjibx-java/branch-1.1/
+Vcs-browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjibx-java/branch-1.1/
+
+Package: libjibx1.1-java
+Architecture: all
+Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends}
+Recommends: libqdox-java, libjdom-java, libdom4j-java
+Suggests: java-virtual-machine, libjibx1.1-java-doc|libjibx-java-doc
+Conflicts: libjibx-java (<= 1.0.2-1)
+Description: Framework for binding XML data to Java objects
+ JiBX lets you work with data from XML documents using your own class
+ structures. The JiBX framework handles all the details of converting
+ your data to and from XML based on your instructions. JiBX is designed
+ to perform the translation between internal data structures and XML
+ with very high efficiency, but still allows you a high degree of
+ control over the translation process.
+
+Package: libjibx-java
+Architecture: all
+Depends: libjibx1.1-java, ${misc:Depends}
+Description: Framework for binding XML data to Java objects
+ JiBX lets you work with data from XML documents using your own class
+ structures. The JiBX framework handles all the details of converting
+ your data to and from XML based on your instructions. JiBX is designed
+ to perform the translation between internal data structures and XML
+ with very high efficiency, but still allows you a high degree of
+ control over the translation process.
+ .
+ This package provides the jibx.jar file as a symbolic link to the
+ versioned jar.
+
+Package: libjibx1.1-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: iceweasel | firefox | www-browser
+Provides: libjibx-java-doc
+Suggests: libjibx-java
+Description: Documentation for libjibx-java
+ This package contains documentation, javadocs and tutorial code for JiBX
+ version 1.1.
--- libjibx1.1-java-1.1.6a.orig/debian/compat
+++ libjibx1.1-java-1.1.6a/debian/compat
@@ -0,0 +1 @@
+7
--- libjibx1.1-java-1.1.6a.orig/debian/README.source
+++ libjibx1.1-java-1.1.6a/debian/README.source
@@ -0,0 +1,3 @@
+Two patches, both to build/build.xml
+ * instruct the inclusion of bcel to the classpath
+ * add a "clean" target to build/build.xml (not ultimately required)
--- libjibx1.1-java-1.1.6a.orig/debian/changelog
+++ libjibx1.1-java-1.1.6a/debian/changelog
@@ -0,0 +1,73 @@
+libjibx1.1-java (1.1.6a-1) unstable; urgency=low
+
+  * Adapting concept for versioned binaries for version 1.1.6a.
+
+ -- Steffen Moeller <moeller@debian.org>  Mon, 01 Feb 2010 03:54:46 +0100
+
+libjibx1.2-java (1.2.1-1) unstable; urgency=low
+
+  [ Eric Lavarde ]
+  * Remove dependency on gjdoc.
+  * Enhance clean target to really cleanup back to original.
+  * Move to debhelper compat 7.
+  * Add copyright clarifications based on feedback from ftpmaster.
+
+  [ Michael Koch ]
+  * New upstream release (Closes: #526611).
+  * Reworked debian/rules and removed debian/install and
+    debian/links.
+  * Build-Depends on liblog4j1.2-java.
+  * Moved package to section 'java'.
+  * Moved ant and openjdk-6-jdk to Build-Depends.
+  * Make package Depends on default-jre-headless | java2-runtime-headless.
+  * Updated Standards-Version to 3.8.3.
+
+  [ Steffen Moeller ]
+  * Introduced version-specific packages
+  * Updated Standards-Version to 3.8.4.
+  * added "clean" target to build.xml
+
+ -- Michael Koch <konqueror@gmx.de>  Sun, 27 Sep 2009 12:32:59 +0200
+
+libjibx-java (1.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/control:
+    + Build-Depend on openjdk-6-jdk instead of sun-java6-jdk.
+    + Depend on openjdk-6-jre instead of sun-java6-jre.
+    + Thanks to the above, move to main!
+    + Add Homepage field.
+    + Add firefox as alternative to iceweasel (for potential Ubuntu
+      integration).
+    + Updated Standards-Version to 3.8.0
+  * debian/rules:
+    + Set JAVA_HOME_DIRS to the correct value for openjdk-6-jdk.
+  * debian/copyright:
+    + slighthly modify to make lintian happy.
+
+ -- Eric Lavarde <deb@zorglub.s.bawue.de>  Sat, 21 Feb 2009 09:13:28 +0100
+
+libjibx-java (1.0.1-2) unstable; urgency=low
+
+  [ Michael Bienia ]
+  * debian/control:
+    + Build-Depend on sun-java6-jdk instead of ibm-j2sdk1.6 | sun-j2sdk1.4.
+    + Depend on sun-java6-jre instead of sun-j2re1.4.
+    + Recommend iceweasel instead of mozilla.
+  * debian/rules:
+    + Set JAVA_HOME_DIRS to the correct value for sun-java6-jdk.
+
+  [ Michael Koch ]
+  * Fixed clean target to make it possible to build the package two times in a
+    row.
+  * Moved debhelper and cdbs to Build-Depends.
+  * Updated Standards-Version to 3.7.3.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror@gmx.de>  Fri, 25 Jan 2008 23:30:33 +0100
+
+libjibx-java (1.0.1-1) unstable; urgency=low
+
+  * Initial Release (closes: Bug#354374).
+
+ -- Eric Lavarde <deb@zorglub.s.bawue.de>  Sat,  4 Mar 2006 15:20:17 +0200
--- libjibx1.1-java-1.1.6a.orig/debian/docs
+++ libjibx1.1-java-1.1.6a/debian/docs
@@ -0,0 +1 @@
+readme.html
--- libjibx1.1-java-1.1.6a.orig/debian/rules
+++ libjibx1.1-java-1.1.6a/debian/rules
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_COMPRESS_EXCLUDE := .class
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3
+DEB_ANT_BUILD_TARGET := setrelease current devdoc
+DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION)
+DEB_BUILDDIR         := build
+DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
+
+DEB_UPSTREAM_VERSION_2 := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
+
+clean:: 
+	-rm -fr build/api build/classes lib/*
+
+install/libjibx$(DEB_UPSTREAM_VERSION_2)-java::
+	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \
+		dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar \
+								usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \
+		dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar \
+								usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \
+		dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar \
+								usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \
+	fi
+
+install/libjibx-java::
+	dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar
+	dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar
+	dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar
--- libjibx1.1-java-1.1.6a.orig/debian/orig-tar.exclude
+++ libjibx1.1-java-1.1.6a/debian/orig-tar.exclude
@@ -0,0 +1,3 @@
+build/api
+build/classes
+lib/*.jar
--- libjibx1.1-java-1.1.6a.orig/debian/libjibx1.1-java-doc.install
+++ libjibx1.1-java-1.1.6a/debian/libjibx1.1-java-doc.install
@@ -0,0 +1 @@
+docs/* usr/share/doc/libjibx1.1-java-doc
--- libjibx1.1-java-1.1.6a.orig/debian/orig-tar.sh
+++ libjibx1.1-java-1.1.6a/debian/orig-tar.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+echo $*
+DIR=libjibx-java-$2
+TAR=../libjibx-java_$2.orig.tar.gz
+
+# clean up the upstream tarball
+unzip $3
+mv jibx $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
+    if [ ".." != "$origDir" ]; then 
+	mv $3 $origDir
+	echo "moved $3 to $origDir"
+    fi
+fi
+
+exit 0
--- libjibx1.1-java-1.1.6a.orig/debian/dirs
+++ libjibx1.1-java-1.1.6a/debian/dirs
@@ -0,0 +1 @@
+usr/share/java
--- libjibx1.1-java-1.1.6a.orig/debian/watch
+++ libjibx1.1-java-1.1.6a/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/_/./g \
+ http://sf.net/jibx/jibx_(1_1_[a-z0-9_]+)\.zip debian debian/orig-tar.sh
--- libjibx1.1-java-1.1.6a.orig/debian/libjibx1.1-java-doc.doc-base
+++ libjibx1.1-java-1.1.6a/debian/libjibx1.1-java-doc.doc-base
@@ -0,0 +1,10 @@
+Document: libjibx1.1-java-doc
+Title: Programmer API for libjibx-java version 1.1.x
+Author: Dennis Sosnoski <dsosnoski at users.sourceforge.net>
+Abstract: The programmer API of JiBX, a framework for
+ binding XML data to Java objects.
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libjibx1.1-java-doc/api/index.html
+Files: /usr/share/doc/libjibx1.1-java-doc/api/*
--- libjibx1.1-java-1.1.6a.orig/debian/copyright
+++ libjibx1.1-java-1.1.6a/debian/copyright
@@ -0,0 +1,39 @@
+This package was debianized by Eric Lavarde <deb@zorglub.s.bawue.de> on
+Mon,  1 Aug 2005 21:00:17 +0200.
+
+It was downloaded from http://jibx.sf.net/
+
+Copyright (c) 2003-2005, Dennis M. Sosnoski <dsosnoski at users.sourceforge.net>
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of JiBX nor the names of its contributors may be used
+   to endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+./build/src/org/jibx/binding/ant/CompileTask.java
+Copyright (c) 2003, Andrew J. Glover (same license as above)
+
+
+License statements in ./docs/jibx-license.html for the dependencies
+BCEL and XPP3 can be safely ignored.
--- libjibx1.1-java-1.1.6a.orig/debian/libjibx1.1-java-doc.links
+++ libjibx1.1-java-1.1.6a/debian/libjibx1.1-java-doc.links
@@ -0,0 +1 @@
+usr/share/doc/libjibx1.1-java-doc/api usr/share/doc/libjibx1.1-java/api
--- libjibx1.1-java-1.1.6a.orig/debian/libjibx1.1-java-doc.docs
+++ libjibx1.1-java-1.1.6a/debian/libjibx1.1-java-doc.docs
@@ -0,0 +1,2 @@
+readme.html
+tutorial/
--- libjibx1.1-java-1.1.6a.orig/debian/README.Debian
+++ libjibx1.1-java-1.1.6a/debian/README.Debian
@@ -0,0 +1,7 @@
+The package provides "versioned" packages with the real .jar files
+and an unversioned package that supplies merely a symbolic link to
+the .jar.  This way, later versions will replace earlier packages and
+allow reverse-dependent projects to remain their functionality.
+
+Versions 1.0.2, 1.1.6 and 1.2.1 of jibx are sadly not upwards
+compatible.
--- libjibx1.1-java-1.1.6a.orig/debian/patches/series
+++ libjibx1.1-java-1.1.6a/debian/patches/series
@@ -0,0 +1 @@
+01_build_xml.patch -p0
--- libjibx1.1-java-1.1.6a.orig/debian/patches/01_build_xml.patch
+++ libjibx1.1-java-1.1.6a/debian/patches/01_build_xml.patch
@@ -0,0 +1,101 @@
+Index: build/build.xml
+===================================================================
+--- build/build.xml.orig	2010-02-02 01:32:15.000000000 +0100
++++ build/build.xml	2010-02-02 02:02:11.000000000 +0100
+@@ -60,19 +60,22 @@
+     <pathelement location="${binddest}"/>
+     <pathelement location="${rundest}"/>
+     <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,jibx*.jar"/>
++    <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+   </path>
+   <path id="binding-classpath">
+     <pathelement location="${binddest}"/>
+     <pathelement location="${rundest}"/>
+     <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,jibx*.jar"/>
++    <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+   </path>
+   <path id="javadoc-classpath">
+     <fileset dir="${lib}" includes="*.jar"/>
++    <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+   </path>
+   
+   <!-- Optional components -->
+-  <available property="dom4j" file="${lib}/dom4j.jar"/>
+-  <available property="jdom" file="${lib}/jdom.jar"/>
++  <available property="dom4j" file="/usr/share/java/dom4j.jar"/>
++  <available property="jdom" file="/usr/share/java/jdom1.jar"/>
+ 
+   <!-- Delete binding class files -->
+   <target name="clean-bind">
+@@ -143,6 +146,7 @@
+       <fileset dir="${lib}" includes="*.jar" excludes="jibx*.jar"/>
+       <fileset dir="${lib}"
+           includes="${bindname}.jar,${runname}.jar,${extrasname}.jar"/>
++      <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+     </path>
+   </target>
+   
+@@ -271,6 +275,7 @@
+     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+       </classpath>
+     </taskdef>
+     <bind>
+@@ -307,6 +312,7 @@
+       <classpath>
+         <pathelement path="${testdest}"/>
+         <fileset dir="${lib}" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+       </classpath>
+       
+       <!-- This is the full set of crossbar tests with most combinations included -->
+@@ -490,6 +496,7 @@
+     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+       </classpath>
+     </taskdef>
+     <bind load="true">
+@@ -917,6 +924,7 @@
+     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,dom4j.jar" />
+       </classpath>
+     </taskdef>
+     <bind>
+@@ -962,6 +970,7 @@
+     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,dom4j.jar" />
+       </classpath>
+     </taskdef>
+     <bind>
+@@ -1048,6 +1057,7 @@
+     <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,dom4j.jar" />
+       </classpath>
+     </taskdef>
+     <bind>
+@@ -1189,6 +1199,7 @@
+       deprecation="on">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,${extrasname}.jar,org.eclipse.*.jar,jibx-genbinding.jar,jibx-genschema.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+       </classpath>
+     </javac>
+     <jar jarfile="${lib}/jibx-genbinding.jar" basedir="${toolsdest}">
+@@ -1211,6 +1222,7 @@
+       deprecation="on">
+       <classpath>
+         <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,${extrasname}.jar,org.eclipse.*.jar,jibx-genbinding.jar,jibx-genschema.jar"/>
++        <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
+       </classpath>
+     </javac>
+     <jar jarfile="${lib}/jibx-genschema.jar" basedir="${toolsdest}">
