[Pkg-net-snmp-commits] [SCM] Git repository for pkg-net-snmp branch, master, updated. debian/5.7.2_dfsg-5-7-g81d7568

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 33bf973835fbaf7c712c8a45ab919177fe8190d6
Author: Hideki Yamane <henrich at debian.org>
Date:   Mon May 20 08:46:43 2013 +0900

    fix conflict with libsnmp15

diff --git a/debian/changelog b/debian/changelog
index c468347..bcc98dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ net-snmp (5.7.2~dfsg-6) UNRELEASED; urgency=low
   * 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 <henrich at debian.org>  Mon, 20 May 2013 06:50:27 +0900
 
diff --git a/debian/control b/debian/control
index cdb0ce7..47f5946 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ 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), libsnmp30 (<< 5.7.2~dfsg-5)
+Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp30 (<< 5.7.2~dfsg-5), libsnmp15
 Depends: ${misc:Depends}
 Suggests: snmp-mibs-downloader
 Description: SNMP configuration script, MIBs and documentation

-- 
Git repository for pkg-net-snmp