This is an automated email from the git hooks/post-receive script. tpot-guest pushed a commit to branch master in repository jackson-datatype-guava.
commit 8eb95c938977e1f0102f55806608ea7b0a436ade Author: Tim Potter <[email protected]> Date: Tue Sep 30 08:28:30 2014 +1100 Imported Debian patch 2.4.2-1 --- debian/README.source | 13 +++++++++ debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 31 +++++++++++++++++++++ debian/copyright | 30 +++++++++++++++++++++ debian/libjackson2-datatype-guava-java.classpath | 1 + debian/libjackson2-datatype-guava-java.poms | 28 +++++++++++++++++++ debian/maven.cleanIgnoreRules | 1 + debian/maven.ignoreRules | 2 ++ debian/maven.properties | 5 ++++ debian/maven.publishedRules | 1 + debian/maven.rules | 10 +++++++ debian/patches/add-junit-dependency.patch | 17 ++++++++++++ debian/patches/dont-osgi-bundle.patch | 19 +++++++++++++ debian/patches/series | 2 ++ debian/replace-generate.sh | 34 ++++++++++++++++++++++++ debian/rules | 19 +++++++++++++ debian/source/format | 1 + debian/watch | 4 +++ 19 files changed, 224 insertions(+) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..a6ad694 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,13 @@ +Information about jackson-datatype-guava +---------------------------------------- + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. + +The debian/replace-generate.sh script is used in place of the +Maven replacer plugin to substitute project metadata in the +PackageVersion.java.in file. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e9d8cd4 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +jackson-datatype-guava (2.4.2-1) unstable; urgency=low + + * Initial release (Closes: #763568) + + -- Tim Potter <[email protected]> Tue, 30 Sep 2014 08:28:30 +1100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..2c6c0bf --- /dev/null +++ b/debian/control @@ -0,0 +1,31 @@ +Source: jackson-datatype-guava +Section: java +Priority: optional +Maintainer: Tim Potter <[email protected]> +Build-Depends: + debhelper (>= 9), + default-jdk, + javahelper, + junit4, + libguava-java, + libjackson2-core-java, + libjackson2-databind-java, + maven-debian-helper, + xmlstarlet +Standards-Version: 3.9.6 +Homepage: https://github.com/FasterXML/jackson-datatype-guava +Vcs-Git: git://anonscm.debian.org/pkg-java/jackson-datatype-guava.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jackson-datatype-guava.git + +Package: libjackson2-datatype-guava-java +Architecture: all +Depends: + ${maven:Depends}, + ${misc:Depends} +Recommends: + ${maven:OptionalDepends} +Description: Jackson support for JSON serialization of Guava collection types + The Guava module for Jackson aims to provide full support for + Google Guava (formerly known as "Google Collections"), and + specifically its Collection types. Notably supported are + notably deserializers for immutable types and hash multisets. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..502f97f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,30 @@ +t: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jackson-datatype-guava +Source: https://github.com/FasterXML/jackson-datatype-guava +Comment: FasterXML used a dual licensing approach (Apache-2.0 or LGPL) [0] + for jackson 2 by making suitably licensed jar files available for download. + [1] Users were then free to choose the license they wanted by downloading + the respective jar. + . + The source code itself was, however, never explicitly licensed. After raising + this issue on the jackson-dev mailing list [2] FasterXML decided to license + future versions of jackson 2 under Apache-2.0 only [3]. A copy of the + license can be found in src/main/resources/META-INF/LICENSE. + . + [0] http://wiki.fasterxml.com/JacksonLicensing + [1] http://wiki.fasterxml.com/JacksonDownload + [2] http://markmail.org/message/repexr3kb6gn4uam + [3] http://markmail.org/message/bwxz2hle5fhrhm3q + http://markmail.org/message/ckwelxnmoqlm5qr4 + +Files: * +Copyright: 2014, FasterXML, LLC, Seattle, USA <[email protected]> +License: Apache-2.0 + +Files: debian/* +Copyright: 2014 Tim Potter <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + On Debian systems, the full text of the Apache-2.0 license + can be found in the file '/usr/share/common-licenses/Apache-2.0' diff --git a/debian/libjackson2-datatype-guava-java.classpath b/debian/libjackson2-datatype-guava-java.classpath new file mode 100644 index 0000000..ac00380 --- /dev/null +++ b/debian/libjackson2-datatype-guava-java.classpath @@ -0,0 +1 @@ +usr/share/java/jackson-datatype-guava.jar /usr/share/java/jackson-core.jar /usr/share/java/jackson-databind.jar /usr/share/java/junit4.jar /usr/share/java/guava.jar diff --git a/debian/libjackson2-datatype-guava-java.poms b/debian/libjackson2-datatype-guava-java.poms new file mode 100644 index 0000000..64b1188 --- /dev/null +++ b/debian/libjackson2-datatype-guava-java.poms @@ -0,0 +1,28 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version --java-lib diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1 @@ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..857aa68 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ + +com.google.code.maven-replacer-plugin replacer * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..40d1d22 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true +maven.compiler.source=1.6 +maven.compiler.target=1.6 diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1 @@ + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..a525330 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,10 @@ + +com.fasterxml.jackson.core jackson-core bundle s/2\..*/2.x/ * * +com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * * +com.fasterxml.jackson.core jackson-databind bundle s/2\..*/2.x/ * * +com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * * +com.google.guava guava bundle s/.*/debian/ * * +com.google.guava guava s/jar/bundle/ s/.*/debian/ * * +junit junit jar s/4\..*/4.x/ * * +s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * * +s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * * diff --git a/debian/patches/add-junit-dependency.patch b/debian/patches/add-junit-dependency.patch new file mode 100644 index 0000000..0942ebb --- /dev/null +++ b/debian/patches/add-junit-dependency.patch @@ -0,0 +1,17 @@ +Index: jackson-datatype-guava-2.4.2/pom.xml +=================================================================== +--- jackson-datatype-guava-2.4.2.orig/pom.xml ++++ jackson-datatype-guava-2.4.2/pom.xml +@@ -72,6 +72,12 @@ com.fasterxml.jackson.databind.type + <artifactId>guava</artifactId> + <version>15.0</version> + </dependency> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>4.10</version> ++ <scope>test</scope> ++ </dependency> + </dependencies> + + <build> diff --git a/debian/patches/dont-osgi-bundle.patch b/debian/patches/dont-osgi-bundle.patch new file mode 100644 index 0000000..290d4d8 --- /dev/null +++ b/debian/patches/dont-osgi-bundle.patch @@ -0,0 +1,19 @@ +Description: Disable OSGI bundling + OSGI bundling is not supported or required for Debian +Author: Tim Potter <[email protected]> +Forwarded: no +Last-Update: 2014-10-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: jackson-datatype-guava-2.4.2/pom.xml +=================================================================== +--- jackson-datatype-guava-2.4.2.orig/pom.xml ++++ jackson-datatype-guava-2.4.2/pom.xml +@@ -9,7 +9,6 @@ + <artifactId>jackson-datatype-guava</artifactId> + <name>Jackson-datatype-Guava</name> + <version>2.4.2</version> +- <packaging>bundle</packaging> + <description>Add-on datatype-support module for Jackson (http://jackson.codehaus.org) that handles + Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just collection ones) + </description> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7a9ca17 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +dont-osgi-bundle.patch +add-junit-dependency.patch diff --git a/debian/replace-generate.sh b/debian/replace-generate.sh new file mode 100644 index 0000000..e87bb49 --- /dev/null +++ b/debian/replace-generate.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +# Simple replacement for mavan-replacer-plugin + +set -e + +TARGET=$1; shift + +TEMPLATE=$TARGET.in + +get_attr() { + < pom.xml xmlstarlet sel \ + -N pom=http://maven.apache.org/POM/4.0.0 \ + -T -t -v $1 +} + +package=$(dirname $TARGET | sed -e 's,.*src/main/java/\(.*\)$,\1,' | tr / .) +projectversion=$(get_attr '/pom:project/pom:version') +projectgroupid=$(get_attr '/pom:project/pom:groupId') +projectartifactid=$(get_attr '/pom:project/pom:artifactId') + +sed \ + -e "s,@package@,$package,g" \ + -e "s,@projectversion@,$projectversion,g" \ + -e "s,@projectgroupid@,$projectgroupid,g" \ + -e "s,@projectartifactid@,$projectartifactid,g" \ + < $TEMPLATE > $TARGET.t + +if grep -i '@[a-z]*@' $TARGET.t >&2; then + echo 'Not all tags were + replaced' >&2 exit 1 +fi + +mv $TARGET.t $TARGET diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..bcdd38f --- /dev/null +++ b/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +#export DH_VERSION=1 + +VERSION_FILE=src/main/java/com/fasterxml/jackson/datatype/guava/PackageVersion.java + +%: + dh $@ --buildsystem=maven --with javahelper + +override_dh_auto_configure: + sh debian/replace-generate.sh $(VERSION_FILE) + dh_auto_configure + +override_dh_auto_clean: + rm -f $(VERSION_FILE) + dh_auto_clean + +override_dh_installchangelogs: + dh_installchangelogs release-notes/VERSION diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..a4c92a9 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +https://github.com/FasterXML/jackson-datatype-guava/tags \ +/FasterXML/jackson-datatype-guava/archive/jackson-datatype-guava-(.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-datatype-guava.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
