diff -Nru netty-4.1.7/debian/changelog netty-4.1.7/debian/changelog
--- netty-4.1.7/debian/changelog	2017-07-23 01:56:07.000000000 +0000
+++ netty-4.1.7/debian/changelog	2017-07-30 15:31:35.000000000 +0000
@@ -1,3 +1,12 @@
+netty (1:4.1.7-4) unstable; urgency=medium
+
+  * Team upload.
+  * Update debian/watch to repack with xz compression
+  * Bump Standards-Version to 4.0.0
+  * Update jctools2 patch for approach used upstream (see #866771)
+
+ -- tony mancill <tmancill@debian.org>  Sun, 30 Jul 2017 08:31:35 -0700
+
 netty (1:4.1.7-3) unstable; urgency=medium
 
   * Team upload.
diff -Nru netty-4.1.7/debian/control netty-4.1.7/debian/control
--- netty-4.1.7/debian/control	2017-07-23 01:56:07.000000000 +0000
+++ netty-4.1.7/debian/control	2017-07-30 15:31:35.000000000 +0000
@@ -31,7 +31,7 @@
                libprotobuf-java,
                libxz-java,
                maven-debian-helper (>= 1.5)
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/netty.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/netty.git
 Homepage: http://netty.io/
diff -Nru netty-4.1.7/debian/patches/12-jctools2.patch netty-4.1.7/debian/patches/12-jctools2.patch
--- netty-4.1.7/debian/patches/12-jctools2.patch	2017-07-23 01:56:07.000000000 +0000
+++ netty-4.1.7/debian/patches/12-jctools2.patch	2017-07-30 15:31:35.000000000 +0000
@@ -4,21 +4,12 @@
 
 --- a/common/src/main/java/io/netty/util/internal/PlatformDependent.java
 +++ b/common/src/main/java/io/netty/util/internal/PlatformDependent.java
-@@ -21,7 +21,7 @@
- import io.netty.util.internal.logging.InternalLogger;
- import io.netty.util.internal.logging.InternalLoggerFactory;
- import org.jctools.queues.MpscArrayQueue;
--import org.jctools.queues.MpscChunkedArrayQueue;
-+import org.jctools.queues.MpscGrowableArrayQueue;
- import org.jctools.queues.SpscLinkedQueue;
- import org.jctools.queues.atomic.MpscAtomicArrayQueue;
- import org.jctools.queues.atomic.MpscLinkedAtomicQueue;
 @@ -835,7 +835,7 @@
                  // up to the next power of two and so will overflow otherwise.
                  final int capacity =
                          Math.max(Math.min(maxCapacity, MAX_ALLOWED_MPSC_CAPACITY), MIN_MAX_MPSC_CAPACITY);
 -                return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity, true);
-+                return new MpscGrowableArrayQueue<T>(MPSC_CHUNK_SIZE, capacity);
++                return new MpscChunkedArrayQueue<T>(MPSC_CHUNK_SIZE, capacity);
              } else {
                  return new MpscLinkedAtomicQueue<T>();
              }
diff -Nru netty-4.1.7/debian/watch netty-4.1.7/debian/watch
--- netty-4.1.7/debian/watch	2017-07-23 01:56:07.000000000 +0000
+++ netty-4.1.7/debian/watch	2017-07-30 15:31:35.000000000 +0000
@@ -1,2 +1,3 @@
-version=3
-https://github.com/netty/netty/tags .*/netty-([\d\.]+).Final.tar.gz
+version=4
+opts="repack,compression=xz" \
+    https://github.com/netty/netty/tags .*/netty-([\d\.]+).Final.tar.gz