[jackson-dataformat-xml] 01/01: Imported Debian patch 2.5.3-1
Markus Koschany
apo-guest at moszumanska.debian.org
Tue May 12 16:25:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository jackson-dataformat-xml.
commit ab074dd5f21d9f3493cc7537b29d39bc25057c69
Author: Markus Koschany <apo at gambaru.de>
Date: Tue May 12 17:42:38 2015 +0200
Imported Debian patch 2.5.3-1
---
debian/README.source | 9 ++++
debian/changelog | 5 ++
debian/compat | 1 +
debian/control | 57 ++++++++++++++++++++++
debian/copyright | 18 +++++++
...ibjackson2-dataformat-xml-java-doc.doc-base.api | 10 ++++
debian/libjackson2-dataformat-xml-java-doc.install | 2 +
debian/libjackson2-dataformat-xml-java.poms | 28 +++++++++++
debian/maven.ignoreRules | 4 ++
debian/maven.properties | 6 +++
debian/maven.publishedRules | 2 +
debian/maven.rules | 10 ++++
debian/patches/fix-bundle-build.patch | 25 ++++++++++
debian/patches/fix-wrong-parameters.patch | 21 ++++++++
debian/patches/series | 2 +
debian/replace-generate.sh | 34 +++++++++++++
debian/rules | 20 ++++++++
debian/source/format | 1 +
debian/watch | 4 ++
19 files changed, 259 insertions(+)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..67771c2
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+Information about jackson-dataformat-xml
+----------------------------------------
+
+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.
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..31ccc3f
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+jackson-dataformat-xml (2.5.3-1) unstable; urgency=medium
+
+ * Initial release. (Closes: #785131)
+
+ -- Markus Koschany <apo at gambaru.de> Tue, 12 May 2015 17:42:38 +0200
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..183354b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,57 @@
+Source: jackson-dataformat-xml
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders:
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ debhelper (>= 9),
+ default-jdk,
+ maven-debian-helper (>= 1.5),
+ xmlstarlet
+Build-Depends-Indep:
+ default-jdk-doc,
+ libjackson2-annotations-java,
+ libjackson2-annotations-java-doc,
+ libjackson2-core-java,
+ libjackson2-core-java-doc,
+ libjackson2-databind-java,
+ libjackson2-databind-java-doc,
+ libjackson2-module-jaxb-annotations-java,
+ libmaven-javadoc-plugin-java,
+ libmaven-bundle-plugin-java,
+ libstax2-api-java (>= 3.1.1)
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/jackson-dataformat-xml.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jackson-dataformat-xml.git
+Homepage: http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
+
+Package: libjackson2-dataformat-xml-java
+Architecture: all
+Depends:
+ ${maven:Depends},
+ ${misc:Depends}
+Suggests:
+ libjackson2-dataformat-xml-java-doc,
+ ${maven:OptionalDepends}
+Description: fast and powerful JSON library for Java -- XML dataformat
+ Data format extension for Jackson to offer alternative support for serializing
+ POJOs (Plain Old Java Objects) as XML and deserializing XML as POJOs. Support
+ was implemented on top of Stax API (javax.xml.stream) by implementing core
+ Jackson Streaming API types like JsonGenerator, JsonParser and JsonFactory.
+
+Package: libjackson2-dataformat-xml-java-doc
+Architecture: all
+Section: doc
+Depends:
+ ${misc:Depends}
+Recommends:
+ ${maven:DocDepends},
+ ${maven:DocOptionalDepends}
+Suggests:
+ libjackson2-dataformat-xml-java
+Description: Documentation for Jackson-dataformat-XML
+ Data format extension for Jackson to offer alternative support for serializing
+ POJOs as XML and deserializing XML as POJOs.
+ .
+ This package contains the API documentation of libjackson2-dataformat-xml-java.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e1ac4da
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,18 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Jackson-dataformat-XML
+Source: http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
+
+Files: *
+Copyright: 2015, FasterXML, LLC, Seattle, USA <info at fasterxml.com>
+License: Apache-2.0
+Comment:
+ See src/main/resources/META-INF/LICENSE and
+ http://wiki.fasterxml.com/JacksonLicensing
+
+Files: debian/*
+Copyright: 2015, Markus Koschany <apo at gambaru.de>
+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-dataformat-xml-java-doc.doc-base.api b/debian/libjackson2-dataformat-xml-java-doc.doc-base.api
new file mode 100644
index 0000000..44a63b3
--- /dev/null
+++ b/debian/libjackson2-dataformat-xml-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libjackson2-dataformat-xml-java
+Title: API Javadoc for Jackson-dataformat-XML
+Author: Jackson-dataformat-XML developers
+Abstract: This is the API Javadoc provided for the
+ libjackson-dataformat-xml-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libjackson2-dataformat-xml-java/api/index.html
+Files: /usr/share/doc/libjackson2-dataformat-xml-java/api/*
diff --git a/debian/libjackson2-dataformat-xml-java-doc.install b/debian/libjackson2-dataformat-xml-java-doc.install
new file mode 100644
index 0000000..d4d2be6
--- /dev/null
+++ b/debian/libjackson2-dataformat-xml-java-doc.install
@@ -0,0 +1,2 @@
+
+target/apidocs/* usr/share/doc/libjackson2-dataformat-xml-java/api
diff --git a/debian/libjackson2-dataformat-xml-java.poms b/debian/libjackson2-dataformat-xml-java.poms
new file mode 100644
index 0000000..5ad70f2
--- /dev/null
+++ b/debian/libjackson2-dataformat-xml-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
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..3178294
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,4 @@
+
+javax.xml.stream stax-api * * * *
+org.codehaus.woodstox woodstox-core-asl * * * *
+com.google.code.maven-replacer-plugin replacer * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..7471c37
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,6 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+maven.test.skip=true
+project.build.sourceEncoding=UTF-8
+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..5bcf05a
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,2 @@
+
+com.fasterxml.jackson.dataformat jackson-dataformat-xml s/jar/bundle/ s/2\..*/2.x/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..9bf979b
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,10 @@
+
+com.fasterxml.jackson.core jackson-annotations bundle s/2\..*/2.x/ * *
+com.fasterxml.jackson.core jackson-annotations s/jar/bundle/ s/2\..*/2.x/ * *
+com.fasterxml.jackson.core jackson-core bundle s/2\..*/2.x/ * *
+com.fasterxml.jackson.core jackson-core s/jar/bundle/ s/2\..*/2.x/ * *
+com.fasterxml.jackson.core jackson-databind bundle s/2\..*/2.x/ * *
+com.fasterxml.jackson.core jackson-databind s/jar/bundle/ s/2\..*/2.x/ * *
+com.fasterxml.jackson.dataformat jackson-dataformat-xml bundle s/2\..*/2.x/ * *
+com.fasterxml.jackson.module jackson-module-jaxb-annotations bundle s/2\..*/2.x/ * *
+com.fasterxml.jackson.module jackson-module-jaxb-annotations s/jar/bundle/ s/2\..*/2.x/ * *
diff --git a/debian/patches/fix-bundle-build.patch b/debian/patches/fix-bundle-build.patch
new file mode 100644
index 0000000..937e1de
--- /dev/null
+++ b/debian/patches/fix-bundle-build.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 11 May 2015 15:00:53 +0200
+Subject: fix bundle build
+
+---
+ pom.xml | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index 651c542..fd2846d 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -142,6 +142,12 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
+ </includes>
+ </configuration>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <version>2.3.5</version>
++ <extensions>true</extensions>
++ </plugin>
+ </plugins>
+ </build>
+
diff --git a/debian/patches/fix-wrong-parameters.patch b/debian/patches/fix-wrong-parameters.patch
new file mode 100644
index 0000000..caf87b7
--- /dev/null
+++ b/debian/patches/fix-wrong-parameters.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 12 May 2015 00:02:26 +0200
+Subject: fix wrong parameters
+
+---
+ .../com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java
+index 930c1d4..3ba1073 100644
+--- a/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java
++++ b/src/main/java/com/fasterxml/jackson/dataformat/xml/ser/XmlBeanPropertyWriter.java
+@@ -117,7 +117,7 @@ public class XmlBeanPropertyWriter
+ // and then see if we must suppress certain values (default, empty)
+ if (_suppressableValue != null) {
+ if (MARKER_FOR_EMPTY == _suppressableValue) {
+- if (ser.isEmpty(prov, value)) {
++ if (ser.isEmpty(value)) {
+ return;
+ }
+ } else if (_suppressableValue.equals(value)) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..404e708
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-bundle-build.patch
+fix-wrong-parameters.patch
diff --git a/debian/replace-generate.sh b/debian/replace-generate.sh
new file mode 100755
index 0000000..9993bf0
--- /dev/null
+++ b/debian/replace-generate.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Simple replacement for maven-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, at package@,$package,g" \
+ -e "s, at projectversion@,$projectversion,g" \
+ -e "s, at projectgroupid@,$projectgroupid,g" \
+ -e "s, at 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..0fdf3b1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+export JAVA_HOME=/usr/lib/jvm/default-java
+VERSION_FILE=src/main/java/com/fasterxml/jackson/dataformat/xml/PackageVersion.java
+
+%:
+ dh $@ --parallel --buildsystem=maven
+
+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
+
+get-orig-source:
+ uscan --download-current-version --force-download --no-symlink
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..15af170
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,uversionmangle=s/_/./g;s/\.Beta/~beta/;s/\.Final// \
+https://github.com/FasterXML/jackson-dataformat-xml/tags \
+.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)jackson-dataformat-xml-(\d\S*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-xml.git
More information about the pkg-java-commits
mailing list