[Pkg-net-snmp-commits] [SCM] Git repository for pkg-net-snmp branch, master, updated. debian/5.7.2_dfsg-1_0.2-10-gbadb701

[Hideki Yamane]

The following commit has been merged in the master branch:
commit f3ccc76b8ad7f3d9497c924d60221e21aea48642
Author: Hideki Yamane <henrich at debian.org>
Date:   Sun Apr 28 09:58:08 2013 +0900

    deal with fail with /var/run/agentx

diff --git a/debian/changelog b/debian/changelog
index 856c2b7..1081836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+net-snmp (5.7.2~dfsg-2) experimental; urgency=low
+
+  * debian/snmpd.{postinst,postrm}
+    - avoid failure with /var/run/agentx 
+  * debian/control
+    - add "Breaks: libsnmp15" to snmp since snmp.conf moves from it.
+
+ -- Hideki Yamane <henrich at debian.org>  Fri, 26 Apr 2013 16:02:01 +0900
+
 net-snmp (5.7.2~dfsg-1) experimental; urgency=low
 
   * debian/control
diff --git a/debian/control b/debian/control
index 9c059bc..e865043 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Package: snmp
 Architecture: any
 Recommends: perl-modules
 Depends: ${shlibs:Depends}, ${misc:Depends}, libsnmp-base
+Breaks: libsnmp15
 Description: SNMP (Simple Network Management Protocol) applications
  The Simple Network Management Protocol (SNMP) provides a framework
  for the exchange of management information between agents (servers)
diff --git a/debian/patches/series b/debian/patches/series
index 3eb3f1c..2d7fcb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ fix_typo_in_snmpd.conf.patch
 fix_man_error.patch
 after_RFC5378
 fix_manpage-has-errors_break_line.patch
+force_LDFLAGS.patch
diff --git a/debian/snmpd.postinst b/debian/snmpd.postinst
index 25d7eb8..ed72c9e 100644
--- a/debian/snmpd.postinst
+++ b/debian/snmpd.postinst
@@ -13,6 +13,10 @@ if [ "x$1" = xconfigure ]; then
 	chown -R snmp:snmp /var/lib/snmp
 fi
 
+if [ -f /var/run/agentx ]; then
+	rm -f /var/run/agentx
+fi
+
 if [ ! -d /var/run/agentx ]; then
 	mkdir -p /var/run/agentx
 fi
diff --git a/debian/snmpd.postrm b/debian/snmpd.postrm
index 2eda8b2..9c4a37e 100644
--- a/debian/snmpd.postrm
+++ b/debian/snmpd.postrm
@@ -7,7 +7,7 @@ set -e
 if [ $1 = purge ]; then  
     rm -f /var/lib/snmp/snmpd.conf*
     rm -f /var/lib/snmp/snmptrapd.conf*
-    rm -f /var/run/agentx
+    rm -rf /var/run/agentx
     rm -f /var/run/snmpd.pid
     rm -f /var/run/snmptrapd.pid
     if getent passwd snmp >/dev/null; then

-- 
Git repository for pkg-net-snmp