This is an automated email from the git hooks/post-receive script. tpot-guest pushed a commit to branch master in repository jackson-datatype-joda.
commit 65e2d91fed7816b6b16ed3bc3c6718c4732b5735 Author: Tim Potter <[email protected]> Date: Tue Oct 28 12:49:13 2014 +1100 Imported Debian patch 2.4.3-1 --- debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 16 +++++++++++ debian/copyright | 38 +++++++++++++++++++++++++ debian/docs | 1 + debian/jackson-datatype-joda.substvars | 1 + debian/libjackson2-datatype-joda-java.classpath | 1 + debian/libjackson2-datatype-joda-java.poms | 28 ++++++++++++++++++ debian/maven.ignoreRules | 1 + debian/maven.properties | 5 ++++ debian/maven.rules | 7 +++++ debian/patches/add-junit-dependency.patch | 18 ++++++++++++ debian/patches/dont-osgi-bundle.patch | 12 ++++++++ debian/patches/series | 2 ++ debian/replace-generate.sh | 34 ++++++++++++++++++++++ debian/rules | 19 +++++++++++++ debian/source/format | 1 + debian/watch | 4 +++ 18 files changed, 194 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e190b4c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +jackson-datatype-joda (2.4.3-1) unstable; urgency=low + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + + -- Tim Potter <[email protected]> Tue, 28 Oct 2014 12:49:13 +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..ec437bf --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: jackson-datatype-joda +Section: java +Priority: optional +Maintainer: Tim Potter <[email protected]> +Build-Depends: debhelper (>= 9), default-jdk, default-jdk-doc, javahelper, libmaven-javadoc-plugin-java, maven-debian-helper, xmlstarlet, libjackson2-annotations-java, libjoda-time-java, libjackson2-core-java, libjackson2-databind-java, junit4 +Standards-Version: 3.9.6 +Homepage: https://github.com/FasterXML/jackson-datatype-joda +Vcs-Git: git://anonscm.debian.org/pkg-java/jackson-datatype-joda.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jackson-datatype-joda.git + +Package: libjackson2-datatype-joda-java +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: ${maven:OptionalDepends} +Description: <insert up to 60 chars description> + <insert long description, indented with spaces> diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c1432bd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jackson-datatype-joda +Source: <url://example.com> + +Files: * +Copyright: <years> <put author's name and email here> + <years> <likewise for another author> +License: <special license> + <Put the license of the package here indented by 1 space> + <This follows the format of Description: lines in control file> + . + <Including paragraphs> + +# If you want to use GPL v2 or later for the /debian/* files use +# the following clauses, or change it to suit. Delete these two lines +Files: debian/* +Copyright: 2014 Tim Potter <[email protected]> +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. +# Please avoid to pick license terms that are more restrictive than the +# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/jackson-datatype-joda.substvars b/debian/jackson-datatype-joda.substvars new file mode 100644 index 0000000..abd3ebe --- /dev/null +++ b/debian/jackson-datatype-joda.substvars @@ -0,0 +1 @@ +misc:Depends= diff --git a/debian/libjackson2-datatype-joda-java.classpath b/debian/libjackson2-datatype-joda-java.classpath new file mode 100644 index 0000000..be0e0fb --- /dev/null +++ b/debian/libjackson2-datatype-joda-java.classpath @@ -0,0 +1 @@ +usr/share/java/jackson-datatype-joda.jar /usr/share/java/joda-time.jar /usr/share/java/jackson-core.jar /usr/share/java/jackson-annotations.jar /usr/share/java/jackson-databind.jar /usr/share/java/junit4.jar diff --git a/debian/libjackson2-datatype-joda-java.poms b/debian/libjackson2-datatype-joda-java.poms new file mode 100644 index 0000000..64b1188 --- /dev/null +++ b/debian/libjackson2-datatype-joda-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.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..ca35932 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1 @@ +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.rules b/debian/maven.rules new file mode 100644 index 0000000..750667b --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,7 @@ +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-annotations bundle s/2\..*/2.x/ * * +com.fasterxml.jackson.core jackson-annotations 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/ * * +junit junit jar s/4\..*/4.x/ * * diff --git a/debian/patches/add-junit-dependency.patch b/debian/patches/add-junit-dependency.patch new file mode 100644 index 0000000..867a056 --- /dev/null +++ b/debian/patches/add-junit-dependency.patch @@ -0,0 +1,18 @@ +Index: jackson-datatype-joda-2.4.3/pom.xml +=================================================================== +--- jackson-datatype-joda-2.4.3.orig/pom.xml ++++ jackson-datatype-joda-2.4.3/pom.xml +@@ -69,6 +69,13 @@ Joda (http://joda-time.sourceforge.net/) + </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..88e19f1 --- /dev/null +++ b/debian/patches/dont-osgi-bundle.patch @@ -0,0 +1,12 @@ +Index: jackson-datatype-joda-2.4.3/pom.xml +=================================================================== +--- jackson-datatype-joda-2.4.3.orig/pom.xml ++++ jackson-datatype-joda-2.4.3/pom.xml +@@ -10,7 +10,6 @@ + <artifactId>jackson-datatype-joda</artifactId> + <name>Jackson-datatype-Joda</name> + <version>2.4.3</version> +- <packaging>bundle</packaging> + <description>Add-on module for Jackson (http://jackson.codehaus.org) to support + Joda (http://joda-time.sourceforge.net/) data types. + </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..baba10b --- /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/joda/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..96d9c6a --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +https://github.com/FasterXML/jackson-datatype-joda/tags \ +/FasterXML/jackson-datatype-joda/archive/jackson-datatype-joda-(.*)\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-datatype-joda.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
