-
Committer:
Bazaar Package Importer
-
Author(s):
Jamie Strandboge, Lorenzo De Liso, Jamie Strandboge
-
Date:
2010-11-12 15:58:40 UTC
-
mfrom:
(5.1.8 upstream)
(2.1.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20101112155840-jm07l9o9722h0bvm
Tags: 1.4.10-1ubuntu1
[ Lorenzo De Liso ]
* Merge from debian unstable (LP: #671652), remaining changes:
- Don't fail to run iptables-save if iptables module isn't loaded.
- Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
the howtos.
- Added linuxdoc-tools to Build-Depends
- Modified debian/iptables{,-dev}.install to match DM syntax
(removed debian/tmp)
- Added -fno-strict-aliasing -Werror switches to regular_CFLAGS
for catching errors early
- Removed unused TC_NUM_RULES() and TC_GET_RULE()
* debian/patches/03-compilation-error.patch: updated
* debian/patches/0600-makefile_jedi_handwaving.patch: updated
* Dropped changes:
- debian/patches/0902-docs-version-reference.diff: modifies files inside
the debian/ directory and hence is not needed
[ Jamie Strandboge ]
* debian/patches/9000-howtos.patch:
- combine 0102-howtos.patch and 0103-sgml_errors.patch into this patch
and apply after the Debian patches for easier maintenance
- add DEP-3 comments
* debian/patches/9001-build-libipq_pic.la.patch:
- Build libipq_pic.la with -fPIC
- add DEP-3 comments
* debian/iptables-dev.install: install lib/*.la in usr/lib
* merge debian/patches/9002-xt_recent-reap.patch:
- support for the xt_recent filter --reap switch (refreshed and updated)
- add DEP-3 comments
* debian/patches/9003-compilation-error.patch:
- renamed 03-compilation-error.patch as 9003-compilation-error.patch
- apply after Debian patches for easier maintenance
- add DEP-3 comments
* debian/iptables.doc-base.{nat|packet-filter}: update for 2.6
* Dropped changes:
- Replaced ipt_DSCP.h by xpt_DSCP.h in ipt_ECN.h and ipt_echn.h (applied
upstream)
- 9001-build-libipq_pic.a.patch (using la instead)