[Pkg-net-snmp-commits] [pkg-net-snmp] 02/06: fix dependency for snmptrapd

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch master
in repository pkg-net-snmp.

commit d7a8897220f556bdb99e145b9c7c8397ed037d5e
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Apr 1 23:35:43 2014 +0900

    fix dependency for snmptrapd
    
    usually we use "Breaks:" for this purpose but it's not enough and
    piuparts cannot resolve dependency so try with "Conflicts:"
---
 debian/changelog | 5 ++++-
 debian/control   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e09b143..64ee3c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-net-snmp (5.7.2.1~dfsg-2) UNRELEASED; urgency=medium
+net-snmp (5.7.2.1~dfsg-2) experimental; urgency=medium
 
   * fix broken debian/snmpd.postinst
+  * debian/control
+    - fix dependency for snmptrapd since '/usr/bin/traptoemail' is also in
+      snmp (<< 5.7.2.1~dfsg-1)
 
  -- Hideki Yamane <henrich at debian.org>  Tue, 01 Apr 2014 23:15:15 +0900
 
diff --git a/debian/control b/debian/control
index 7c559ea..e52262a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Homepage: http://net-snmp.sourceforge.net/
 Package: snmpd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf, lsb-base (>= 3.2-13), libsnmp-base
+Suggests: snmptrapd
 Description: SNMP (Simple Network Management Protocol) agents
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)
@@ -34,7 +35,9 @@ Package: snmptrapd
 Architecture: any
 Recommends: perl-modules
 Depends: ${shlibs:Depends}, ${misc:Depends}, snmpd
-Breaks: snmpd (<< 5.7.2~dfsg-9)
+Conflicts: snmpd (<< 5.7.2.1~dfsg-1), snmp (<< 5.7.2.1~dfsg-1)
+Breaks: snmpd (<< 5.7.2.1~dfsg-1)
+Replaces: snmp (<< 5.7.2.1~dfsg-1)
 Description: Net-SNMP notification receiver
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git