-
Committer:
Package Import Robot
-
Author(s):
Chris J Arges, Chris J Arges
-
Date:
2013-06-07 09:50:09 UTC
-
mfrom:
(2.1.23 saucy-proposed)
-
Revision ID:
package-import@ubuntu.com-20130607095009-aajdci0h8xfkd3n8
Tags: 1.4.18-1ubuntu1
[ Chris J Arges ]
* Merge from Debian unstable (LP: #1191004). 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
* Dropped changes:
- debian/iptables.lintian-overrides: remove unuseful lintian override
delta
- 9001-build-libipq_pic.la.patch: remove patch that hasn't been applied
since 12.04.
- 9001-Fixed-FTBS-by-copying-linux-types.h-from-linux-3.2.patch:
changes are upstream.
- 9003-lp1020490.patch: changes are upstream.
- 9004-argv-is-null.patch: changes are upstream.
- 9005-lp1027252-fixrestore.patch: changes are upstream.
- 9006-lp1042260-fix-inverted-physdev.patch: changes are upstream.
- 9007-lp982961-xtables-lm-noasneeded.patch: changes are upstream.
- 9009-libxt-string-fix-space-around-arguments.patch: changes are upstream.