[jackson-datatype-guava] 04/05: Add TableSerializer.patch and fix FTBFS due to ambiguous references to

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jackson-datatype-guava.

commit 2773d306e750f36c2c7603c6e67efadef14c58b1
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 28 23:02:04 2016 +0100

    Add TableSerializer.patch and fix FTBFS due to ambiguous references to
    
    construct.
    
    Closes: #849449
---
 debian/changelog                     |  5 ++--
 debian/patches/TableSerializer.patch | 46 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3aaba4..95544bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-jackson-datatype-guava (2.7.3-2) UNRELEASED; urgency=medium
+jackson-datatype-guava (2.7.3-2) unstable; urgency=medium
 
   * Team upload.
-  * 
+  * Add TableSerializer.patch and fix FTBFS due to ambiguous references to
+    construct. (Closes: #849449)
 
  -- Markus Koschany <apo at debian.org>  Wed, 28 Dec 2016 22:45:51 +0100
 
diff --git a/debian/patches/TableSerializer.patch b/debian/patches/TableSerializer.patch
new file mode 100644
index 0000000..e0dc773
--- /dev/null
+++ b/debian/patches/TableSerializer.patch
@@ -0,0 +1,46 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 28 Dec 2016 22:59:19 +0100
+Subject: TableSerializer
+
+Fix FTBFS due to ambiguous references to construct.
+See
+https://github.com/FasterXML/jackson-datatypes-collections/blob/master/guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/TableSerializer.java
+
+jackson-datatype-guava is dead and has been merged into
+jackson-datatypes-collections.
+
+Forwarded: not-needed
+---
+ .../com/fasterxml/jackson/datatype/guava/ser/TableSerializer.java    | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/com/fasterxml/jackson/datatype/guava/ser/TableSerializer.java b/src/main/java/com/fasterxml/jackson/datatype/guava/ser/TableSerializer.java
+index 13726f2..ffd4d51 100644
+--- a/src/main/java/com/fasterxml/jackson/datatype/guava/ser/TableSerializer.java
++++ b/src/main/java/com/fasterxml/jackson/datatype/guava/ser/TableSerializer.java
+@@ -2,6 +2,7 @@ package com.fasterxml.jackson.datatype.guava.ser;
+ 
+ import java.io.IOException;
+ import java.util.Map;
++import java.util.Set;
+ 
+ import com.fasterxml.jackson.core.*;
+ 
+@@ -78,7 +79,7 @@ public class TableSerializer
+         final MapType columnAndValueType = typeFactory.constructMapType(Map.class,
+                 _type.containedTypeOrUnknown(1), _type.containedTypeOrUnknown(2));
+         JsonSerializer<?> columnAndValueSerializer = 
+-                MapSerializer.construct(null,
++                MapSerializer.construct((Set<String>) null,
+                                         columnAndValueType,
+                                         false,
+                                         _valueTypeSerializer,
+@@ -89,7 +90,7 @@ public class TableSerializer
+         final MapType rowMapType = typeFactory.constructMapType(Map.class,
+                 _type.containedTypeOrUnknown(0), columnAndValueType);
+         _rowMapSerializer =
+-                MapSerializer.construct(null,
++                MapSerializer.construct((Set<String>) null,
+                                         rowMapType,
+                                         false,
+                                         null,
diff --git a/debian/patches/series b/debian/patches/series
index 7a9ca17..6c85763 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 dont-osgi-bundle.patch
 add-junit-dependency.patch
+TableSerializer.patch

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