diff -pruN 1.8.11-2/debian/NEWS 1.8.11-2ubuntu2/debian/NEWS
--- 1.8.11-2/debian/NEWS	2024-11-08 18:23:08.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/NEWS	2025-01-23 21:53:50.000000000 +0000
@@ -1,3 +1,15 @@
+iptables (1.8.4-3ubuntu3) groovy; urgency=medium
+
+    By default, this package will try to use the nf_tables kernel backend
+    instead of the xtables one. Please, read more about this in
+    /usr/share/doc/iptables/README.Debian, including details about the new
+    update-alternatives configuration possibilities.
+    This is a major update on the way iptables works and may have severe impact
+    in running systems which are upgrading between Ubuntu versions.
+    The arptables and ebtables binaries are also affected.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Wed, 02 Sep 2020 16:52:04 +0200
+
 iptables (1.8.4-1) unstable; urgency=medium
 
     All the iptables binaries have been moved away from /sbin to /usr/sbin.
diff -pruN 1.8.11-2/debian/changelog 1.8.11-2ubuntu2/debian/changelog
--- 1.8.11-2/debian/changelog	2024-11-20 09:03:53.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/changelog	2025-09-05 15:14:26.000000000 +0000
@@ -1,3 +1,22 @@
+iptables (1.8.11-2ubuntu2) questing; urgency=medium
+
+  * Rebuild to include updated RISC-V base ISA RVA23
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Fri, 05 Sep 2025 15:14:26 +0000
+
+iptables (1.8.11-2ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2096615). Remaining changes:
+    - debian/tests/control: Add nftables:native depends in the autopkgtest
+      and switch to isolation-machine
+    - autopkgtest: allow-stderr on command9 to fix regression
+    - autopkgtest: Enable iptables, 0006rename-segfault_0 self-test
+    - debian/rules: Chmod patched test case in autopkgtest
+    - d/p/9002-libxt_recent-Add-support-for-reap-option.patch: Some changes
+      are upstream, patch needed for additional reap option checks.
+
+ -- Adrien Nader <adrien.nader@canonical.com>  Thu, 23 Jan 2025 22:53:50 +0100
+
 iptables (1.8.11-2) unstable; urgency=medium
 
   * [91cce2c] d/patches: add patch to fix `-C` commands (Closes: #1087210)
@@ -33,6 +52,34 @@ iptables (1.8.10-4) unstable; urgency=me
 
  -- Jeremy Sowden <azazel@debian.org>  Mon, 27 May 2024 16:19:43 +0100
 
+iptables (1.8.10-3ubuntu2) noble; urgency=high
+
+  * No change rebuild for 64-bit time_t and frame pointers.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 08 Apr 2024 17:59:59 +0200
+
+iptables (1.8.10-3ubuntu1) noble; urgency=medium
+
+  [ Nishit Majithia ]
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/control: Add nftables:native depends in the autopkgtest
+      and switch to isolation-machine
+    - autopkgtest: allow-stderr on command9 to fix regression
+    - autopkgtest: Enable iptables, 0006rename-segfault_0 self-test
+    - debian/rules: Chmod patched test case in autopkgtest
+    - d/p/skip-some-shell-tests.patch: Fixes regressed autopkgtests
+    - d/p/9002-libxt_recent-Add-support-for-reap-option.patch: Some changes
+      are upstream, patch needed for additional reap option checks.
+  * Dropped changes, included upstream:
+    - d/p/0001-extensions-NAT-Fix-for--Werror-format-security.patch
+    - d/p/0002-iptables-test-py-python3.patch
+
+  [ Alex Murray ]
+  * Promote nftables from Suggests to Recommends for iptables since the
+    nft backend has been the default for quite a while now
+
+ -- Nishit Majithia <nishit.majithia@canonical.com>  Wed, 14 Feb 2024 10:40:44 +0530
+
 iptables (1.8.10-3) unstable; urgency=medium
 
   [ Helmut Grohne ]
@@ -80,6 +127,43 @@ iptables (1.8.10-1) unstable; urgency=me
 
  -- Jeremy Sowden <jeremy@azazel.net>  Tue, 12 Dec 2023 20:34:01 +0000
 
+iptables (1.8.9-2ubuntu2) mantic; urgency=medium
+
+  * Update patch to skip one more of the iptables shell tests on cross-i386, as they
+    appear to always fail. Fixes regressed autopkgtest.
+    - d/p/skip-some-shell-tests.patch
+
+ -- Alex Murray <alex.murray@canonical.com>  Fri, 21 Jul 2023 11:53:55 +0930
+
+iptables (1.8.9-2ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/tests/control: Add nftables:native depends in the autopkgtest
+      and switch to isolation-machine
+    - debian/rules: Chmod patched test case in autopkgtest
+    - skip-some-shell-tests.patch: Fixes regressed autopkgtests
+    - Enable iptables, 0006rename-segfault_0 self-test in autopkgtest
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - Demote nftables from Recommends to Suggests for mantic
+    - autopkgtest: allow-stderr on command9 to fix regression
+  * Dropped changes, included upstream:
+    - d/p/9005-iptables-nft-fix-Z-option.patch: Fix counters with
+      iptables-nft and add a test case (LP: #1949603)
+    - d/p/0001-libiptc-Fix-for-segfault-when-renaming-a-chain.patch: Fix
+      for segfault when renaming a chain (LP: #1992454)
+  * Dropped changes, unneeded anymore:
+    - d/p/9000-howtos.patch: documentation for the old netfilter based API
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      dropping the documentation for the old netfilter based API
+    - debian/control: add linuxdoc-tools dep
+    - debian/control: correct Breaks/Replaces for ipt_kernel_headers.h
+      move from libiptc-dev to libip4tc-dev
+
+ -- Nishit Majithia <nishit.majithia@canonical.com>  Mon, 10 Jul 2023 09:12:23 +0530
+
 iptables (1.8.9-2) unstable; urgency=medium
 
   * [bbe4f39] iptables: build-depend on netbase
@@ -120,6 +204,79 @@ iptables (1.8.8-1) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Mon, 23 May 2022 21:17:34 +0200
 
+iptables (1.8.7-1ubuntu7) lunar; urgency=medium
+
+  * d/patches: 0001-libiptc-Fix-for-segfault-when-renaming-a-chain.patch
+    Apply upstream fix :
+    - libiptc: Fix for segfault when renaming a chain (LP: #1992454)
+
+ -- Louis Bouchard <louis@ubuntu.com>  Tue, 11 Oct 2022 14:26:53 +0200
+
+iptables (1.8.7-1ubuntu6) kinetic; urgency=medium
+
+  * Skip some of the iptables shell tests on cross-i386 and s390x, as they
+    appear to always fail. Fixes regressed autopkgtests.
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Thu, 28 Apr 2022 17:16:19 +0100
+
+iptables (1.8.7-1ubuntu5) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 24 Mar 2022 12:58:09 +0100
+
+iptables (1.8.7-1ubuntu4) jammy; urgency=medium
+
+  [ Andrea Righi ]
+  * Fix counters with iptables-nft and add a test case (LP: #1949603)
+    - d/p/9005-iptables-nft-fix-Z-option.patch
+  * Enable iptables selftest in autopkgtest
+
+  [ Dimitri John Ledkov ]
+  * Chmod patched test case in autopkgtest as well.
+  * Add nftables:native depends in the autopkgtest and switch to
+    isolation-machine.
+  * Upload to jammy.
+
+ -- Andrea Righi <andrea.righi@canonical.com>  Wed, 03 Nov 2021 15:50:49 +0000
+
+iptables (1.8.7-1ubuntu3) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:13:07 +0200
+
+iptables (1.8.7-1ubuntu2) hirsute; urgency=medium
+
+  * No change rebuild with fixed ownership.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 16 Feb 2021 15:16:08 +0000
+
+iptables (1.8.7-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: correct Breaks/Replaces for ipt_kernel_headers.h
+      move from libiptc-dev to libip4tc-dev
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - Demote nftables from Recommends to Suggests for hirsute.
+    - autopkgtest: allow-stderr on command9 to fix regression
+  * Dropped changes, included upstream:
+    - d/p/9003-iptables_nft_fix_basechain_policy_configuration.patch: Backport
+      patch from upstream to fix basechain policy configuration when it
+      wasn't explicitly set.
+    - d/p/9004-ebtables-fix-for-broken-chain-rename.patch: Backport patch
+      from upstream to fix improper use of errno to indicate failure when
+      renaming an existing chain.
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 10 Feb 2021 14:20:27 +1030
+
 iptables (1.8.7-1) unstable; urgency=medium
 
   * [6343d36] New upstream version 1.8.7 (Closes: #975028)
@@ -135,6 +292,42 @@ iptables (1.8.6-1) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Mon, 09 Nov 2020 11:38:43 +0100
 
+iptables (1.8.5-3ubuntu4) hirsute; urgency=medium
+
+  * Fix regression in ebtables when renaming a chain (LP: #1904192)
+    - d/p/9004-ebtables-fix-for-broken-chain-rename.patch: Backport patch
+      from upstream to fix improper use of errno to indicate failure when
+      renaming an existing chain.
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 18 Nov 2020 11:36:27 +1030
+
+iptables (1.8.5-3ubuntu3) hirsute; urgency=medium
+
+  * Fix regression when configuring basechain policy (LP: #1898547)
+    - d/p/9003-iptables_nft_fix_basechain_policy_configuration.patch: Backport
+      patch from upstream to fix basechain policy configuration when it
+      wasn't explicitly set.
+
+ -- Alex Murray <alex.murray@canonical.com>  Tue, 03 Nov 2020 11:57:59 +1030
+
+iptables (1.8.5-3ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1894195). Remaining changes:
+    - debian/control: correct Breaks/Replaces for ipt_kernel_headers.h
+      move from libiptc-dev to libip4tc-dev
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - Demote nftables from Recommends to Suggests for groovy.
+    - autopkgtest: allow-stderr on command9 to fix regression
+
+ -- Alex Murray <alex.murray@canonical.com>  Mon, 21 Sep 2020 17:21:46 +0930
+
 iptables (1.8.5-3) unstable; urgency=medium
 
   * [2d587e5] src:iptables: bump build-dep version on libnftnl to 1.1.6
@@ -169,6 +362,37 @@ iptables (1.8.5-1) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Thu, 04 Jun 2020 13:33:22 +0200
 
+iptables (1.8.4-3ubuntu3) groovy; urgency=medium
+
+  * Swap alternative priority and prefer nftables backend over legacy
+    (LP: #1887186)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 10 Jul 2020 16:32:47 +0200
+
+iptables (1.8.4-3ubuntu2) focal; urgency=medium
+
+  * debian/control: correct Breaks/Replaces for ipt_kernel_headers.h
+    move from libiptc-dev to libip4tc-dev (LP: #1865055)
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Fri, 28 Feb 2020 14:16:32 +0000
+
+iptables (1.8.4-3ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - Swap alternative priority around so we prefer legacy.
+    - Demote nftables from Recommends to Suggests for focal.
+    - autopkgtest: allow-stderr on command9 to fix regression
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Thu, 13 Feb 2020 22:23:25 +0000
+
 iptables (1.8.4-3) unstable; urgency=medium
 
   [ Alberto Molina Coballes ]
@@ -180,6 +404,26 @@ iptables (1.8.4-3) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Thu, 13 Feb 2020 12:20:19 +0100
 
+iptables (1.8.4-2ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - Swap alternative priority around so we prefer legacy.
+    - Demote nftables from Recommends to Suggests for focal.
+    - autopkgtest: allow-stderr on command9 to fix regression
+  * Dropped changes, included upstream:
+    - d/p/lp-1840633-nft-exit-in-case-we-can-t-fetch-current-genid.patch: avoid
+      busy loop if cache can't be created
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 13 Feb 2020 11:16:57 -0800
+
 iptables (1.8.4-2) unstable; urgency=medium
 
   [ Alberto Molina Coballes ]
@@ -228,6 +472,46 @@ iptables (1.8.4-1) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Wed, 04 Dec 2019 11:53:40 +0100
 
+iptables (1.8.3-2ubuntu5) eoan; urgency=medium
+
+  * Demote nftables from Recommends to Suggests for eoan, in keeping with
+    the changes for LP #1843468.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 25 Sep 2019 12:36:12 -0700
+
+iptables (1.8.3-2ubuntu4) eoan; urgency=medium
+
+  * autopkgtest: allow-stderr on command9 to fix regression
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Mon, 16 Sep 2019 13:48:52 +0200
+
+iptables (1.8.3-2ubuntu3) eoan; urgency=medium
+
+  * Swap alternative priority around so we prefer legacy (LP: #1843468)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 11 Sep 2019 16:02:54 +0200
+
+iptables (1.8.3-2ubuntu2) eoan; urgency=medium
+
+  * d/p/lp-1840633-nft-exit-in-case-we-can-t-fetch-current-genid.patch: avoid
+    busy loop if cache can't be created (LP: #1840633)
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 21 Aug 2019 14:04:49 +0200
+
+iptables (1.8.3-2ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 29 Jul 2019 23:59:20 +0200
+
 iptables (1.8.3-2) unstable; urgency=medium
 
   * [1cfe029] d/control: bump std-version to 4.4.0
@@ -355,6 +639,32 @@ iptables (1.6.2-1) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Fri, 02 Feb 2018 19:34:31 +0100
 
+iptables (1.6.1-2ubuntu3) disco; urgency=medium
+
+  * No-change rebuild against latest libnftnl
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 07 Dec 2018 06:14:40 -0500
+
+iptables (1.6.1-2ubuntu2) bionic; urgency=medium
+
+  * No-change rebuild against latest libnftnl
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 11 Nov 2017 21:52:05 -0500
+
+iptables (1.6.1-2ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 02 Jul 2017 20:08:59 -0700
+
 iptables (1.6.1-2) unstable; urgency=medium
 
   [ Helmut Grohne ]
@@ -387,6 +697,30 @@ iptables (1.6.1-1~exp1) experimental; ur
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Wed, 15 Mar 2017 11:03:30 +0100
 
+iptables (1.6.0+snapshot20161117-6ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+  * Dropped changes, included in Debian:
+    - Add missing libip[46]tc0 dependencies to their -dev packages.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 15 Jun 2017 16:11:08 -0700
+
+iptables (1.6.0+snapshot20161117-6) unstable; urgency=medium
+
+  * [3db1c4d] d/patches: add
+    0001-extensions-libxt_hashlimit-fix-64-bit-printf-formats.patch.
+    Thanks to James Cowgill for the patch (Closes: #859775)
+
+ -- Arturo Borrero Gonzalez <arturo@debian.org>  Wed, 12 Apr 2017 11:41:06 +0200
+
 iptables (1.6.0+snapshot20161117-5) unstable; urgency=medium
 
   [ Samuel Henrique ]
@@ -452,6 +786,27 @@ iptables (1.6.0-4) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo@debian.org>  Mon, 10 Oct 2016 12:03:13 +0200
 
+iptables (1.6.0-3ubuntu2) yakkety; urgency=medium
+
+  * Add missing libip[46]tc0 dependencies to their -dev packages.
+    (Closes: #835664)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Sun, 28 Aug 2016 10:12:11 +0200
+
+iptables (1.6.0-3ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian (LP: #1616437); remaining Ubuntu changes:
+    - debian/control: add linuxdoc-tools dep
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 26 Aug 2016 12:32:56 +0200
+
 iptables (1.6.0-3) unstable; urgency=medium
 
   * several changes in this release. To put it short: split packages into
@@ -495,6 +850,38 @@ iptables (1.6.0-3) unstable; urgency=med
 
  -- Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>  Tue, 07 Jun 2016 14:58:53 +0200
 
+iptables (1.6.0-2ubuntu3) xenial; urgency=medium
+
+  * Don't ship an empty iptables-nftables-compat package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 19 Feb 2016 15:13:01 +0000
+
+iptables (1.6.0-2ubuntu2) xenial; urgency=medium
+
+  * Multiarchify the libxtables11 package.
+  * Move other libraries to the multiarch libdir.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Feb 2016 21:21:05 +0100
+
+iptables (1.6.0-2ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - debian/control: add linuxdoc-tools dep, remove libipq references
+    - debian/rules: compile with --disable-libipq
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables.install: install NAT and packetfilter howtos into
+      /usr/share/doc
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - debian/iptables-dev.install: remove usr/share/man/man3 only used with
+      libipq manpages
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Feb 2016 21:06:54 +0100
+
 iptables (1.6.0-2) unstable; urgency=medium
 
   * Rebuild for unstable
@@ -531,6 +918,31 @@ iptables (1.6.0-1) experimental; urgency
 
  -- Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>  Fri, 15 Jan 2016 13:23:10 +0100
 
+iptables (1.4.21-2ubuntu2) vivid; urgency=medium
+
+  * No change rebuild to get debug symbols for all architectures.
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 03 Dec 2014 08:10:31 -0800
+
+iptables (1.4.21-2ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: add linuxdoc-tools dep, remove libipq references
+    - debian/rules: compile with --disable-libipq
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables.install: install NAT and packetfilter howtos into
+      /usr/share/doc
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - debian/iptables-dev.install: remove usr/share/man/man3 only used with
+      libipq manpages
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 05 Jun 2014 16:32:50 -0400
+
 iptables (1.4.21-2) unstable; urgency=medium
 
   * correct _dhopts var to enable autoreconf. Closes: #744968
@@ -540,6 +952,26 @@ iptables (1.4.21-2) unstable; urgency=me
 
  -- Laurence J. Lane <ljlane@debian.org>  Mon, 19 May 2014 20:49:01 -0400
 
+iptables (1.4.21-1ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/control: add linuxdoc-tools dep, remove libipq references
+    - debian/rules: compile with --disable-libipq
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables.install: install NAT and packetfilter howtos into
+      /usr/share/doc
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - debian/iptables-dev.install: remove usr/share/man/man3 only used with
+      libipq manpages
+  * Fix --with autoreconf in debian/rules
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 08 Jan 2014 17:20:40 -0500
+
 iptables (1.4.21-1) unstable; urgency=low
 
   * New upstream release
@@ -562,6 +994,25 @@ iptables (1.4.21-1) unstable; urgency=lo
 
  -- Laurence J. Lane <ljlane@debian.org>  Sun, 01 Dec 2013 19:48:23 -0500
 
+iptables (1.4.20-2ubuntu1) trusty; urgency=low
+
+  * Re-apply mistakenly dropped delta with Debian:
+    - debian/control: add linuxdoc-tools dep, remove libipq references
+    - debian/rules: compile with --disable-libipq
+    - 9000-howtos.patch: add howtos/ and install them
+    - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
+      upstream, patch needed for additional reap option checks.
+    - debian/iptables.install: install NAT and packetfilter howtos into
+      /usr/share/doc
+    - debian/iptables-dev.doc-base.netfilter-extensions,
+      debian/iptables-dev.doc-base.netfilter-hacking,
+      debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter:
+      add howtos
+    - debian/iptables-dev.install: remove usr/share/man/man3 only used with
+      libipq manpages
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 23 Oct 2013 19:55:19 -0400
+
 iptables (1.4.20-2) unstable; urgency=low
 
   * Fixed man page installation so that @PACKAGE_VERSION@ is expanded.
diff -pruN 1.8.11-2/debian/control 1.8.11-2ubuntu2/debian/control
--- 1.8.11-2/debian/control	2024-11-08 18:23:08.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/control	2025-01-23 21:53:50.000000000 +0000
@@ -1,7 +1,8 @@
 Source: iptables
 Section: net
 Priority: optional
-Maintainer: Debian Netfilter Packaging Team <team+pkg-netfilter-team@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Netfilter Packaging Team <pkg-netfilter-team@lists.alioth.debian.org>
 Uploaders: Arturo Borrero Gonzalez <arturo@debian.org>,
            Alberto Molina Coballes <alb.molina@gmail.com>,
            Jeremy Sowden <azazel@debian.org>
diff -pruN 1.8.11-2/debian/patches/9002-libxt_recent-Add-support-for-reap-option.patch 1.8.11-2ubuntu2/debian/patches/9002-libxt_recent-Add-support-for-reap-option.patch
--- 1.8.11-2/debian/patches/9002-libxt_recent-Add-support-for-reap-option.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/patches/9002-libxt_recent-Add-support-for-reap-option.patch	2025-01-23 21:53:50.000000000 +0000
@@ -0,0 +1,24 @@
+Description: Fix support for reap option.
+Origin: 79ddbf202a06e6f018e087a328c2ca91e65a8463
+Author: Tim Gardner <tim.gardner@canonical.com>
+Last-Update: <2013-06-07>
+
+--- iptables-1.8.10.orig/extensions/libxt_recent.c
++++ iptables-1.8.10/extensions/libxt_recent.c
+@@ -170,10 +170,16 @@ static void recent_parse(struct xt_optio
+ 
+ static void recent_check(struct xt_fcheck_call *cb)
+ {
++	struct xt_recent_mtinfo *info = cb->data;
++
+ 	if (!(cb->xflags & F_ANY_OP))
+ 		xtables_error(PARAMETER_PROBLEM,
+ 			"recent: you must specify one of `--set', `--rcheck' "
+ 			"`--update' or `--remove'");
++
++	if ((info->check_set & XT_RECENT_REAP) && !info->seconds)
++		xtables_error(PARAMETER_PROBLEM,
++			"recent: you must specify `--seconds' with `--reap'");
+ }
+ 
+ static void recent_print(const void *ip, const struct xt_entry_match *match,
diff -pruN 1.8.11-2/debian/patches/series 1.8.11-2ubuntu2/debian/patches/series
--- 1.8.11-2/debian/patches/series	2024-11-18 15:27:40.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/patches/series	2025-01-23 21:53:50.000000000 +0000
@@ -1,2 +1,3 @@
 translation-test-fixes.patch
 fix-interface-comparisons.patch
+9002-libxt_recent-Add-support-for-reap-option.patch
diff -pruN 1.8.11-2/debian/rules 1.8.11-2ubuntu2/debian/rules
--- 1.8.11-2/debian/rules	2024-11-08 18:23:08.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/rules	2025-01-23 21:53:50.000000000 +0000
@@ -13,6 +13,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardeni
 %:
 	dh $@
 
+clean:
+	chmod +x ./iptables/tests/shell/testcases/iptables/0007-zero-counters_0
+
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-libipq \
 			     --enable-devel \
diff -pruN 1.8.11-2/debian/tests/control 1.8.11-2ubuntu2/debian/tests/control
--- 1.8.11-2/debian/tests/control	2024-11-18 22:35:25.000000000 +0000
+++ 1.8.11-2ubuntu2/debian/tests/control	2025-01-23 21:53:50.000000000 +0000
@@ -69,3 +69,7 @@ Restrictions: needs-root, isolation-cont
 Tests: run-py-tests.sh
 Depends: @, python3
 Restrictions: needs-root, isolation-container, flaky
+
+Test-Command: chmod +x ./iptables/tests/shell/testcases/iptables/0007-zero-counters_0 ./iptables/tests/shell/testcases/chain/0006rename-segfault_0; cd iptables/tests/shell; ./run-tests.sh --host
+Depends: @, nftables:native
+Restrictions: needs-root, isolation-container, flaky
