This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/2.3-3 in repository libjson-java.
commit b38da821fafb5a2d2d170e39723157c5ea1f0ebe Author: Miguel Landaeta <[email protected]> Date: Sat Apr 12 06:04:43 2014 +0000 Tagging libjson-java (2.3-3) --- libjson-java/debian/ant.properties | 4 + libjson-java/debian/build.xml | 25 ++++++ libjson-java/debian/changelog | 92 ++++++++++++++++++++++ libjson-java/debian/compat | 1 + libjson-java/debian/control | 46 +++++++++++ libjson-java/debian/copyright | 16 ++++ libjson-java/debian/orig-tar.sh | 18 +++++ .../debian/patches/01-java8-compatibility.patch | 25 ++++++ libjson-java/debian/patches/series | 1 + libjson-java/debian/rules | 21 +++++ libjson-java/debian/source/format | 1 + libjson-java/debian/watch | 3 + 12 files changed, 253 insertions(+) diff --git a/libjson-java/debian/ant.properties b/libjson-java/debian/ant.properties new file mode 100644 index 0000000..8adf780 --- /dev/null +++ b/libjson-java/debian/ant.properties @@ -0,0 +1,4 @@ +project.name=json-lib +class.dir=build +source.dir=. +jar=json-lib.jar diff --git a/libjson-java/debian/build.xml b/libjson-java/debian/build.xml new file mode 100644 index 0000000..3662260 --- /dev/null +++ b/libjson-java/debian/build.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project default="jar" name="${project.name}" basedir=".."> + + <target name="clean"> + <delete dir="${class.dir}" quiet="true"/> + </target> + + <target name="compile" description="o Compile the source files"> + <mkdir dir="${class.dir}"/> + <javac srcdir="${source.dir}" destdir="${class.dir}" + debug="true" source="1.4" target="1.4" nowarn="true"> + <include name="net/**"/> + </javac> + </target> + + <target name="jar" description="o Create the jar" depends="compile"> + <jar jarfile="${jar}"> + <fileset dir="${class.dir}"> + <include name="**"/> + </fileset> + </jar> + </target> + +</project> diff --git a/libjson-java/debian/changelog b/libjson-java/debian/changelog new file mode 100644 index 0000000..3521e71 --- /dev/null +++ b/libjson-java/debian/changelog @@ -0,0 +1,92 @@ +libjson-java (2.3-3) unstable; urgency=low + + * Use the renamed method MultiKeyMap.removeMultiKey() introduced + in libcommons-collections3-java 3.2.1-7 + * debian/control + - Use canonical URLs for the Vcs-* fields + - Updated Standards-Version to 3.9.5 (no changes) + - Removed Michael Koch from the uploaders (Closes: #654085) + - Removed the dependency on the JRE for the binary package + * Switch to debhelper level 9 + + -- Emmanuel Bourg <[email protected]> Sat, 12 Apr 2014 00:29:52 +0200 + +libjson-java (2.3-2) unstable; urgency=low + + [ Thierry Carrez ] + * debian/build.xml: Build Java2 code to match runtime dependency + + [ Torsten Werner ] + * Switch to source format 3.0. + * Update Standards-Version: 3.8.4. + + -- Torsten Werner <[email protected]> Sat, 08 May 2010 16:28:07 +0200 + +libjson-java (2.3-1) unstable; urgency=low + + * New upstream release. + * Build-Depends on debhelper (>= 7). + * Added missing ${misc:Depends}. + * Moved ant and default-jdk to Build-Depends for clean target. + * Rename Depends-alterantive to java2-runtime-headless. + * Moved package to section 'java'. + * Updated Standards-Version to 3.8.3. + + -- Michael Koch <[email protected]> Sun, 27 Sep 2009 07:36:58 +0200 + +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, + libcommons-logging-java, libcommons-collections3-java, + libezmorph-java to Depends (Closes: #506144) + + -- Varun Hiremath <[email protected]> Sat, 06 Dec 2008 19:11:06 -0500 + +libjson-java (2.2.2-2) unstable; urgency=low + + * Move package to main. + + -- Torsten Werner <[email protected]> Mon, 11 Aug 2008 19:42:46 +0200 + +libjson-java (2.2.2-1) unstable; urgency=low + + * New upstream release + * Bump Standards-Version to 3.8.0 + * debian/copyright: remove the full text of Apache 2.0 license, as now + is included in common licenses + + -- Varun Hiremath <[email protected]> Mon, 07 Jul 2008 01:08:30 +0530 + +libjson-java (2.2.1-1) unstable; urgency=low + + * New upstream release + + -- Varun Hiremath <[email protected]> Sat, 16 Feb 2008 01:50:54 +0530 + +libjson-java (2.2-1) unstable; urgency=low + + * New upstream release + * Add myself to Uploaders + + -- Varun Hiremath <[email protected]> Sat, 05 Jan 2008 03:56:54 +0530 + +libjson-java (2.1-2) unstable; urgency=low + + * Move package to contrib because of Build-Depends: groovy. + * Change Standards-Version: 3.7.3. + + -- Torsten Werner <[email protected]> Thu, 20 Dec 2007 00:09:05 +0100 + +libjson-java (2.1-1) unstable; urgency=low + + * initial version (Closes: #453476) + + -- Torsten Werner <[email protected]> Sat, 24 Nov 2007 00:01:40 +0100 diff --git a/libjson-java/debian/compat b/libjson-java/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/libjson-java/debian/compat @@ -0,0 +1 @@ +9 diff --git a/libjson-java/debian/control b/libjson-java/debian/control new file mode 100644 index 0000000..907cadb --- /dev/null +++ b/libjson-java/debian/control @@ -0,0 +1,46 @@ +Source: libjson-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Torsten Werner <[email protected]>, + Varun Hiremath <[email protected]>, + Emmanuel Bourg <[email protected]> +Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk +Build-Depends-Indep: groovy, + junit, + libcommons-beanutils-java, + libcommons-collections3-java (>= 3.2.1-7~), + libcommons-lang-java, + libcommons-logging-java, + libezmorph-java, + liboro-java, + libxom-java +Standards-Version: 3.9.5 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjson-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjson-java/ +Homepage: http://json-lib.sourceforge.net + +Package: libjson-java +Architecture: all +Depends: groovy, + libcommons-beanutils-java, + libcommons-collections3-java (>= 3.2.1-7~), + libcommons-lang-java, + libcommons-logging-java, + libezmorph-java, + liboro-java, + libxom-java, + ${misc:Depends} +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. + . + JSON (JavaScript Object Notation) is a lightweight data-interchange + format. It is easy for humans to read and write. It is easy for + machines to parse and generate. It is based on a subset of the + JavaScript Programming Language, Standard ECMA-262 3rd Edition - + December 1999. JSON is a text format that is completely language + independent but uses conventions that are familiar to programmers of + the C-family of languages, including C, C++, C#, Java, JavaScript, + Perl, Python, and many others. These properties make JSON an ideal + data-interchange language. diff --git a/libjson-java/debian/copyright b/libjson-java/debian/copyright new file mode 100644 index 0000000..d251e19 --- /dev/null +++ b/libjson-java/debian/copyright @@ -0,0 +1,16 @@ +This package was debianized by Torsten Werner <[email protected]> on +Sat, 24 Nov 2007 00:01:40 +0100. + +It was downloaded from http://json-lib.sourceforge.net + +Upstream Author: Andres Almiray <[email protected]> + +Copyright: © 2006-2008 Json-lib + +License: Apache 2.0 + + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0' + +The Debian packaging is (C) 2007, Torsten Werner <[email protected]> +and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff --git a/libjson-java/debian/orig-tar.sh b/libjson-java/debian/orig-tar.sh new file mode 100755 index 0000000..be213cf --- /dev/null +++ b/libjson-java/debian/orig-tar.sh @@ -0,0 +1,18 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +DIR=json-lib-$2 +TAR=../libjson-java_$2.orig.tar.gz + +# clean up the upstream tarball +mkdir $DIR +(cd $DIR && jar xf ../$3) +tar -c -z -f $TAR $DIR +rm -rf $DIR $3 + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi diff --git a/libjson-java/debian/patches/01-java8-compatibility.patch b/libjson-java/debian/patches/01-java8-compatibility.patch new file mode 100644 index 0000000..0af7a02 --- /dev/null +++ b/libjson-java/debian/patches/01-java8-compatibility.patch @@ -0,0 +1,25 @@ +Description: Uses the renamed method MultiKeyMap.removeMultiKey() introduced + in libcommons-collections3-java 3.2.1-7 to solve a compatibility issue with + Java 8. +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/net/sf/json/JsonConfig.java ++++ b/net/sf/json/JsonConfig.java +@@ -1364,7 +1364,7 @@ + */ + public void unregisterJsonValueProcessor( Class beanClass, Class propertyType ) { + if( beanClass != null && propertyType != null ) { +- beanTypeMap.remove( beanClass, propertyType ); ++ beanTypeMap.removeMultiKey( beanClass, propertyType ); + } + } + +@@ -1377,7 +1377,7 @@ + */ + public void unregisterJsonValueProcessor( Class beanClass, String key ) { + if( beanClass != null && key != null ) { +- beanKeyMap.remove( beanClass, key ); ++ beanKeyMap.removeMultiKey( beanClass, key ); + } + } + diff --git a/libjson-java/debian/patches/series b/libjson-java/debian/patches/series new file mode 100644 index 0000000..3209aba --- /dev/null +++ b/libjson-java/debian/patches/series @@ -0,0 +1 @@ +01-java8-compatibility.patch diff --git a/libjson-java/debian/rules b/libjson-java/debian/rules new file mode 100755 index 0000000..31a2c83 --- /dev/null +++ b/libjson-java/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +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 + +clean:: + rm -f *.jar + +get-orig-source: + uscan --force-download --rename diff --git a/libjson-java/debian/source/format b/libjson-java/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/libjson-java/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/libjson-java/debian/watch b/libjson-java/debian/watch new file mode 100644 index 0000000..99c855a --- /dev/null +++ b/libjson-java/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://sf.net/json-lib/ json-lib-(.*)-jdk15-sources.jar \ + debian debian/orig-tar.sh -- 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
