This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository libcommons-jxpath-java.
commit 317bcfcd0d53ec0a08f5b28298ebd454e7c21289 Author: Niels Thykier <[email protected]> Date: Fri Sep 11 22:02:41 2009 +0000 [ Niels Thykier ] * New upstream release. * Added myself to the uploaders. * Replaced Build-Depends-Indep with Build-Depends to avoid problems with the buildds. * Replace "kaffe" with "default java" packages. * Updated the encoding of debian/copyright to UTF-8. * Added Vcs-fields to debian/control. * Added missing ${misc:Depends} to dependencies. --- debian/changelog | 20 ++++++++++++++------ debian/control | 18 ++++++++++++------ debian/copyright | 2 +- debian/libcommons-jxpath-java-doc.docs | 1 - debian/patches/01_build_xml.patch | 19 ++++++------------- debian/rules | 5 +++-- 6 files changed, 36 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8b949e..4933312 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,21 @@ -libcommons-jxpath-java (1.2-7.1) UNRELEASED; urgency=low - - * Non-maintainer upload. +libcommons-jxpath-java (1.3-1) UNRELEASED; urgency=low [ Emmanuel Bourg ] * Update of the URLs * Rename Jakarta Commons to Apache Commons - * debian/copyright: Switch to Apache License 2.0. Closes: #532891. - - -- Sylvestre Ledru <[email protected]> Wed, 17 Jun 2009 10:51:45 +0200 + * debian/copyright: Switch to Apache License 2.0. Closes: #532891. + + [ Niels Thykier ] + * New upstream release. + * Added myself to the uploaders. + * Replaced Build-Depends-Indep with Build-Depends to avoid problems + with the buildds. + * Replace "kaffe" with "default java" packages. + * Updated the encoding of debian/copyright to UTF-8. + * Added Vcs-fields to debian/control. + * Added missing ${misc:Depends} to dependencies. + + -- Niels Thykier <[email protected]> Fri, 11 Sep 2009 22:21:58 +0200 libcommons-jxpath-java (1.2-7) unstable; urgency=low diff --git a/debian/control b/debian/control index e383caa..4cd5d0d 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,20 @@ Source: libcommons-jxpath-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]> -Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), ant, libcommons-logging-java, junit, libservlet2.3-java, libcommons-collections-java, libcommons-beanutils-java, libjdom1-java, kaffe +Uploaders: Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]>, + Niels Thykier <[email protected]> +Build-Depends: debhelper (>= 4.2.30), cdbs (>= 0.4.8), ant, libcommons-logging-java, + junit, libservlet2.3-java, libcommons-collections-java, libcommons-beanutils-java, + libjdom1-java, default-jdk Standards-Version: 3.6.2 +Homepage: http://commons.apache.org/jxpath/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-jxpath-java +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/libcommons-jxpath-java Package: libcommons-jxpath-java Architecture: all -Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime +Depends: default-jre-headless | java1-runtime | java2-runtime, ${misc:Depends} Suggests: java-virtual-machine, libcommons-jxpath-java-doc Description: manipulate javabean using XPath syntax This library provides the java developer the ability to manipulate @@ -18,11 +24,11 @@ Description: manipulate javabean using XPath syntax . One of the most important feature of the component is the unification of reference syntax between DOM and java. - . - Homepage: http://commons.apache.org/jxpath/ Package: libcommons-jxpath-java-doc +Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libcommons-jxpath-java Description: Javadoc API for libcommons-jxpath-java The javadoc API for libcommons-jxpath-java which is a library to diff --git a/debian/copyright b/debian/copyright index fa3089c..978ef10 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Upstream Authorq: Dmitri Plotnikov <[email protected]> Craig McClanahan <[email protected]> Matt Benson <[email protected]> -Copyright: � 2001-2008 The Apache Software Foundation +Copyright: © 2001-2008 The Apache Software Foundation License: Apache 2.0 diff --git a/debian/libcommons-jxpath-java-doc.docs b/debian/libcommons-jxpath-java-doc.docs index 7b8cd66..0f45efd 100644 --- a/debian/libcommons-jxpath-java-doc.docs +++ b/debian/libcommons-jxpath-java-doc.docs @@ -1,3 +1,2 @@ PROPOSAL.html -STATUS.html dist/docs/api diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch index 35b28e9..4cde87d 100644 --- a/debian/patches/01_build_xml.patch +++ b/debian/patches/01_build_xml.patch @@ -1,11 +1,11 @@ ---- build.xml.orig 2005-09-18 21:56:53.000000000 +0200 -+++ build.xml 2005-09-18 21:57:51.000000000 +0200 +--- build.xml.orig 2009-09-11 23:13:56.969009343 +0200 ++++ build.xml 2009-09-11 23:15:44.485055841 +0200 @@ -33,7 +33,7 @@ <target name="compile" description="o Compile the code" depends="get-deps"> <mkdir dir="${classesdir}"> </mkdir> - <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> -+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.3"> ++ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.3" source="1.3"> <src> <pathelement location="${basedir}/src/java"> </pathelement> @@ -18,19 +18,12 @@ <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> </jar> </target> -@@ -139,7 +139,7 @@ +@@ -146,7 +146,7 @@ </property> <property name="title" value="JXPath 1.2 API"> </property> -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames=".*"> -+ <javadoc destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.*"> +- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*"> ++ <javadoc destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*"> <classpath> <fileset dir="${libdir}"> <include name="*.jar"> -@@ -182,4 +182,4 @@ - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> - </unjar> - </target> --</project> -\ Kein Zeilenumbruch am Dateiende. -+</project> diff --git a/debian/rules b/debian/rules index 6730d70..a05ee82 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,11 @@ 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 -JAVA_HOME_DIRS := /usr/lib/kaffe +JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := junit jdom1 servlet-2.3 commons-beanutils common-collections commons-logging $(ANT_HOME)/lib/ant-launcher.jar DEB_ANT_BUILD_TARGET := jar javadoc +DEB_ANT_CLEAN_TARGET := clean LIBRARY=commons-jxpath -VERSION=1.2 +VERSION=1.3 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-jxpath-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
