Merge https://github.com/aborrero/pkg-iptables

Conflicts:
 debian/control

I was pushing to the wrong repo :-(

Git-Dch: Ignore
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>

debian/changelog

+iptables (1.6.0-1) unstable; urgency=medium
+
+  * [615f9fc] Imported Upstream version 1.6.0
+  * [7caa8f4] d/patches/0104-lintian_hyphens.patch: refresh patch
+  * [b1d1b79] d/patches/0301-install_iptables_apply.patch: refresh patch
+  * [a2adeaf] d/control: update build-deps
+  * [0c76237] d/control: Arturo is now Maintainer, Laurence is Uploader
+  * [c13773c] d/control: new iptables-nftables-compat binary package
+  * [05be2ad] d/control: Maintainer is now the alioth team
+  * [569bc44] d/: put arp and bridge modules in iptables-nftables-compat package
+  * [90738ae] d/copyright: refresh copyright file
+  * [57d17b1] iptables-nftables-compat: include compat tools (links)
+  * [4940e7a] d/control: recommends nftables in the iptables-nftables-compat package
+  * [7814c21] d/control: give more information in the description of iptables-nftables-compat
+  * [d41dd7d] d/control: bump libxtables10 to libxtables11
+  * [81bb804] d/control: the iptables-nftables-compat package depends on iptables
+  * [a5b4148] d/: wrap-and-sort
+  * [d0c6615] d/control: bump standars to 3.9.6
+  * [9ae565f] iptables-nftables-compat: link compat manpages to the originals
+  * [d0f191f] d/patches: refresh 0101-changelog.patch
+  * [ef507da] iptables-nftables-compat: link manpage also for xtables-compat-multi
+  * [453ee4c] d/control: add Vcs-Git and Vcs-Browser fields
+
+ -- Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>  Fri, 15 Jan 2016 13:23:10 +0100
+
 iptables (1.4.21-2) unstable; urgency=medium
 
   * correct _dhopts var to enable autoreconf. Closes: #744968

debian/control

@@ -2,16 +2,28 @@ Source: iptables
 Section: net
 Priority: important
 Maintainer: iptables devel team <pkg-netfilter-devel@lists.alioth.debian.org>
-Uploaders: Laurence J. Lane <ljlane@debian.org>, Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
-Build-Depends: debhelper (>= 9), autoconf, automake, libtool (>=2.2.6), libnfnetlink-dev, libnetfilter-conntrack-dev, libnetfilter-conntrack3, dh-autoreconf, libnftnl-dev, libmnl-dev, flex, bison
-Standards-Version: 3.9.5
+Uploaders: Laurence J. Lane <ljlane@debian.org>,
+           Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
+Build-Depends: autoconf,
+               automake,
+               bison,
+               debhelper (>= 9),
+               dh-autoreconf,
+               flex,
+               libmnl-dev,
+               libnetfilter-conntrack-dev,
+               libnetfilter-conntrack3,
+               libnfnetlink-dev,
+               libnftnl-dev,
+               libtool (>= 2.2.6)
+Standards-Version: 3.9.6
 Homepage: http://www.netfilter.org/
 Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-netfilter/pkg-netfilter.git
 Vcs-Browser: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=pkg-netfilter/pkg-netfilter.git
 
 Package: iptables
 Architecture: linux-any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libxtables10 (=${binary:Version})
+Depends: libxtables11 (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: administration tools for packet filtering and NAT
  iptables is the userspace command line program used to configure
  the Linux packet filtering ruleset. It is targeted towards system
@@ -20,7 +32,7 @@ Description: administration tools for packet filtering and NAT
  iptables package also includes ip6tables. ip6tables is used for
  configuring the IPv6 packet filter
 
-Package: libxtables10
+Package: libxtables11
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: iptables (<< 1.4.16.3-3)
@@ -31,8 +43,8 @@ Description: netfilter xtables library
 Package: iptables-dev
 Architecture: linux-any
 Priority: optional
-Depends: ${misc:Depends}, iptables (=${binary:Version})
-Conflicts: iptables (<<1.4.2-2)
+Depends: iptables (=${binary:Version}), ${misc:Depends}
+Conflicts: iptables (<< 1.4.2-2)
 Breaks: linux-libc-dev (<< 3.5)
 Section: devel
 Description: iptables development files
@@ -44,7 +56,21 @@ Description: iptables development files
 Package: iptables-nftables-compat
 Architecture: linux-any
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, libxtables10 (=${binary:Version})
+Depends: arptables,
+         ebtables,
+         iptables (=${binary:Version}),
+         libxtables11 (=${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: nftables
 Description: iptables compat tools for nftables
  this package includes the compat tools to load iptables, ip6tables, arptables
  and ebtables rules to the nf_tables kernel subsystem.
+ .
+ The tools are called: 'iptables-compat', 'iptables-compat-save',
+ 'iptables-compat-restore', 'ip6tables-compat', 'ip6tables-compat-save',
+ 'ip6tables-compat-restore', 'arptables-compat' and 'ebtables-compat'.
+ .
+ A basic way to understand this compat stuff is to load the ruleset
+ skeleton, i.e: a first call `iptables-compat -L'. Then, you can use nft,
+ i.e: `nft list ruleset'. Same for the other families.

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: iptables
 Upstream-Contact: Netfilter Developer List <netfilter@vger.kernel.org>
 Source: http://ftp.netfilter.org/
 
-Files: iptables/*.c
+Files: *
 Copyright: 2000-2002, the netfilter coreteam <coreteam@netfilter.org>
                       Paul 'Rusty' Russell <rusty@rustcorp.com.au>
                       Marc Boucher <marc+nf@mbsi.ca>
@@ -12,6 +12,22 @@ Copyright: 2000-2002, the netfilter coreteam <coreteam@netfilter.org>
                       Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 License: GPL-2
 
+Files: extensions/libebt_802_3.c
+Copyright: 2003 Chris Vitale <csv@bluetail.com>
+License: GPL-2
+
+Files: extensions/libebt_ip.c extensions/libebt_log.c extensions/libebt_mark*.c
+Copyright: 2002 Bart De Schuymer <bdschuym@pandora.be>
+License: GPL-2
+
+Files: extensions/libebt_limit.c
+Copyright: 2003 Tom Marshall <tommy@home.tig-grr.com>
+License: GPL-2
+
+Files: extensions/libebt_nflog.c
+Copyright: 2008 Peter Warasin <peter@endian.com>
+License: GPL-2
+
 Files: extensions/libip6t_DNAT.c
 Copyright: 2011, Patrick McHardy <kaber@trash.net>
 License: GPL-2
@@ -348,6 +364,28 @@ Files: iptables/iptables-xml.c
 Copyright: 2006, Ufo Mechanic <azez@ufomechanic.net>
 License: GPL-2
 
+Files: iptables/nft.c
+Copyright: 2012 Pablo Neira Ayuso <pablo@netfilter.org>
+License: GPL-2+
+
+Files: iptables/nft-arp.c
+Copyright: 2013 Pablo Neira Ayuso <pablo@netfilter.org>
+	   2013 Giuseppe Longo <giuseppelng@gmail.com>
+License: GPL-2+
+
+Files: iptables/nft-bridge.c
+Copyright: 2014 Giuseppe Longo <giuseppelng@gmail.com>
+License: GPL-2+
+
+Files: iptables/nft-ipv4.c iptables/nft-ipv6.c iptables/nft-shared.c
+Copyright: 2012-2013 Pablo Neira Ayuso <pablo@netfilter.org>
+	   2013 Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
+License: GPL-2+
+
+Files: iptables/xtables-arp.c iptables/xtables-eb.c
+Copyright: 2002 Bart De Schuymer <bdschuym@pandora.be>
+License: GPL-2+
+
 Files: libiptc/libip4tc.c
 Copyright: 1999, Paul ``Rusty'' Russell
 License: GPL-2
@@ -378,7 +416,7 @@ License: GPL-2
 Files: utils/pf.os
 Copyright: 2000-2003, Michal Zalewski <lcamtuf@coredump.cx>
            2003, Mike Frantzen <frantzen@w4g.org>
-License:
+License: custom
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
@@ -412,6 +450,23 @@ License: GPL-2
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
 License: Artistic-2
  			 The "Artistic License"
  .

debian/iptables-dev.install

-usr/include
-usr/share/man/man3
+include/linux/netfilter_ipv4/ip_queue.h usr/include/linux/netfilter_ipv4/
 lib/lib*.so
 lib/pkgconfig usr/lib
-include/linux/netfilter_ipv4/ip_queue.h usr/include/linux/netfilter_ipv4/
-
+usr/include
+usr/share/man/man3

debian/iptables-nftables-compat.install

-usr/sbin/xtables-compat-multi		usr/sbin
-usr/sbin/ebtables-compat		usr/sbin
-usr/sbin/arptables-compat		usr/sbin
-usr/sbin/iptables-compat		usr/sbin
-usr/sbin/iptables-compat-save		usr/sbin
-usr/sbin/iptables-compat-restore	usr/sbin
-usr/sbin/ip6tables-compat		usr/sbin
-usr/sbin/ip6tables-compat-save		usr/sbin
-usr/sbin/ip6tables-compat-restore	usr/sbin
-lib/xtables/libebt_*.so
 lib/xtables/libarpt_*.so
+lib/xtables/libebt_*.so
+usr/sbin/*-compat*		sbin
+usr/sbin/xtables-compat-multi	sbin

debian/iptables-nftables-compat.links

+usr/share/man/man8/arptables.8.gz		usr/share/man/man8/arptables-compat.8.gz
+usr/share/man/man8/ebtables.8.gz		usr/share/man/man8/ebtables-compat.8.gz
+usr/share/man/man8/iptables-restore.8.gz	usr/share/man/man8/ip6tables-compat-restore.8.gz
+usr/share/man/man8/iptables-restore.8.gz	usr/share/man/man8/iptables-compat-restore.8.gz
+usr/share/man/man8/iptables-save.8.gz		usr/share/man/man8/ip6tables-compat-save.8.gz
+usr/share/man/man8/iptables-save.8.gz		usr/share/man/man8/iptables-compat-save.8.gz
+usr/share/man/man8/iptables.8.gz		usr/share/man/man8/ip6tables-compat.8.gz
+usr/share/man/man8/iptables.8.gz		usr/share/man/man8/iptables-compat.8.gz
+usr/share/man/man8/xtables-multi.8.gz		usr/share/man/man8/xatbles-compat-multi.8.gz

debian/iptables.install

+iptables/iptables-apply usr/sbin
+iptables/iptables.xslt usr/share/iptables
 lib/libip*.so.*
-usr/sbin/xtables-multi sbin
+lib/xtables/libip*.so
+lib/xtables/libxt_*.so
 usr/sbin/ip6tables sbin
 usr/sbin/ip6tables-restore sbin
 usr/sbin/ip6tables-save sbin
@@ -7,9 +10,6 @@ usr/sbin/iptables sbin
 usr/sbin/iptables-restore sbin
 usr/sbin/iptables-save sbin
 usr/sbin/nf* usr/sbin
-lib/xtables/libip*.so
-lib/xtables/libxt_*.so
-iptables/iptables-apply usr/sbin
-iptables/iptables.xslt usr/share/iptables
-usr/share/man/man8
+usr/sbin/xtables-multi sbin
 usr/share/man/man1
+usr/share/man/man8

debian/iptables.links

+/sbin/xtables-multi /usr/bin/iptables-xml
 /usr/sbin/iptables-apply /usr/sbin/ip6tables-apply
 /usr/share/man/man8/iptables-apply.8.gz /usr/share/man/man8/ip6tables-apply.8.gz
-/sbin/xtables-multi /usr/bin/iptables-xml

debian/iptables.manpages

-iptables/*.8
 debian/*.8
+iptables/*.8