-
Committer:
Package Import Robot
-
Author(s):
Marc Deslauriers
-
Date:
2012-06-20 09:45:11 UTC
-
mfrom:
(1.1.18 sid)
-
Revision ID:
package-import@ubuntu.com-20120620094511-d6j0w8zjcelejv36
Tags: 5.4.3~dfsg-2.5ubuntu1
* Merge from Debian unstable. Remaining changes:
- debian/rules: Don't stop service in runlevels 0 and 6.
- debian/snmpd.init: LSBify the init script.
- debian/snmp.preinst, debian/snmp.prerm: Kill any/all processes owned
by snmp user before install/uninstall.
- Add apport hook.
- debian/patches/ubuntu-fix-lp-587828.patch: Fix row creation for 64bit
arches
- debian/{control,rules}: Use dh_python2
* Dropped changes:
- debian/patches/50_use_bash.patch: Patch wasn't actually being
applied, and upstream apparently fixed this in 5.4.2.
- debian/patches/52_fix_snmpcmd_1_typo.patch: Patch wasn't actually
being applied, and fix is included in 56_manpage.patch.
- debian/snmpd.postinst: Source debconf before doing work: included in
debian package now.
- debian/patches/99-fix-ubuntu-div0.patch: wasn't applied.
- debian/patches/CVE-2008-6123.*: wasn't applied.
- debian/patches/CVE-2012-2141.patch: use debian's patch.
- debian/README.Debian-source: this change is irrelevant since we
use the debian tarball as-is.
- debian/rules: removed misc irrelevant and undocumented changes.
- debian/snmpd.postinst: no longer need to remove shutdown and reboot
links since this is from Maverick-era.