move traptoemail to snmptrapd package

5 files changed, 9 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index ff57b73..d531c75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ net-snmp (5.7.2~dfsg-9) UNRELEASED; urgency=medium
       patch (Closes: #640456)
   * debian/snmpd.postinst
     - fix weird user creation (Closes: #482041, #589040, #606784, #610630)
+  * debian/snmp.install
+    - move traptoemail to snmptrapd.install releated to above changes
   * debian/README.Debian
     - note snmpconf is in snmp package (Closes: #577649)
 
diff --git a/debian/control b/debian/control
index cc36f77..d8b7a20 100644
--- a/debian/control
+++ b/debian/control
@@ -40,8 +40,8 @@ Description: SNMP (Simple Network Management Protocol)
  for the exchange of management information between agents (servers)
  and clients.
  .
- snmptrapd is an SNMP application that receives and logs SNMP TRAP and
- INFORM messages.
+ snmptrapd is an SNMP application (daemon) that receives and logs SNMP TRAP
+ and INFORM messages.
 
 Package: snmp
 Architecture: any
diff --git a/debian/snmp.install b/debian/snmp.install
index 17352b8..8290285 100644
--- a/debian/snmp.install
+++ b/debian/snmp.install
@@ -2,5 +2,4 @@ debian/snmp.conf etc/snmp/
 usr/bin/snmp*
 usr/bin/encode*
 usr/bin/fixproc
-usr/bin/traptoemail
 usr/share/snmp/snmpconf-data/snmp-data
diff --git a/debian/snmptrapd.conf b/debian/snmptrapd.conf
index 51aeef7..5dd4fec 100644
--- a/debian/snmptrapd.conf
+++ b/debian/snmptrapd.conf
@@ -5,8 +5,7 @@
 #
 ###############################################################################
 #
-# This file is intended to only be an example.  If, however, you want
-# to use it, it should be placed in /etc/snmp/snmptrapd.conf.
+# This file is intended to only be an example.
 # When the snmptrapd agent starts up, this is where it will look for it.
 #
 # All lines beginning with a '#' are comments and are intended for you
@@ -15,4 +14,6 @@
 #
 # PLEASE: read the snmptrapd.conf(5) manual page as well!
 #
-
+#authCommunity log,execute,net private　
+#authCommunity log,execute,net public
+#traphandle default /usr/bin/traptoemail -s smtp.example.org foobar@example.org
diff --git a/debian/snmptrapd.install b/debian/snmptrapd.install
index 4dead64..3d93a7a 100644
--- a/debian/snmptrapd.install
+++ b/debian/snmptrapd.install
@@ -1,3 +1,4 @@
+usr/bin/traptoemail
 usr/sbin/snmptrapd
 debian/snmptrapd.conf etc/snmp/
 usr/share/snmp/snmpconf-data/snmptrapd-data