[jackson-dataformat-xml] 01/01: Merge branch 'master' of https://anonscm.debian.org/cgit/pkg-java/jackson-dataformat-xml

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository jackson-dataformat-xml.

commit b7cd90556eade32868a265d3b4f1c4cdd96a0a32
Merge: a2ec8ab d4e40fb
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 18 14:51:42 2016 +0100

    Merge branch 'master' of https://anonscm.debian.org/cgit/pkg-java/jackson-dataformat-xml

 debian/changelog                                   |  7 ++++++
 debian/control                                     |  4 ++--
 debian/libjackson2-dataformat-xml-java.poms        |  2 +-
 debian/patches/fix-bundle-build.patch              | 25 ----------------------
 .../jackson-annotations-dependency-version.patch   | 20 -----------------
 debian/patches/series                              |  2 --
 6 files changed, 10 insertions(+), 50 deletions(-)

diff --cc debian/changelog
index a3842b4,5349f08..6017be6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 -jackson-dataformat-xml (2.8.5-2) UNRELEASED; urgency=medium
++jackson-dataformat-xml (2.8.5-3) UNRELEASED; urgency=medium
+ 
+   * Team upload.
+   * Inherit from the parent POM and removed the POM patches
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Dec 2016 06:39:12 +0100
+ 
 +jackson-dataformat-xml (2.8.5-2) unstable; urgency=medium
 +
 +  * Drop fix-wrong-parameters.patch. The package builds fine without it again.
 +
 + -- Markus Koschany <apo at debian.org>  Sun, 18 Dec 2016 14:39:07 +0100
 +
  jackson-dataformat-xml (2.8.5-1) unstable; urgency=medium
  
    * New upstream version 2.8.5.
diff --cc debian/patches/series
index c95765a,124332c..0000000
deleted file mode 100644,100644
--- a/debian/patches/series
+++ /dev/null
@@@ -1,2 -1,1 +1,0 @@@
- fix-bundle-build.patch
- jackson-annotations-dependency-version.patch
 -fix-wrong-parameters.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-dataformat-xml.git