-
Committer:
Jamie Strandboge
-
Date:
2011-03-22 18:23:52 UTC
-
mfrom:
(693.1.46 trunk)
-
Revision ID:
jamie@canonical.com-20110322182352-30h18cykiwtpnhqp
Merge from trunk
* New upstream release which fixes the following:
- LP: #501140
- LP: #740249
- LP: #740256
- LP: #720605
* debian/ufw.logrotate: remove upstartism thanks to Michael Biebl
(Closes: 607696)
* debian/sysctl.conf: merge in upstream (commented out) changes surrounding
ipv6 forwarding and privacy addresses
* debian/before*.rules.md5sum: updated for recent changes
* convert to dh_python2:
- debian/control: remove python-central dependency
- debian/rules: use dh_python2 instead of dh_pycentral
* debian/rules: run 'make clean' in the clean target
* debian/ufw.init.debian: look for /lib/ufw, not /usr/sbin/ufw to see if we
should quit (ie, when ufw is removed and not purged). Also, only have
/bin and /sbin in PATH
* add lintian override
- debian/rules: add dh_lintian
- debian/dirs: add usr/share/lintian/overrides
- ignore init.d-script-possible-missing-stop
* debian/install, debian/rules: update to use debian/install primarily
* renamed debian/changelog.pre-0.27.1 to debian/changelog.Debian.pre-0.27.1
* no longer install upstream ChangeLog.pre-0.25
* grab man page updates from upstream:
- mention quoting of application profile names with spaces. Upstream
r714. (LP: #715676)
- fix man-page hyphenation in ufw.8. Upstream r716.
- fix manpage reference to /etc/defaults/ufw. Upstream r713.
(Closes: 601111)
* fix typo in warning. Upstream r711. (LP: #637876)
* run_tests.sh: adjust PATH if iptables can't be found. Upstream r717.
* src/frontend.py: display unicode error messages properly. Thanks to
Serguey Basalaev.
- upstream commit r700
- LP: #580032
* src/backend_iptables.py: fix gettext warning
- upstream commit r701
* run debconf-updatepo, but adjust debian/po/de.po and debian/po/es.po to
add correct "Language:" tag
* profiles/ufw-mailserver: remove Postfix specific language
- upstream commit r705, r707
* debian/rules: do install the upstream application profiles now