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 08658f2ff2e9cdd0ffc2d35fe91a0eae679d2dca Author: Steffen Möller <[email protected]> Date: Mon Feb 1 02:36:11 2010 +0000 Introduction of versioned binary of new upstream. --- debian/README.Debian | 7 ++++++ debian/README.source | 3 +++ debian/changelog | 7 +++++- debian/control | 27 ++++++++++++++++++---- debian/libjibx-java-doc.install | 2 -- debian/libjibx-java-doc.links | 1 - ...a-doc.doc-base => libjibx1.2-java-doc.doc-base} | 8 +++---- ...jibx-java-doc.docs => libjibx1.2-java-doc.docs} | 0 debian/libjibx1.2-java-doc.install | 2 ++ debian/libjibx1.2-java-doc.links | 1 + debian/orig-tar.sh | 9 +++++--- debian/patches/build_xml_clean_target.patch | 14 +++++++++++ debian/patches/series | 2 ++ debian/rules | 21 +++++++++++++---- 14 files changed, 83 insertions(+), 21 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..3ed7e5e --- /dev/null +++ b/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. diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..6815591 --- /dev/null +++ b/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) diff --git a/debian/changelog b/debian/changelog index 7ade723..3b8ecfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libjibx-java (1.2.1-1) UNRELEASED; urgency=low +libjibx1.2-java (1.2.1-1) unstable; urgency=low [ Eric Lavarde ] * Remove dependency on gjdoc. @@ -16,6 +16,11 @@ libjibx-java (1.2.1-1) UNRELEASED; urgency=low * 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 <[email protected]> Sun, 27 Sep 2009 12:32:59 +0200 libjibx-java (1.0.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 08f343c..7a41879 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,31 @@ -Source: libjibx-java +Source: libjibx1.2-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: debhelper (>= 7.0.0), cdbs (>= 0.4.8), openjdk-6-jdk, ant, quilt Build-Depends-Indep: antlr, libbcel-java, liblog4j1.2-java, libxpp3-java -Standards-Version: 3.8.3 +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.2/ +Vcs-browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjibx-java/branch-1.2/ -Package: libjibx-java +Package: libjibx1.2-java Architecture: all Depends: default-jre-headless | java2-runtime-headless, libbcel-java, libxpp3-java, ${misc:Depends} Suggests: java-virtual-machine, 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.2-java 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 @@ -19,8 +33,11 @@ Description: Framework for binding XML data to Java objects 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: libjibx-java-doc +Package: libjibx1.2-java-doc Section: doc Architecture: all Depends: ${misc:Depends} diff --git a/debian/libjibx-java-doc.install b/debian/libjibx-java-doc.install deleted file mode 100644 index 3aec2a6..0000000 --- a/debian/libjibx-java-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 6730d4b..0000000 --- a/debian/libjibx-java-doc.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/libjibx-java-doc/api usr/share/doc/libjibx-java/api diff --git a/debian/libjibx-java-doc.doc-base b/debian/libjibx1.2-java-doc.doc-base similarity index 50% rename from debian/libjibx-java-doc.doc-base rename to debian/libjibx1.2-java-doc.doc-base index 9a314d9..1329bd1 100644 --- a/debian/libjibx-java-doc.doc-base +++ b/debian/libjibx1.2-java-doc.doc-base @@ -1,10 +1,10 @@ -Document: libjibx-java-doc -Title: Programmer API for libjibx-java +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/libjibx-java-doc/api/index.html -Files: /usr/share/doc/libjibx-java-doc/api/* +Index: /usr/share/doc/libjibx1.2-java-doc/api/index.html +Files: /usr/share/doc/libjibx1.2-java-doc/api/* diff --git a/debian/libjibx-java-doc.docs b/debian/libjibx1.2-java-doc.docs similarity index 100% rename from debian/libjibx-java-doc.docs rename to debian/libjibx1.2-java-doc.docs diff --git a/debian/libjibx1.2-java-doc.install b/debian/libjibx1.2-java-doc.install new file mode 100644 index 0000000..f8cb0f2 --- /dev/null +++ b/debian/libjibx1.2-java-doc.install @@ -0,0 +1,2 @@ +docs/* usr/share/doc/libjibx1.2-java-doc +build/api usr/share/doc/libjibx1.2-java-doc diff --git a/debian/libjibx1.2-java-doc.links b/debian/libjibx1.2-java-doc.links new file mode 100644 index 0000000..ee0e119 --- /dev/null +++ b/debian/libjibx1.2-java-doc.links @@ -0,0 +1 @@ +usr/share/doc/libjibx1.2-java-doc/api usr/share/doc/libjibx1.2-java/api diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index cc6aae9..a4591a2 100644 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,7 +1,8 @@ #!/bin/sh -e # called by uscan with '--upstream-version' <version> <file> -DIR=libjibx-java_$2.orig +echo $* +DIR=libjibx-java-$2 TAR=../libjibx-java_$2.orig.tar.gz # clean up the upstream tarball @@ -13,8 +14,10 @@ rm -rf $DIR # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout - mv $3 $origDir - echo "moved $3 to $origDir" + if [ ".." != "$origDir" ]; then + mv $3 $origDir + echo "moved $3 to $origDir" + fi fi exit 0 diff --git a/debian/patches/build_xml_clean_target.patch b/debian/patches/build_xml_clean_target.patch new file mode 100644 index 0000000..d8c3ac6 --- /dev/null +++ b/debian/patches/build_xml_clean_target.patch @@ -0,0 +1,14 @@ +--- 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"/> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..837cabb --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +build_xml_clean_target.patch -p0 +01_build_xml.patch -p0 diff --git a/debian/rules b/debian/rules index 3ecf043..0c47255 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,8 @@ 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/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_COMPRESS_EXCLUDE := .class JAVA_HOME := /usr/lib/jvm/java-6-openjdk @@ -12,14 +13,24 @@ DEB_ANT_ARGS := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasnam 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/libjibx1.2-java:: + dh_install -plibjibx1.2-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx1.2-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx1.2-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjibx1.2-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java + if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \ + dh_link -plibjibx1.2-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx1.2-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx1.2-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \ + dh_link -plibjibx1.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_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 -- 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
