This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjson-java.
commit 22db15563d39cf4d94fdf64903ee3edb50bbb106 Author: Torsten Werner <[email protected]> Date: Thu Jan 1 00:05:00 2009 +0000 * New upstream release * Switch to default-jdk/-jre-headless. * Disable compiler warnings. --- debian/build.xml | 2 +- debian/changelog | 8 ++++++++ debian/control | 14 ++++++-------- debian/orig-tar.sh | 4 +--- debian/rules | 15 +++++++++------ 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 4be14e1..d773413 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -9,7 +9,7 @@ <target name="compile" description="o Compile the source files"> <mkdir dir="${class.dir}"/> <javac srcdir="${source.dir}" destdir="${class.dir}" - debug="true" source="1.5"/> + debug="true" source="1.5" nowarn="true"/> </target> <target name="jar" description="o Create the jar" depends="compile"> diff --git a/debian/changelog b/debian/changelog index 7ad36a3..b778433 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libjson-java (2.2.3-1) unstable; urgency=low + + * New upstream release + * Switch to default-jdk/-jre-headless. + * Disable compiler warnings. + + -- Torsten Werner <[email protected]> Thu, 01 Jan 2009 01:03:10 +0100 + libjson-java (2.2.2-3) unstable; urgency=low * debian/control: add libcommons-lang-java, libcommons-beanutils-java, diff --git a/debian/control b/debian/control index f1c35a1..c66d575 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,9 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected]> Build-Depends: debhelper (>= 5), cdbs -Build-Depends-Indep: ant, java-gcj-compat-dev, groovy, - libcommons-lang-java, liboro-java, libcommons-beanutils-java, - libcommons-logging-java, libcommons-collections3-java, libezmorph-java, - libxom-java, junit +Build-Depends-Indep: ant, default-jdk, groovy, libcommons-lang-java, liboro-java, + libcommons-beanutils-java, libcommons-logging-java, libcommons-collections3-java, + libezmorph-java, libxom-java, junit Standards-Version: 3.8.0 Homepage: http://json-lib.sourceforge.net Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjson-java @@ -15,10 +14,9 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjson-java Package: libjson-java Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime, - libcommons-lang-java, libcommons-beanutils-java, - libcommons-logging-java, libcommons-collections3-java, - libezmorph-java +Depends: default-jre-headless | java2-runtime, groovy, libcommons-lang-java, + liboro-java, libcommons-beanutils-java, libcommons-logging-java, + libcommons-collections3-java, libezmorph-java, libxom-java Description: library for transforming Java objects and XML to JSON and back again JSON-lib is a java library for transforming beans, maps, collections, java arrays and XML to JSON and back again to beans and DynaBeans. diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index d42c9fa..be213cf 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -6,7 +6,7 @@ TAR=../libjson-java_$2.orig.tar.gz # clean up the upstream tarball mkdir $DIR -(cd $DIR && jar -x -f ../$3) +(cd $DIR && jar xf ../$3) tar -c -z -f $TAR $DIR rm -rf $DIR $3 @@ -16,5 +16,3 @@ if [ -r .svn/deb-layout ]; then mv $TAR $origDir echo "moved $TAR to $origDir" fi - -exit 0 diff --git a/debian/rules b/debian/rules index 81bfe19..2bdba7b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,13 +3,16 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk -JAVA_HOME := /usr/lib/jvm/java-gcj -DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := groovy commons-lang oro commons-beanutils commons-logging commons-collections3 ezmorph xom junit +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := groovy commons-lang oro commons-beanutils commons-logging \ + commons-collections3 ezmorph xom junit install/libjson-java:: - install -m644 -D json-lib.jar $(DEB_DESTDIR)/usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar - dh_link -plibjson-java /usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/json-lib.jar + install -m644 -D json-lib.jar \ + $(DEB_DESTDIR)/usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar + dh_link -plibjson-java /usr/share/java/json-lib-$(DEB_UPSTREAM_VERSION).jar \ + /usr/share/java/json-lib.jar get-orig-source: - -uscan --upstream-version 0 --rename + uscan --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjson-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
