This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository libjackson-json-java.
commit 4b93cc37975575c4fe7bd756179e23f9268bfe47 Author: Markus Koschany <[email protected]> Date: Sun Dec 1 21:22:27 2013 +0100 Imported Debian patch 1.9.2-2 --- debian/README.Debian | 9 --------- debian/changelog | 28 +++++++++++++++++++++++++++- debian/compat | 2 +- debian/control | 25 +++++++++++++++++-------- debian/copyright | 16 ++++++++-------- debian/libjackson-json-java.links | 2 -- debian/rules | 3 --- 7 files changed, 53 insertions(+), 32 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index e76abdd..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -This package includes two jar files in two license flavors jackson-core and -jackson-mapper with suffixes -asl and -lgpl. Please don't link against this jar -files but against the symlinks that don't have the license suffixes: - -/usr/share/java/jackson-core.jar -/usr/share/java/jackson-mapper.jar - -Once I've worked out this issue with Debian-Legal and the Buildsystem I may -remove the two different jars and only ship one. diff --git a/debian/changelog b/debian/changelog index 4cd3944..825e6db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,34 @@ +libjackson-json-java (1.9.2-2) unstable; urgency=low + + * Team upload. + * Drop libjackson-json-java.links. + Do not create symlinks for jackson-core.jar and jackson-mapper.jar and + thus make the libjackson2-core-java package co-installable. + (Closes: #722665) + * debian/control: + - Bump compat level to 9 and require debhelper >= 9. + - Update Standards-Version to 3.9.5, no changes. + - Use canonical VCS-URI. + - libjackson-json-java-doc: Do not depend on libjackson-json-java anymore + to fix lintian warning doc-package-depends-on-main-package. + - libjackson-json-java: Suggest the -doc package. + * debian/rules: + - Remove dh_installdocs override. + * Drop README.Debian since we do not symlink to jackson-core.jar and + jackson-mapper.jar anymore. Please use the real jar files provided by this + package. + * Change license for all files under the debian directory from BSD to + Apache-2.0. + Fix lintian warning copyright-refers-to-deprecated-bsd-license-file. + * Run wrap-and-sort -sa. + + -- Markus Koschany <[email protected]> Sun, 01 Dec 2013 21:22:27 +0100 + libjackson-json-java (1.9.2-1) unstable; urgency=low * New upstream release. * Added watch file. - * Generate poms as part of build and switch to + * Generate poms as part of build and switch to using maven-repo-helper to install jars and pom file. * Bumped Standards-Version to 3.9.2; no changes. * Added myself to uploaders. diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 3786a8b..ea9350a 100644 --- a/debian/control +++ b/debian/control @@ -2,15 +2,16 @@ Source: libjackson-json-java Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: James Page <[email protected]> +Uploaders: + James Page <[email protected]> Homepage: http://jackson.codehaus.org -Vcs-Browser: http://git.debian.org/?p=pkg-java/libjackson-json-java.git -Vcs-Git: git://git.debian.org/git/pkg-java/libjackson-json-java.git -Standards-Version: 3.9.2 +Vcs-Browser: http://anonscm.debian.org/?p=pkg-java/libjackson-json-java.git +Vcs-Git: git://anonscm.debian.org/pkg-java/libjackson-json-java.git +Standards-Version: 3.9.5 Build-Depends: ant (>= 1.6.0), bnd, - debhelper (>= 7.4.10), + debhelper (>= 9), default-jdk, default-jdk-doc, javahelper (>= 0.30), @@ -23,7 +24,12 @@ Build-Depends: Package: libjackson-json-java Architecture: all -Depends: libjoda-time-java, libjsr311-api-java, ${misc:Depends} +Depends: + libjoda-time-java, + libjsr311-api-java, + ${misc:Depends} +Suggests: + libjackson-json-java-doc Description: streaming fast powerful standard conformant json processor in java Jackson is a Java-based JSON-processing package that contains: . @@ -41,8 +47,11 @@ Description: streaming fast powerful standard conformant json processor in java "Tree Mapper" for something similar to DOM and XPath. Package: libjackson-json-java-doc -Depends: libjackson-json-java (= ${binary:Version}), ${misc:Depends} -Recommends: default-jdk-doc, libjsr311-api-java-doc +Depends: + ${misc:Depends} +Recommends: + default-jdk-doc, + libjsr311-api-java-doc Section: doc Architecture: all Description: standard conformant json processor in java - API documentation diff --git a/debian/copyright b/debian/copyright index 1672c31..4e57e51 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,25 +1,25 @@ -This package was Debianised by Thomas Koch <[email protected]> on +This package was Debianised by Thomas Koch <[email protected]> on Tue, 21 Apr 2010 11:11:05 +0200 -This package was downloaded from +This package was downloaded from http://jackson.codehaus.org Upstream Author: FasterXML, LLC, Seattle, USA <[email protected]> -The packaging is Copyright 2010 Thomas Koch <[email protected]> and is -licenced under the terms of the BSD licence. On Debian systems the BSD licence -can be found in /usr/share/common-licenses/BSD. +The packaging is Copyright 2010 Thomas Koch <[email protected]>, 2011 James +Page <[email protected]>, 2013 Markus Koschany <[email protected]> and is +licenced under the terms of the Apache-2.0 licence. -The software is released dual licensed under the +The software is released dual licensed under the * Apache License 2.0 (AL 2.0) * Lesser/Library General Public License (LGPL 2.1) -On Debian systems the texts of this licenses can be found in the files +On Debian systems the texts of these licenses can be found in the files /usr/share/common-licenses/Apache-2.0 /usr/share/common-licenses/LGPL-2.1 -The file +The file debian/bnd_plugin/net/luminis/build/plugin/bnd/BuildTask.java was downloaded from: https://opensource.luminis.net/svn/BUNDLES/trunk/build-plugin/src/net/luminis/build/plugin/bnd/BuildTask.java diff --git a/debian/libjackson-json-java.links b/debian/libjackson-json-java.links deleted file mode 100644 index 4b123f2..0000000 --- a/debian/libjackson-json-java.links +++ /dev/null @@ -1,2 +0,0 @@ -/usr/share/java/jackson-core-asl.jar /usr/share/java/jackson-core.jar -/usr/share/java/jackson-mapper-asl.jar /usr/share/java/jackson-mapper.jar diff --git a/debian/rules b/debian/rules index 9300b81..e3247ae 100755 --- a/debian/rules +++ b/debian/rules @@ -16,9 +16,6 @@ override_dh_auto_build: mklibdirs debian/bnd_plugin/net/luminis/build/plugin/bnd ant -buildfile debian/build.xml repackage-asm compile.main jars javadoc \ generate-poms -override_dh_installdocs: - dh_installdocs --link-doc=libjackson-json-java - override_dh_auto_clean: rm -rf lib build test dist -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjackson-json-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
