[pkg-java] r11487 - in trunk/libjibx-java/branch-1.1/debian: . patches
Steffen Möller
moeller at alioth.debian.org
Tue Feb 2 01:15:50 UTC 2010
Author: moeller
Date: 2010-02-02 01:15:44 +0000 (Tue, 02 Feb 2010)
New Revision: 11487
Added:
trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.doc-base
trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.docs
trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install
trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.links
Removed:
trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base
trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs
trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install
trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links
trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch
Modified:
trunk/libjibx-java/branch-1.1/debian/control
trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch
trunk/libjibx-java/branch-1.1/debian/patches/series
trunk/libjibx-java/branch-1.1/debian/rules
Log:
1.1.6a of jibx
Modified: trunk/libjibx-java/branch-1.1/debian/control
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/control 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/control 2010-02-02 01:15:44 UTC (rev 11487)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>
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
+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/
@@ -13,7 +13,8 @@
Package: libjibx1.1-java
Architecture: all
Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends}
-Suggests: java-virtual-machine, libjibx-java-doc
+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
@@ -42,6 +43,8 @@
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.
+ This package contains documentation, javadocs and tutorial code for JiBX
+ version 1.1.
Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.doc-base (from rev 11482, trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base)
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.doc-base (rev 0)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.doc-base 2010-02-02 01:15:44 UTC (rev 11487)
@@ -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/*
Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.docs (from rev 11482, trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs)
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.docs (rev 0)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.docs 2010-02-02 01:15:44 UTC (rev 11487)
@@ -0,0 +1,2 @@
+readme.html
+tutorial/
Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install (from rev 11482, trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install)
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install (rev 0)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.install 2010-02-02 01:15:44 UTC (rev 11487)
@@ -0,0 +1,2 @@
+docs/* usr/share/doc/libjibx1.1-java-doc
+build/api usr/share/doc/libjibx1.1-java-doc
Copied: trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.links (from rev 11482, trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links)
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.links (rev 0)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.1-java-doc.links 2010-02-02 01:15:44 UTC (rev 11487)
@@ -0,0 +1 @@
+usr/share/doc/libjibx1.1-java-doc/api usr/share/doc/libjibx1.1-java/api
Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.doc-base 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1,10 +0,0 @@
-Document: libjibx1.2-java-doc
-Title: Programmer API for libjibx-java version 1.2.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.2-java-doc/api/index.html
-Files: /usr/share/doc/libjibx1.2-java-doc/api/*
Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.docs 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1,2 +0,0 @@
-readme.html
-tutorial/
Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.install 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1,2 +0,0 @@
-docs/* usr/share/doc/libjibx1.2-java-doc
-build/api usr/share/doc/libjibx1.2-java-doc
Deleted: trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/libjibx1.2-java-doc.links 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1 +0,0 @@
-usr/share/doc/libjibx1.2-java-doc/api usr/share/doc/libjibx1.2-java/api
Modified: trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/patches/01_build_xml.patch 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1,42 +1,101 @@
---- build/build.xml 2009-09-27 22:42:46.000000000 +0200
-+++ build/build.xml.orig 2009-09-27 22:42:24.000000000 +0200
-@@ -59,6 +59,7 @@
- <!-- Common classpaths -->
- <path id="support-classpath">
+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" />
++ <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 -->
-@@ -232,12 +233,14 @@
- deprecation="on">
+- <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" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,${schemaname}.jar,${toolsname}.jar"/>
-+ <fileset dir="/usr/share/java" includes="log4j-1.2.jar" />
+ <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>
- </javac>
- <java classname="org.jibx.binding.Compile" fork="yes" failonerror="true">
+ </taskdef>
+ <bind>
+@@ -307,6 +312,7 @@
<classpath>
- <pathelement path="${schemadest}"/>
- <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,${schemaname}.jar,${toolsname}.jar"/>
-+ <fileset dir="/usr/share/java" includes="bcel.jar" />
+ <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>
- <arg value="${src}/schema-noprefix-binding.xml"/>
- <arg value="${src}/schema-xsprefix-binding.xml"/>
-@@ -1261,6 +1264,7 @@
- <bottom><table width='80%%'><tr><td width='50%%'><p align='center'><a href='http://www.jibx.org/' target='_top'><font size='3'><b>Project Web Site</b></font></a></td><td width='50%%'><p align='center'></td></tr></table></bottom>
+
+ <!-- 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" />
++ <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.jar,qdox.jar,jdom1.jar,dom4j.jar" />
</classpath>
- </javadoc>
- </target>
-@@ -1364,7 +1367,7 @@
-
- <!-- Intermediate targets, not to be run directly. -->
- <target name="build-jibx" depends="compile-run,compile-bind,compile-extras"/>
-- <target name="tojars" depends="build-jibx,jar-run,jar-bind,jar-extras,jar-schema,jar-tools"/>
-+ <target name="tojars" depends="build-jibx,jar-run,jar-bind,jar-extras,jar-schema"/>
-
- <!-- Targets for building and testing the framework. -->
- <target name="debug" depends="setdebug,build-jibx"/>
+ </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}">
Deleted: trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/patches/build_xml_clean_target.patch 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1,14 +0,0 @@
---- build/build.xml.orig 2010-02-01 02:19:07.000000000 +0100
-+++ build/build.xml 2010-02-01 02:22:51.000000000 +0100
-@@ -66,6 +66,11 @@
- <available property="dom4j" file="${lib}/dom4j.jar"/>
- <available property="jdom" file="${lib}/jdom.jar"/>
-
-+ <!-- Clean Added to help debian/rules -->
-+ <target name="clean">
-+ <delete quiet="true" dir="classes"/>
-+ </target>
-+
- <!-- Set options for release build -->
- <target name="setrelease">
- <property name="optimize" value="on"/>
Modified: trunk/libjibx-java/branch-1.1/debian/patches/series
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/patches/series 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/patches/series 2010-02-02 01:15:44 UTC (rev 11487)
@@ -1,2 +1 @@
-build_xml_clean_target.patch -p0
01_build_xml.patch -p0
Modified: trunk/libjibx-java/branch-1.1/debian/rules
===================================================================
--- trunk/libjibx-java/branch-1.1/debian/rules 2010-02-01 22:53:05 UTC (rev 11486)
+++ trunk/libjibx-java/branch-1.1/debian/rules 2010-02-02 01:15:44 UTC (rev 11487)
@@ -18,11 +18,11 @@
clean::
-rm -fr build/api build/classes lib/*
-install/libjibx1.1-java::
- dh_install -plibjibx1.1-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_install -plibjibx1.1-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_install -plibjibx1.1-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java
- dh_install -plibjibx1.1-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+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
+ dh_install -plibjibx$(DEB_UPSTREAM_VERSION_2)-java lib/jibx-schema-$(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 ; \
@@ -30,12 +30,9 @@
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 ; \
- dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/jibx-schema-$(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
- dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema.jar
More information about the pkg-java-commits
mailing list