This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjibx1.2-java.
commit 5918875c6150be482c4fac6d8a2ab0c886aa87f7 Author: Steffen Möller <[email protected]> Date: Sat Jan 30 00:34:14 2010 +0000 The debian folder offered already 1.2, which is now needed but was not yet uploaded. More work needs to be done to allow the parallel installation of multiple versions of libjibx. --- debian/changelog | 62 +++++++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 30 +++++++++++++++++++ debian/copyright | 39 ++++++++++++++++++++++++ debian/dirs | 1 + debian/docs | 1 + debian/libjibx-java-doc.doc-base | 10 +++++++ debian/libjibx-java-doc.docs | 2 ++ debian/libjibx-java-doc.install | 2 ++ debian/libjibx-java-doc.links | 1 + debian/orig-tar.exclude | 3 ++ debian/orig-tar.sh | 20 +++++++++++++ debian/patches/01_build_xml.patch | 42 ++++++++++++++++++++++++++ debian/rules | 26 ++++++++++++++++ debian/watch | 3 ++ 15 files changed, 243 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..7ade723 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,62 @@ +libjibx-java (1.2.1-1) UNRELEASED; 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. + + -- Michael Koch <[email protected]> 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 <[email protected]> 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 <[email protected]> Fri, 25 Jan 2008 23:30:33 +0100 + +libjibx-java (1.0.1-1) unstable; urgency=low + + * Initial Release (closes: Bug#354374). + + -- Eric Lavarde <[email protected]> Sat, 4 Mar 2006 15:20:17 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..08f343c --- /dev/null +++ b/debian/control @@ -0,0 +1,30 @@ +Source: libjibx-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Eric Lavarde <[email protected]>, Michael Koch <[email protected]> +Build-Depends: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant +Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java +Standards-Version: 3.8.3 +Homepage: http://jibx.sf.net/ + +Package: libjibx-java +Architecture: all +Depends: default-jre-headless | java2-runtime-headless, 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 and tutorial code for JiBX. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..4d5f896 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,39 @@ +This package was debianized by Eric Lavarde <[email protected]> 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. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..13c9f03 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/share/java diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..8056a96 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +readme.html diff --git a/debian/libjibx-java-doc.doc-base b/debian/libjibx-java-doc.doc-base new file mode 100644 index 0000000..9a314d9 --- /dev/null +++ b/debian/libjibx-java-doc.doc-base @@ -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/api/index.html +Files: /usr/share/doc/libjibx-java-doc/api/* diff --git a/debian/libjibx-java-doc.docs b/debian/libjibx-java-doc.docs new file mode 100644 index 0000000..5335aff --- /dev/null +++ b/debian/libjibx-java-doc.docs @@ -0,0 +1,2 @@ +readme.html +tutorial/ diff --git a/debian/libjibx-java-doc.install b/debian/libjibx-java-doc.install new file mode 100644 index 0000000..3aec2a6 --- /dev/null +++ b/debian/libjibx-java-doc.install @@ -0,0 +1,2 @@ +docs/* usr/share/doc/libjibx-java-doc +build/api usr/share/doc/libjibx-java-doc diff --git a/debian/libjibx-java-doc.links b/debian/libjibx-java-doc.links new file mode 100644 index 0000000..6730d4b --- /dev/null +++ b/debian/libjibx-java-doc.links @@ -0,0 +1 @@ +usr/share/doc/libjibx-java-doc/api usr/share/doc/libjibx-java/api diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..c306e76 --- /dev/null +++ b/debian/orig-tar.exclude @@ -0,0 +1,3 @@ +build/api +build/classes +lib/*.jar diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100644 index 0000000..cc6aae9 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,20 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +DIR=libjibx-java_$2.orig +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 + mv $3 $origDir + echo "moved $3 to $origDir" +fi + +exit 0 diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch new file mode 100644 index 0000000..73624f6 --- /dev/null +++ b/debian/patches/01_build_xml.patch @@ -0,0 +1,42 @@ +--- 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"> + <fileset dir="${lib}" includes="*.jar" excludes="asm*.jar,org.eclipse.*.jar,qdox*.jar,jibx*.jar"/> ++ <fileset dir="/usr/share/java" includes="bcel.jar" /> + </path> + + <!-- Optional components --> +@@ -232,12 +233,14 @@ + deprecation="on"> + <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" /> + </classpath> + </javac> + <java classname="org.jibx.binding.Compile" fork="yes" failonerror="true"> + <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" /> + </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> + <classpath> + <fileset dir="${lib}" includes="*.jar"/> ++ <fileset dir="/usr/share/java" includes="bcel.jar,log4j-1.2.jar,xpp3.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"/> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3ecf043 --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/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 := /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) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION) +DEB_BUILDDIR := build +DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt + +clean:: + -rm -fr build/api build/classes lib/* + +install/libjibx-java:: + dh_install -plibjibx-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/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 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..d538a1b --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/_/./g \ + http://sf.net/jibx/jibx_([[:digit:]_]+).zip debian debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjibx1.2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
