[Pkg-net-snmp-commits] [pkg-net-snmp] 02/06: Imported Debian patch 5.7.2~dfsg-8.1

[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 c12d2a4fc84ac5f856b8b632c4ce0a0a2b10a3c6
Author: Laurent Bigonville <bigon at debian.org>
Date:   Sat Jul 13 17:13:09 2013 +0200

    Imported Debian patch 5.7.2~dfsg-8.1
---
 .gitignore                            |  1 -
 debian/changelog                      | 10 ++++++----
 debian/control                        |  6 +++---
 debian/libsnmp-base.install           |  2 --
 debian/libsnmp-dev.install            |  3 ++-
 debian/patches/add_rocommunity6.patch | 13 -------------
 debian/patches/series                 |  1 -
 7 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8422318..9cfb7a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
 *.old
 *.orig
 *.out
-*.pc
 *.pdb
 *.rej
 .libs/
diff --git a/debian/changelog b/debian/changelog
index c4c8014..b6b3a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-net-snmp (5.7.2~dfsg-9) UNRELEASED; urgency=medium
+net-snmp (5.7.2~dfsg-8.1) unstable; urgency=low
 
-  * add debian/patches/add_rocommunity6.patch
-    - fix snmpwalk using ipv6 (Closes: #717179)
+  * Non-maintainer upload.
+  * Move net-snmp-config to libsnmp-dev package (Closes: #716805)
+  * Mark libsnmp-base as Multi-Arch: foreign and drop Multi-Arch: same for
+    libsnmp-dev package (Closes: #708302)
 
- -- Hideki Yamane <henrich at debian.org>  Sun, 08 Dec 2013 10:51:58 +0900
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 13 Jul 2013 17:13:09 +0200
 
 net-snmp (5.7.2~dfsg-8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 10ab27a..640775b 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,7 @@ Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp30 (<<
 Breaks: libsnmp15 (<< 5.7.2~dfsg-5)
 Depends: ${misc:Depends}
 Suggests: snmp-mibs-downloader
+Multi-Arch: foreign
 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)
@@ -97,11 +98,10 @@ Description: SNMP (Simple Network Management Protocol) library debug
 Package: libsnmp-dev
 Section: libdevel
 Architecture: any
-Replaces: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Replaces: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg), libsnmp-base (<< 5.7.2~dfsg-8.1~)
 Provides: libsnmp9-dev
 Conflicts: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Breaks: libsnmp-base (<< 5.7.2~dfsg-8.1~)
 Depends: libc6-dev, libsnmp30 (=${binary:Version}), libwrap0-dev, libssl-dev, procps, libkvm-dev [kfreebsd-any], libsensors4-dev [linux-any], ${misc:Depends}
 Description: SNMP (Simple Network Management Protocol) development files
  The Simple Network Management Protocol (SNMP) provides a framework
diff --git a/debian/libsnmp-base.install b/debian/libsnmp-base.install
index 4893a7d..2e6946b 100644
--- a/debian/libsnmp-base.install
+++ b/debian/libsnmp-base.install
@@ -1,4 +1,2 @@
 mibs/*.txt	usr/share/snmp/mibs
 usr/share/snmp/mib2c-data
-usr/bin/net-snmp-config
-usr/share/man/man1/net-snmp-config.1
diff --git a/debian/libsnmp-dev.install b/debian/libsnmp-dev.install
index bcc841f..d93ec9f 100644
--- a/debian/libsnmp-dev.install
+++ b/debian/libsnmp-dev.install
@@ -9,4 +9,5 @@ agent/mibgroup/struct.h	usr/include/net-snmp/agent
 agent/mibgroup/util_funcs.h usr/include/net-snmp
 agent/mibgroup/mibincl.h usr/include/net-snmp/library
 agent/mibgroup/header_complex.h usr/include/net-snmp/agent
-
+usr/bin/net-snmp-config
+usr/share/man/man1/net-snmp-config.1
diff --git a/debian/patches/add_rocommunity6.patch b/debian/patches/add_rocommunity6.patch
deleted file mode 100644
index 69bfd10..0000000
--- a/debian/patches/add_rocommunity6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pkg-net-snmp/EXAMPLE.conf.def
-===================================================================
---- pkg-net-snmp.orig/EXAMPLE.conf.def	2013-09-04 19:13:13.000000000 +0900
-+++ pkg-net-snmp/EXAMPLE.conf.def	2013-09-04 19:13:13.000000000 +0900
-@@ -49,6 +49,8 @@
- #rocommunity public  localhost
-                                                  #  Default access to basic system info
-  rocommunity public  default    -V systemonly
-+                                                 #  rocommunity6 is for IPv6
-+ rocommunity6 public  defalut   -V systemonly    
- 
-                                                  #  Full access from an example network
-                                                  #     Adjust this network address to match your local
diff --git a/debian/patches/series b/debian/patches/series
index aa458ba..3eb3f1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,4 +19,3 @@ fix_typo_in_snmpd.conf.patch
 fix_man_error.patch
 after_RFC5378
 fix_manpage-has-errors_break_line.patch
-add_rocommunity6.patch

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