diff -Nru net-snmp-5.7.2~dfsg/debian/changelog net-snmp-5.7.2~dfsg/debian/changelog --- net-snmp-5.7.2~dfsg/debian/changelog 2013-05-17 01:39:06.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/changelog 2013-07-12 07:56:01.000000000 +0000 @@ -1,3 +1,58 @@ +net-snmp (5.7.2~dfsg-8ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Preserved apport hook + + -- Yolanda Robla Fri, 12 Jul 2013 09:47:12 +0200 + +net-snmp (5.7.2~dfsg-8) unstable; urgency=low + + * add libsnmp-perl.preinst to deal with empty directory by libsnmp15 + package removal (Closes: #709761) + * {snmp,snmpd}.postinst: deal with "copyright file missing after upgrade + (policy 12.5)" (Closes: #709087) + + -- Hideki Yamane Thu, 06 Jun 2013 08:49:02 +0900 + +net-snmp (5.7.2~dfsg-7) unstable; urgency=low + + * debian/control + - libsnmp-base: update to more policy polite (Breaks/Replaces: libsnmp15 + (<<5.7.2~dfsg-5)), thanks to James McCoy + * debian/snmp.preinst + - fix incomplete script. + + -- Hideki Yamane Mon, 20 May 2013 14:19:36 +0900 + +net-snmp (5.7.2~dfsg-6) unstable; urgency=low + + * debian/rules + - Fix Hurd build issue, thanks Pino Toscano for + the patch (Closes: #708951) + * debian/snmpd.init + - patch from Ubuntu, LSBified + * debian/snmp.pre{inst,rm} + - patch from Ubuntu, Kill any/all processes owned by snmp user before + install/uninstall. + * debian/control + - add "Conflicts: libsnmp15" to libsnmp-base since moving net-snmp-config + in previous version cause trouble (Closes: #708983) + + -- Hideki Yamane Mon, 20 May 2013 08:49:14 +0900 + +net-snmp (5.7.2~dfsg-5) unstable; urgency=low + + * debian/control + - fix typo and improve description, thanks to Martin Eberhard Schauer + for the patch (Closes: #708519) + - libsnmp-base: add "Conflicts: libsnmp30 (<< 5.7.2~dfsg-5)" since + net-snmp-config file moves from libsnmp30 to libsnmp-base + (Closes: #708298) + - update descriptions + * debian/{libsnmp-base,libsnmp30}.install: update + + -- Hideki Yamane Sun, 19 May 2013 23:09:52 +0900 + net-snmp (5.7.2~dfsg-4ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: @@ -1407,7 +1462,7 @@ * Run debian/fixman.sh using bash. Closes: #186834. -- Daniel Schepler Sat, 26 Apr 2003 16:52:18 -0700 - + net-snmp (5.0.7-1) unstable; urgency=low * New upstream version (closes:177127, closes:154323, @@ -1872,7 +1927,6 @@ -- David Engel Tue, 13 May 1997 20:40:37 -0500 - snmp (3.3-1) unstable; urgency=low * Updated to new upstream version. @@ -1886,3 +1940,4 @@ -dev package sometime in the future. -- David Engel Wed, 19 Feb 1997 20:53:07 -0600 + diff -Nru net-snmp-5.7.2~dfsg/debian/control net-snmp-5.7.2~dfsg/debian/control --- net-snmp-5.7.2~dfsg/debian/control 2013-05-17 01:20:05.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/control 2013-06-06 03:41:03.000000000 +0000 @@ -47,22 +47,24 @@ Package: libsnmp-base Section: libs Architecture: all -Replaces: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg) -Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg) +Replaces: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp15 (<< 5.7.2~dfsg-5) +Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp30 (<< 5.7.2~dfsg-5) +Breaks: libsnmp15 (<< 5.7.2~dfsg-5) Depends: ${misc:Depends} Suggests: snmp-mibs-downloader -Description: SNMP (Simple Network Management Protocol) MIBs and documentation +Description: SNMP configuration script, MIBs and documentation The Simple Network Management Protocol (SNMP) provides a framework for the exchange of management information between agents (servers) and clients. . - This package includes documentation and MIBs (Management Information - Bases) for the SNMP libraries, agents and applications. MIBs contain - a formal description of the data that can be managed using SNMP. - and applications. + This package includes net-snmp-config scripts, documentation and MIBs + (Management Information Bases) for the SNMP libraries, agents and + applications. MIBs contain a formal description of the data that can be + managed using SNMP and applications. . - NOTE: If you want the OIDs to resolve to their text description, you need to - activate the non-free repository and install "snmp-mibs-downloader" package. + NOTE: If you want the OIDs (Object Identifiers) to resolve to their text + description, you need to activate the non-free repository and install the + "snmp-mibs-downloader" package. Package: libsnmp30 Section: libs @@ -71,7 +73,7 @@ Breaks: libsnmp15 Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libsnmp-base Description: SNMP (Simple Network Management Protocol) library The Simple Network Management Protocol (SNMP) provides a framework for the exchange of management information between agents (servers) diff -Nru net-snmp-5.7.2~dfsg/debian/libsnmp30.install net-snmp-5.7.2~dfsg/debian/libsnmp30.install --- net-snmp-5.7.2~dfsg/debian/libsnmp30.install 2013-04-11 14:52:27.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/libsnmp30.install 2013-06-06 03:41:03.000000000 +0000 @@ -1,3 +1 @@ usr/lib/*/lib*.so.* -usr/bin/net-snmp-config -usr/share/man/man1/net-snmp-config.1 diff -Nru net-snmp-5.7.2~dfsg/debian/libsnmp-base.install net-snmp-5.7.2~dfsg/debian/libsnmp-base.install --- net-snmp-5.7.2~dfsg/debian/libsnmp-base.install 2013-04-11 14:52:27.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/libsnmp-base.install 2013-06-06 03:41:03.000000000 +0000 @@ -1,2 +1,4 @@ mibs/*.txt usr/share/snmp/mibs usr/share/snmp/mib2c-data +usr/bin/net-snmp-config +usr/share/man/man1/net-snmp-config.1 diff -Nru net-snmp-5.7.2~dfsg/debian/libsnmp-perl.preinst net-snmp-5.7.2~dfsg/debian/libsnmp-perl.preinst --- net-snmp-5.7.2~dfsg/debian/libsnmp-perl.preinst 1970-01-01 00:00:00.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/libsnmp-perl.preinst 2013-06-05 23:47:56.000000000 +0000 @@ -0,0 +1,30 @@ +#!/bin/sh +# preinst script for libsnmp-perl + +set -e + + +case "$1" in + install|upgrade) + + DOCDIR=/usr/share/doc/libsnmp-perl + if [ -L $DOCDIR ]; then + rm $DOCDIR + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru net-snmp-5.7.2~dfsg/debian/rules net-snmp-5.7.2~dfsg/debian/rules --- net-snmp-5.7.2~dfsg/debian/rules 2013-05-17 01:20:05.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/rules 2013-06-06 03:41:03.000000000 +0000 @@ -27,7 +27,7 @@ DEB_DH_GENCONTROL_ARGS=-- -Vos-specific-dev="libkvm-dev" endif endif -ifeq (hurd,$(DEB_BUILD_HOST_OS)) +ifeq (hurd,$(DEB_BUILD_ARCH_OS)) IPV6 = --enable-ipv6 EXCL_MIB_MODULES += mibII else diff -Nru net-snmp-5.7.2~dfsg/debian/snmpd.postinst net-snmp-5.7.2~dfsg/debian/snmpd.postinst --- net-snmp-5.7.2~dfsg/debian/snmpd.postinst 2013-05-15 12:38:30.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/snmpd.postinst 2013-06-06 03:41:03.000000000 +0000 @@ -2,16 +2,39 @@ set -e -. /usr/share/debconf/confmodule -db_version 2.0 +case "$1" in + configure) + + . /usr/share/debconf/confmodule + db_version 2.0 -if [ "x$1" = xconfigure ]; then if ! getent group snmp >/dev/null ; then - deluser --quiet --system snmp + deluser --quiet --system snmp fi adduser --quiet --system --group --no-create-home --home /var/lib/snmp snmp chown -R snmp:snmp /var/lib/snmp -fi + + # Bug#709087 + DOCDIR=/usr/share/doc/snmpd + DOCLINK=libsnmp30 + + if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then + rmdir $DOCDIR + ln -s $DOCLINK $DOCDIR + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. #DEBHELPER# diff -Nru net-snmp-5.7.2~dfsg/debian/snmp.postinst net-snmp-5.7.2~dfsg/debian/snmp.postinst --- net-snmp-5.7.2~dfsg/debian/snmp.postinst 1970-01-01 00:00:00.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/snmp.postinst 2013-06-05 23:47:56.000000000 +0000 @@ -0,0 +1,34 @@ +#!/bin/sh +# postinst script for snmp +# +# see: dh_installdeb(1) + +set -e + +case "$1" in + configure) + + DOCDIR=/usr/share/doc/snmp + DOCLINK=libsnmp30 + + if [ -d $DOCDIR ] && [ ! -L $DOCDIR ]; then + rmdir $DOCDIR + ln -s $DOCLINK $DOCDIR + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru net-snmp-5.7.2~dfsg/debian/snmp.preinst net-snmp-5.7.2~dfsg/debian/snmp.preinst --- net-snmp-5.7.2~dfsg/debian/snmp.preinst 2013-05-17 01:20:05.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/snmp.preinst 2013-07-12 07:45:48.000000000 +0000 @@ -1,20 +1,29 @@ -#! /bin/sh +#!/bin/sh set -e -action="$1" +case "$1" in -killall -u snmp 2>/dev/null || true - -if [ "$action" = upgrade ] -then +install|upgrade) if [ -L /usr/share/doc/snmp ]; then rm -f /usr/share/doc/snmp fi if [ -d /usr/doc/snmp ]; then rm -rf /usr/doc/snmp fi -fi + + killall -u snmp 2>/dev/null || true + + ;; +abort-upgrade) + ;; + +*) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac #DEBHELPER# diff -Nru net-snmp-5.7.2~dfsg/debian/snmp.prerm net-snmp-5.7.2~dfsg/debian/snmp.prerm --- net-snmp-5.7.2~dfsg/debian/snmp.prerm 2013-05-17 01:20:05.000000000 +0000 +++ net-snmp-5.7.2~dfsg/debian/snmp.prerm 2013-06-05 23:47:56.000000000 +0000 @@ -1,8 +1,20 @@ -#! /bin/sh +#!/bin/sh set -e -killall -u snmp 2>/dev/null || true +case "$1" in + remove|upgrade|deconfigure) + killall -u snmp 2>/dev/null || true + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac #DEBHELPER#