Merge lp:~yolanda.robla/ubuntu/saucy/net-snmp/debian_merge into lp:ubuntu/saucy/net-snmp

[Yolanda Robla]

Merging new Debian version (LP: #1200516)

[Martin Pitt (pitti)]

Aside from the already documented apport delta, there is also this:

+.PHONY: override_dh_installinit
+override_dh_installinit:
+ dh_installinit -u"start 20 2 3 4 5 . stop 20 1 ."

Is it still necessary? Please document it in "remaining changes" or drop it.

Thanks!

review: Needs Fixing

[lp:~yolanda.robla/ubuntu/saucy/net-snmp/debian_merge]

61. By Yolanda Robla on 2013-07-23

removed dh_installinit override

62. By Yolanda Robla on 2013-07-23

Call dh_installinit correctly to avoid installing links in rc[06].d

63. By Yolanda Robla on 2013-07-23

restored dh_installinit

[Yolanda Robla (yolanda.robla)]

> Aside from the already documented apport delta, there is also this:
>
> +.PHONY: override_dh_installinit
> +override_dh_installinit:
> + dh_installinit -u"start 20 2 3 4 5 . stop 20 1 ."
>
> Is it still necessary? Please document it in "remaining changes" or drop it.
>
> Thanks!

Link is added without that fix, so preserved it and documented in changelog

[Martin Pitt (pitti)]

Great, thanks. Uploaded.

review: Approve

=== added file '.pc/02_statistics.patch/.timestamp'
=== added file '.pc/03_makefiles.patch/.timestamp'
=== added file '.pc/05_searchdirs.patch/.timestamp'
=== added file '.pc/06_extramibs.patch/.timestamp'
=== added file '.pc/07_docfiles.patch/.timestamp'
=== added file '.pc/26_kfreebsd.patch/.timestamp'
=== added file '.pc/27_kfreebsd_bug625985.patch/.timestamp'
=== added file '.pc/60_libsensors_api.patch/.timestamp'
=== added file '.pc/61_vacm_missing_dependency_check.patch/.timestamp'
=== added file '.pc/62_add_lib_cflags.patch/.timestamp'
=== added file '.pc/64_missing_lib.patch/.timestamp'
=== added file '.pc/after_RFC5378/.timestamp'
=== added file '.pc/fix_logging_option.patch/.timestamp'
=== added file '.pc/fix_man_error.patch/.timestamp'
=== added file '.pc/fix_manpage-has-errors_break_line.patch/.timestamp'
=== added file '.pc/fix_regular_expression.patch/.timestamp'
=== added file '.pc/fix_snmpcheck_perl_path.patch/.timestamp'
=== added file '.pc/fix_spelling_error.patch/.timestamp'
=== added file '.pc/fix_typo_in_snmpd.conf.patch/.timestamp'
=== added file '.pc/snmptranslate.1.patch/.timestamp'
=== modified file 'debian/changelog'
--- debian/changelog	2013-05-16 21:01:27 +0000
+++ debian/changelog	2013-07-23 12:00:48 +0000
@@ -1,3 +1,64 @@
+net-snmp (5.7.2~dfsg-8ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable (LP: #1200516).  Remaining changes:
+    + Add apport hook (LP: #533603):
+      - debian/source.apport: apport hook
+      - debian/control: Build-depends on dh-apport.
+      - debian/rules:
+        + Add --with apport.
+        + override_dh_apport to install hook on snmpd package only.
+  * Call dh_installinit correctly to avoid installing links in rc[06].d
+
+ -- Yolanda Robla <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]> 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 <[e-mail]>  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
+      <[e-mail]> 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 <[e-mail]>  Sun, 19 May 2013 23:09:52 +0900
+
 net-snmp (5.7.2~dfsg-4ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-05-16 21:01:27 +0000
+++ debian/control	2013-07-23 12:00:48 +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)

=== modified file 'debian/libsnmp-base.install'
--- debian/libsnmp-base.install	2013-05-16 21:01:27 +0000
+++ debian/libsnmp-base.install	2013-07-23 12:00:48 +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

=== added file 'debian/libsnmp-perl.preinst'
--- debian/libsnmp-perl.preinst	1970-01-01 00:00:00 +0000
+++ debian/libsnmp-perl.preinst	2013-07-23 12:00:48 +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

=== modified file 'debian/libsnmp30.install'
--- debian/libsnmp30.install	2013-03-19 16:43:02 +0000
+++ debian/libsnmp30.install	2013-07-23 12:00:48 +0000
@@ -1,3 +1,1 @@
 usr/lib/*/lib*.so.*
-usr/bin/net-snmp-config
-usr/share/man/man1/net-snmp-config.1

=== modified file 'debian/rules'
--- debian/rules	2013-05-16 21:01:27 +0000
+++ debian/rules	2013-07-23 12:00:48 +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

=== added file 'debian/snmp.postinst'
--- debian/snmp.postinst	1970-01-01 00:00:00 +0000
+++ debian/snmp.postinst	2013-07-23 12:00:48 +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

=== modified file 'debian/snmp.preinst'
--- debian/snmp.preinst	2010-06-22 14:04:48 +0000
+++ debian/snmp.preinst	2013-07-23 12:00:48 +0000
@@ -1,20 +1,29 @@
-#! /bin/sh
+#!/bin/sh
 
 set -e
 
-action="$1"
-
-killall -u snmp  2>/dev/null || true
-
-if [ "$action" = upgrade ]
-then
+case "$1" in
+
+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#
 

=== modified file 'debian/snmp.prerm'
--- debian/snmp.prerm	2010-06-22 14:04:48 +0000
+++ debian/snmp.prerm	2013-07-23 12:00:48 +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#
 

=== modified file 'debian/snmpd.postinst'
--- debian/snmpd.postinst	2013-05-16 21:01:27 +0000
+++ debian/snmpd.postinst	2013-07-23 12:00:48 +0000
@@ -2,16 +2,39 @@
 
 set -e
 
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-if [ "x$1" = xconfigure ]; then
+case "$1" in
+    configure)
+
+	. /usr/share/debconf/confmodule
+	db_version 2.0
+
 	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#