[pkg-java] r11445 - in trunk/libjibx-java: . branch-1.0 branch-1.0/debian branch-1.0/debian/patches
Steffen Möller
moeller at alioth.debian.org
Sat Jan 30 00:32:13 UTC 2010
Author: moeller
Date: 2010-01-30 00:32:13 +0000 (Sat, 30 Jan 2010)
New Revision: 11445
Added:
trunk/libjibx-java/branch-1.0/
trunk/libjibx-java/branch-1.0/debian/
trunk/libjibx-java/branch-1.0/debian/changelog
trunk/libjibx-java/branch-1.0/debian/compat
trunk/libjibx-java/branch-1.0/debian/control
trunk/libjibx-java/branch-1.0/debian/copyright
trunk/libjibx-java/branch-1.0/debian/dirs
trunk/libjibx-java/branch-1.0/debian/docs
trunk/libjibx-java/branch-1.0/debian/install
trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.doc-base
trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.docs
trunk/libjibx-java/branch-1.0/debian/links
trunk/libjibx-java/branch-1.0/debian/patches/
trunk/libjibx-java/branch-1.0/debian/patches/01_build_xml.patch
trunk/libjibx-java/branch-1.0/debian/rules
Log:
A newer version of libjibx-java is available and required, preparing for allowing parallel installs of multiple versions, firstly by keeping the current state of the packaing in Debian.
Property changes on: trunk/libjibx-java/branch-1.0/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/libjibx-java/branch-1.0/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/changelog (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/changelog 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,42 @@
+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 at 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 at 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 at zorglub.s.bawue.de> Sat, 4 Mar 2006 15:20:17 +0200
Added: trunk/libjibx-java/branch-1.0/debian/compat
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/compat (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/compat 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1 @@
+4
Added: trunk/libjibx-java/branch-1.0/debian/control
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/control (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/control 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,31 @@
+Source: libjibx-java
+Section: libs
+Priority: optional
+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-Indep: gjdoc, openjdk-6-jdk, ant, antlr, libbcel-java, libxpp3-java
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8)
+Homepage: http://jibx.sf.net/
+Standards-Version: 3.8.0.0
+
+Package: libjibx-java
+Architecture: all
+Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre | java2-runtime, libbcel-java, libxpp3-java, ${misc:Depends}
+Suggests: java-virtual-machine, libjibx-java-doc
+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-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: iceweasel | firefox | www-browser
+Suggests: libjibx-java
+Description: Documentation for libjibx-java
+ This package contains documentation, javadocs (or should I say gjdocs) and
+ tutorial code for JiBX.
Added: trunk/libjibx-java/branch-1.0/debian/copyright
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/copyright (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/copyright 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,31 @@
+This package was debianized by Eric Lavarde <deb at 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.
Added: trunk/libjibx-java/branch-1.0/debian/dirs
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/dirs (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/dirs 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1 @@
+usr/share/java
Added: trunk/libjibx-java/branch-1.0/debian/docs
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/docs (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/docs 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1 @@
+readme.html
Added: trunk/libjibx-java/branch-1.0/debian/install
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/install (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/install 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,3 @@
+lib/jibx-bind-1.0.1.jar usr/share/java
+lib/jibx-run-1.0.1.jar usr/share/java
+lib/jibx-extras-1.0.1.jar usr/share/java
Added: trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.doc-base
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.doc-base (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.doc-base 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,10 @@
+Document: libjibx-java-doc
+Title: Programmer API for libjibx-java
+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/libjibx-java-doc/dev/index.html
+Files: /usr/share/doc/libjibx-java-doc/dev/*
Added: trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.docs
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.docs (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/libjibx-java-doc.docs 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,5 @@
+readme.html
+docs/
+tutorial/
+starter/
+build/docs/dev/
Added: trunk/libjibx-java/branch-1.0/debian/links
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/links (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/links 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,3 @@
+usr/share/java/jibx-bind-1.0.1.jar usr/share/java/jibx-bind.jar
+usr/share/java/jibx-run-1.0.1.jar usr/share/java/jibx-run.jar
+usr/share/java/jibx-extras-1.0.1.jar usr/share/java/jibx-extras.jar
Added: trunk/libjibx-java/branch-1.0/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/patches/01_build_xml.patch (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/patches/01_build_xml.patch 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,140 @@
+--- jibx-1.0.1/build/build.xml 2006-01-02 19:45:56.000000000 +0000
++++ jibx-1.0.1_COMPILED/build/build.xml 2006-03-05 16:44:08.000000000 +0000
+@@ -15,6 +15,7 @@
+ <!-- The directories -->
+ <property name="root" value="${basedir}"/>
+ <property name="lib" value="${basedir}/lib"/>
++ <property name="javalib" value="/usr/share/java"/>
+ <property name="build" value="${basedir}/build"/>
+ <property name="src" value="${build}/src"/>
+ <property name="extrassrc" value="${build}/extras"/>
+@@ -36,9 +37,9 @@
+ <!-- Other definitions -->
+ <property name="project" value="JiBX Java data binding to XML"/>
+ <property name="projname" value="jibx"/>
+- <property name="bindname" value="jibx-bind"/>
+- <property name="runname" value="jibx-run"/>
+- <property name="extrasname" value="jibx-extras"/>
++ <property name="bindname" value="jibx-bind-1.0.1"/>
++ <property name="runname" value="jibx-run-1.0.1"/>
++ <property name="extrasname" value="jibx-extras-1.0.1"/>
+ <property name="version" value="1.0"/>
+ <property name="distribname" value="jibx_1_0_1"/>
+ <property name="fullname" value="jibx-full"/>
+@@ -58,19 +59,19 @@
+ <path id="project-classpath">
+ <pathelement location="${binddest}"/>
+ <pathelement location="${rundest}"/>
+- <pathelement location="${lib}/xpp3.jar"/>
++ <pathelement location="${javalib}/xpp3.jar"/>
+ <!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
+- <pathelement location="${lib}/dom4j.jar"/>
+- <pathelement location="${lib}/jdom.jar"/>
++ <pathelement location="${javalib}/dom4j.jar"/>
++ <pathelement location="${javalib}/jdom1.jar"/>
+ </path>
+ <path id="binding-classpath">
+ <pathelement location="${binddest}"/>
+ <pathelement location="${rundest}"/>
+- <pathelement location="${lib}/xpp3.jar"/>
+- <pathelement location="${lib}/bcel.jar"/>
++ <pathelement location="${javalib}/xpp3.jar"/>
++ <pathelement location="${javalib}/bcel.jar"/>
+ <!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
+- <pathelement location="${lib}/dom4j.jar"/>
+- <pathelement location="${lib}/jdom.jar"/>
++ <pathelement location="${javalib}/dom4j.jar"/>
++ <pathelement location="${javalib}/jdom1.jar"/>
+ </path>
+ <path id="tests-classpath">
+ <pathelement location="${testdest}"/>
+@@ -79,53 +80,63 @@
+ <pathelement location="${lib}/${extrasname}.jar"/>
+ <pathelement location="${lib}/xpp3.jar"/>
+ <!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
+- <pathelement location="${lib}/dom4j.jar"/>
+- <pathelement location="${lib}/jdom.jar"/>
++ <pathelement location="${javalib}/dom4j.jar"/>
++ <pathelement location="${javalib}/jdom1.jar"/>
+ <!-- The Xerces jars are only needed for testing on JDK 1.3 -->
+- <pathelement location="${lib}/xml-apis.jar"/>
+- <pathelement location="${lib}/xercesImpl.jar"/>
++ <pathelement location="${javalib}/xml-apis.jar"/>
++ <pathelement location="${javalib}/xercesImpl.jar"/>
+ </path>
+ <path id="javadoc-classpath">
+ <pathelement location="${lib}/${bindname}.jar"/>
+ <pathelement location="${lib}/${runname}.jar"/>
+ <pathelement location="${lib}/${extrasname}.jar"/>
+- <pathelement location="${lib}/xpp3.jar"/>
+- <pathelement location="${lib}/bcel.jar"/>
++ <pathelement location="${javalib}/xpp3.jar"/>
++ <pathelement location="${javalib}/bcel.jar"/>
+ <!-- The dom4j.jar and jdom.jar are only needed for distribution tests and builds -->
+- <pathelement location="${lib}/dom4j.jar"/>
+- <pathelement location="${lib}/jdom.jar"/>
++ <pathelement location="${javalib}/dom4j.jar"/>
++ <pathelement location="${javalib}/jdom1.jar"/>
+ <!-- The Xerces jars are only needed for distribution builds on JDK 1.3 -->
+- <pathelement location="${lib}/xml-apis.jar"/>
+- <pathelement location="${lib}/xercesImpl.jar"/>
++ <pathelement location="${javalib}/xml-apis.jar"/>
++ <pathelement location="${javalib}/xercesImpl.jar"/>
+ </path>
+ <!-- Need to add jars at point of use, so that build doesn't test with old
+ version (because Ant apparently gets the files at time of definition) -->
+ <path id="tools-classpath">
+ <pathelement location="${lib}/${bindname}.jar"/>
+ <pathelement location="${lib}/${runname}.jar"/>
+- <pathelement location="${lib}/bcel.jar"/>
+- <pathelement location="${lib}/xpp3.jar"/>
++ <pathelement location="${javalib}/bcel.jar"/>
++ <pathelement location="${javalib}/xpp3.jar"/>
+ </path>
+
+ <!-- Optional components -->
+- <available property="dom4j" file="${lib}/dom4j.jar"/>
+- <available property="jdom" file="${lib}/jdom.jar"/>
++ <available property="dom4j" file="${javalib}/dom4j.jar"/>
++ <available property="jdom" file="${javalib}/jdom1.jar"/>
++
++ <!-- clean target to make sure source tree is *exactly* the same as before -->
++ <target name="clean" depends="clean-bind,clean-run,clean-extras,clean-tests">
++ <delete quiet="true" includeemptydirs="true">
++ <fileset dir="${build}/classes" includes="**/*"/>
++ </delete>
++ <delete quiet="true" includeemptydirs="true">
++ <fileset dir="${build}/docs" includes="**/*"/>
++ </delete>
++ </target>
+
+ <!-- Delete binding class files -->
+ <target name="clean-bind">
+- <delete quiet="true" file="${bindname}.jar"/>
++ <delete quiet="true" file="${lib}/${bindname}.jar"/>
+ <delete quiet="true" dir="${binddest}/org/jibx/binding"/>
+ </target>
+
+ <!-- Delete runtime class files -->
+ <target name="clean-run">
+- <delete quiet="true" file="${runname}.jar"/>
++ <delete quiet="true" file="${lib}/${runname}.jar"/>
+ <delete quiet="true" dir="${rundest}/org/jibx/runtime"/>
+ </target>
+
+ <!-- Delete extras class files -->
+ <target name="clean-extras">
+- <delete quiet="true" file="${extrasname}.jar"/>
++ <delete quiet="true" file="${lib}/${extrasname}.jar"/>
+ <delete quiet="true" dir="${extrasdest}/org/jibx/extras"/>
+ </target>
+
+@@ -279,7 +290,7 @@
+ <pathelement path="${testdest}"/>
+ <pathelement path="${lib}/${runname}.jar"/>
+ <pathelement path="${lib}/${extrasname}.jar"/>
+- <pathelement path="${lib}/xpp3.jar"/>
++ <pathelement path="${javalib}/xpp3.jar"/>
+ </classpath>
+
+ <!-- This is the full set of crossbar tests with most combinations included -->
Added: trunk/libjibx-java/branch-1.0/debian/rules
===================================================================
--- trunk/libjibx-java/branch-1.0/debian/rules (rev 0)
+++ trunk/libjibx-java/branch-1.0/debian/rules 2010-01-30 00:32:13 UTC (rev 11445)
@@ -0,0 +1,19 @@
+#!/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
+
+DEB_COMPRESS_EXCLUDE := .class
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
+ANT_HOME := /usr/share/ant
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
+DEB_ANT_BUILD_TARGET := setrelease current devdoc
+DEB_BUILDDIR := build
+DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
+
+LIBRARY=jibx
+VERSION=1.0.2
+
+clean::
+ -rm -fr build/classes build/docs/dev/resources/inherit.gif lib/*
More information about the pkg-java-commits
mailing list