[Pkg-net-snmp-commits] r319 - branches/net-snmp54/debian branches/net-snmp54-dev/debian trunk/debian
Jochen Friedrich
jochen at alioth.debian.org
Tue Dec 1 17:41:00 UTC 2009
Author: jochen
Date: 2009-12-01 17:41:00 +0000 (Tue, 01 Dec 2009)
New Revision: 319
Modified:
branches/net-snmp54-dev/debian/control
branches/net-snmp54-dev/debian/libsnmp-base.install
branches/net-snmp54-dev/debian/libsnmp15.install
branches/net-snmp54/debian/changelog
branches/net-snmp54/debian/control
branches/net-snmp54/debian/libsnmp-base.install
branches/net-snmp54/debian/libsnmp15.install
trunk/debian/control
trunk/debian/libsnmp-base.install
trunk/debian/libsnmp15.install
Log:
Move net-snmp-config to libsnmp15 as it contains arch specific entries.
Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54/debian/changelog 2009-12-01 17:41:00 UTC (rev 319)
@@ -6,6 +6,8 @@
python module compile with python2.6 (Closes: #557540).
* Suggests snmp-mibs-downloader from contrib to download MIBs.
Remove the download scripts from this package (Closes: #557434, #557682)
+ * Move net-snmp-config to libsnmp15 as it contains platform dependent
+ code (Closes: #558488). Also clean up old Replaces / Conflicts.
-- Jochen Friedrich <jochen at scram.de> Tue, 01 Dec 2009 13:39:32 +0100
Modified: branches/net-snmp54/debian/control
===================================================================
--- branches/net-snmp54/debian/control 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54/debian/control 2009-12-01 17:41:00 UTC (rev 319)
@@ -14,8 +14,6 @@
Section: net
Priority: optional
Architecture: any
-Conflicts: snmp (<<3.6-3), snmptraplogd
-Replaces: snmptraplogd
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
Description: SNMP (Simple Network Management Protocol) agents
The Simple Network Management Protocol (SNMP) provides a framework
@@ -43,9 +41,8 @@
Section: libs
Priority: optional
Architecture: all
-Replaces: snmp (<=3.6.2-3), libsnmp, zebra, zebra-pj, quagga, libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp5-dev
-Provides: libsnmp
-Conflicts: libsnmp, libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp5-dev
+Replaces: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
+Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
Depends: ${misc:Depends}
Suggests: snmp-mibs-downloader
Description: SNMP (Simple Network Management Protocol) MIBs and documentation
@@ -62,7 +59,7 @@
Section: libs
Priority: optional
Architecture: any
-Replaces: snmp (<=3.6.2-3), snmpd (<=4.1.2-1)
+Replaces: libsnmp-base (<< 5.4.2.1~dfsg-4)
Depends: libsnmp-base (>=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: SNMP (Simple Network Management Protocol) library
The Simple Network Management Protocol (SNMP) provides a framework
@@ -89,9 +86,9 @@
Section: libdevel
Priority: optional
Architecture: any
-Replaces: libsnmp9-dev, libsnmp10-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Replaces: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
Provides: libsnmp9-dev
-Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp10-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
Depends: libc6-dev, libsnmp15 (=${binary:Version}), libsnmp-perl (=${binary:Version}), libwrap0-dev, libssl-dev, procps, ${os-specific-dev}, ${misc:Depends}
Description: SNMP (Simple Network Management Protocol) development files
The Simple Network Management Protocol (SNMP) provides a framework
Modified: branches/net-snmp54/debian/libsnmp-base.install
===================================================================
--- branches/net-snmp54/debian/libsnmp-base.install 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54/debian/libsnmp-base.install 2009-12-01 17:41:00 UTC (rev 319)
@@ -6,5 +6,3 @@
debian/tmp/usr/share/man/man5/snmpd.examples.5snmp
debian/tmp/usr/share/man/man5/snmpd.internal.5snmp
debian/tmp/usr/share/man/man5/variables.5snmp
-debian/tmp/usr/bin/net-snmp-config
-debian/tmp/usr/share/man/man1/net-snmp-config.1
Modified: branches/net-snmp54/debian/libsnmp15.install
===================================================================
--- branches/net-snmp54/debian/libsnmp15.install 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54/debian/libsnmp15.install 2009-12-01 17:41:00 UTC (rev 319)
@@ -1 +1,3 @@
debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/bin/net-snmp-config
+debian/tmp/usr/share/man/man1/net-snmp-config.1
Modified: branches/net-snmp54-dev/debian/control
===================================================================
--- branches/net-snmp54-dev/debian/control 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54-dev/debian/control 2009-12-01 17:41:00 UTC (rev 319)
@@ -14,8 +14,6 @@
Section: net
Priority: optional
Architecture: any
-Conflicts: snmp (<<3.6-3), snmptraplogd
-Replaces: snmptraplogd
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
Description: SNMP (Simple Network Management Protocol) agents
The Simple Network Management Protocol (SNMP) provides a framework
@@ -43,9 +41,8 @@
Section: libs
Priority: optional
Architecture: all
-Replaces: snmp (<=3.6.2-3), libsnmp, zebra, zebra-pj, quagga, libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp5-dev
-Provides: libsnmp
-Conflicts: libsnmp, libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp5-dev
+Replaces: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
+Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
Depends: ${misc:Depends}
Suggests: snmp-mibs-downloader
Description: SNMP (Simple Network Management Protocol) MIBs and documentation
@@ -62,7 +59,7 @@
Section: libs
Priority: optional
Architecture: any
-Replaces: snmp (<=3.6.2-3), snmpd (<=4.1.2-1)
+Replaces: libsnmp-base (<< 5.4.2.1~dfsg-4)
Depends: libsnmp-base (>=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: SNMP (Simple Network Management Protocol) library
The Simple Network Management Protocol (SNMP) provides a framework
@@ -89,9 +86,9 @@
Section: libdevel
Priority: optional
Architecture: any
-Replaces: libsnmp9-dev, libsnmp10-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Replaces: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
Provides: libsnmp9-dev
-Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp10-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
Depends: libc6-dev, libsnmp15 (=${binary:Version}), libsnmp-perl (=${binary:Version}), libwrap0-dev, libssl-dev, procps, ${os-specific-dev}, ${misc:Depends}
Description: SNMP (Simple Network Management Protocol) development files
The Simple Network Management Protocol (SNMP) provides a framework
Modified: branches/net-snmp54-dev/debian/libsnmp-base.install
===================================================================
--- branches/net-snmp54-dev/debian/libsnmp-base.install 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54-dev/debian/libsnmp-base.install 2009-12-01 17:41:00 UTC (rev 319)
@@ -1,4 +1,4 @@
-debian/tmp/usr/share/snmp/mibs
+debian/tmp/usr/share/mibs
debian/tmp/usr/share/snmp/mib2c-data
debian/tmp/usr/share/man/man5/mib2c.conf.5snmp
debian/tmp/usr/share/man/man5/snmp.conf.5snmp
@@ -6,5 +6,3 @@
debian/tmp/usr/share/man/man5/snmpd.examples.5snmp
debian/tmp/usr/share/man/man5/snmpd.internal.5snmp
debian/tmp/usr/share/man/man5/variables.5snmp
-debian/tmp/usr/bin/net-snmp-config
-debian/tmp/usr/share/man/man1/net-snmp-config.1
Modified: branches/net-snmp54-dev/debian/libsnmp15.install
===================================================================
--- branches/net-snmp54-dev/debian/libsnmp15.install 2009-12-01 17:13:29 UTC (rev 318)
+++ branches/net-snmp54-dev/debian/libsnmp15.install 2009-12-01 17:41:00 UTC (rev 319)
@@ -1 +1,3 @@
debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/bin/net-snmp-config
+debian/tmp/usr/share/man/man1/net-snmp-config.1
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-12-01 17:13:29 UTC (rev 318)
+++ trunk/debian/control 2009-12-01 17:41:00 UTC (rev 319)
@@ -14,8 +14,6 @@
Section: net
Priority: optional
Architecture: any
-Conflicts: snmp (<<3.6-3), snmptraplogd
-Replaces: snmptraplogd
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
Description: SNMP (Simple Network Management Protocol) agents
The Simple Network Management Protocol (SNMP) provides a framework
@@ -43,9 +41,8 @@
Section: libs
Priority: optional
Architecture: all
-Replaces: snmp (<=3.6.2-3), libsnmp, zebra, zebra-pj, quagga, libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp5-dev
-Provides: libsnmp
-Conflicts: libsnmp, libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg), libsnmp5-dev
+Replaces: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
+Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
Depends: ${misc:Depends}
Suggests: snmp-mibs-downloader
Description: SNMP (Simple Network Management Protocol) MIBs and documentation
@@ -62,7 +59,7 @@
Section: libs
Priority: optional
Architecture: any
-Replaces: snmp (<=3.6.2-3), snmpd (<=4.1.2-1)
+Replaces: libsnmp-base (<< 5.4.2.1~dfsg-4)
Depends: libsnmp-base (>=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: SNMP (Simple Network Management Protocol) library
The Simple Network Management Protocol (SNMP) provides a framework
@@ -89,9 +86,9 @@
Section: libdevel
Priority: optional
Architecture: any
-Replaces: libsnmp9-dev, libsnmp10-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Replaces: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
Provides: libsnmp9-dev
-Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp10-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
+Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
Depends: libc6-dev, libsnmp15 (=${binary:Version}), libsnmp-perl (=${binary:Version}), libwrap0-dev, libssl-dev, procps, ${os-specific-dev}, ${misc:Depends}
Description: SNMP (Simple Network Management Protocol) development files
The Simple Network Management Protocol (SNMP) provides a framework
Modified: trunk/debian/libsnmp-base.install
===================================================================
--- trunk/debian/libsnmp-base.install 2009-12-01 17:13:29 UTC (rev 318)
+++ trunk/debian/libsnmp-base.install 2009-12-01 17:41:00 UTC (rev 319)
@@ -6,5 +6,3 @@
debian/tmp/usr/share/man/man5/snmpd.examples.5snmp
debian/tmp/usr/share/man/man5/snmpd.internal.5snmp
debian/tmp/usr/share/man/man5/variables.5snmp
-debian/tmp/usr/bin/net-snmp-config
-debian/tmp/usr/share/man/man1/net-snmp-config.1
Modified: trunk/debian/libsnmp15.install
===================================================================
--- trunk/debian/libsnmp15.install 2009-12-01 17:13:29 UTC (rev 318)
+++ trunk/debian/libsnmp15.install 2009-12-01 17:41:00 UTC (rev 319)
@@ -1 +1,3 @@
debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/bin/net-snmp-config
+debian/tmp/usr/share/man/man1/net-snmp-config.1
More information about the Pkg-net-snmp-commits
mailing list