diff -Nru zeroc-ice-3.7.1/debian/changelog zeroc-ice-3.7.1/debian/changelog
--- zeroc-ice-3.7.1/debian/changelog	2018-11-08 12:56:39.000000000 +0000
+++ zeroc-ice-3.7.1/debian/changelog	2018-12-01 11:17:16.000000000 +0000
@@ -1,8 +1,8 @@
-zeroc-ice (3.7.1-5ubuntu1) disco; urgency=medium
+zeroc-ice (3.7.1-6) unstable; urgency=medium
 
-  * Build with -Wno-error (deprecated declarations in Python 3.7).
+  * Fix Python 3.7 build failure
 
- -- Matthias Klose <doko@ubuntu.com>  Thu, 08 Nov 2018 13:56:39 +0100
+ -- José Gutiérrez de la Concha <jose@zeroc.com>  Sat, 01 Dec 2018 11:17:16 +0000
 
 zeroc-ice (3.7.1-5) unstable; urgency=medium
 
diff -Nru zeroc-ice-3.7.1/debian/patches/no-werror.diff zeroc-ice-3.7.1/debian/patches/no-werror.diff
--- zeroc-ice-3.7.1/debian/patches/no-werror.diff	2018-11-08 12:56:39.000000000 +0000
+++ zeroc-ice-3.7.1/debian/patches/no-werror.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- a/config/Make.rules.Linux
-+++ b/config/Make.rules.Linux
-@@ -150,7 +150,7 @@ shared_ldflags      = $(if $(filter-out
-         -pie $(if $(filter yes,$(new_dtags)),-Wl$(comma)--enable-new-dtags,-Wl$(comma)--disable-new-dtags) \
-         $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-rpath-link-ldflags,$$d,$($4_dependencies)))))
- 
--cppflags        = -Wall -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g)
-+cppflags        = -Wall -Wdeprecated -pthread $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g)
- ldflags         = -pthread
- ifeq ($(MAXWARN),yes)
-     cppflags    += -Wextra -Wshadow -Wredundant-decls
diff -Nru zeroc-ice-3.7.1/debian/patches/python3.7-ftbs.patch zeroc-ice-3.7.1/debian/patches/python3.7-ftbs.patch
--- zeroc-ice-3.7.1/debian/patches/python3.7-ftbs.patch	1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.1/debian/patches/python3.7-ftbs.patch	2018-12-01 10:55:57.000000000 +0000
@@ -0,0 +1,38 @@
+--- a/python/modules/IcePy/Communicator.cpp
++++ b/python/modules/IcePy/Communicator.cpp
+@@ -39,7 +39,11 @@
+ using namespace std;
+ using namespace IcePy;
+ 
++#if PY_VERSION_HEX < 0x03070000
+ static long _mainThreadId;
++#else
++static unsigned long _mainThreadId;
++#endif
+ 
+ typedef map<Ice::CommunicatorPtr, PyObject*> CommunicatorMap;
+ static CommunicatorMap _communicatorMap;
+--- a/python/modules/IcePy/ObjectAdapter.cpp
++++ b/python/modules/IcePy/ObjectAdapter.cpp
+@@ -31,7 +31,11 @@
+ using namespace std;
+ using namespace IcePy;
+ 
++#if PY_VERSION_HEX < 0x03070000
+ static long _mainThreadId;
++#else
++static unsigned long _mainThreadId;
++#endif
+ 
+ namespace IcePy
+ {
+--- a/python/modules/IcePy/Types.cpp
++++ b/python/modules/IcePy/Types.cpp
+@@ -17,6 +17,7 @@
+ #include <Util.h>
+ #include <IceUtil/InputUtil.h>
+ #include <IceUtil/ScopedArray.h>
++#include <IceUtil/DisableWarnings.h>
+ #include <Ice/InputStream.h>
+ #include <Ice/LocalException.h>
+ #include <Ice/OutputStream.h>
diff -Nru zeroc-ice-3.7.1/debian/patches/series zeroc-ice-3.7.1/debian/patches/series
--- zeroc-ice-3.7.1/debian/patches/series	2018-11-08 12:56:39.000000000 +0000
+++ zeroc-ice-3.7.1/debian/patches/series	2018-12-01 10:13:38.000000000 +0000
@@ -2,4 +2,4 @@
 gcc8.2-ftbfs.patch
 better-detect-debian-derivatives.patch
 java-jdk11-build-fixes.patch
-no-werror.diff
+python3.7-ftbs.patch