Fixing Changelog

2 files changed, 5 insertions, 20 deletions

diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 8abb4dd47fd2..12497640ac96 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-analyzer/net-snmp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.19 2003/07/31 20:26:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.20 2003/08/10 18:05:40 mholzer Exp $
 
   31 Jul 2003; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.6-r1.ebuild,
   net-snmp-5.0.8.ebuild:
@@ -36,34 +36,22 @@
  
 *net-snmp-5.0.6 (14 Oct 2002)
 
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
-<<<<<<< ChangeLog
   29 Mar 2003; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.6.ebuild:
   Add ~alpha to KEYWORDS
 
-=======
-=======
-=======
-=======
   07 May 2003; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.6.ebuild:
   Commented out kerberos support, generates compile errors.
 
->>>>>>> 1.13
   02 May 2003; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.6.ebuild:
   Removed double quotes.  Closes #5882.  Now using sed for kerberos.
 
->>>>>>> 1.12
   21 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
   net-snmp-5.0.6.ebuild, files/net-snmpd.rc6:
   Fixing type in doc info. Closes #15535.
 
->>>>>>> 1.10
   06 Apr 2003; Zach Welch <zwelch@gentoo.org> net-snmp-5.0.6.ebuild:
   add arm keyword
 
->>>>>>> 1.9
   14 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Security update. Added patch to fix compilation with libwrap.
 
@@ -79,18 +67,15 @@
 *net-snmp-5.0.2a (23 Jul 2002)
 
   23 Jul 2002; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.2a.ebuild:
-  
   Version bump, dropped emake in favor of make, add the host MIB module, and
   commented out ipv6 transports.
 
 *net-snmp-5.0.1 (29 Jun 2002)
 
   29 Jun 2002; Bruce A. Locke <blocke@shivan.org> net-snmp-5.0.1.ebuild:
-
   ucd-snmp has been renamed to net-snmp and this release appears to be 
   source incompatible with ucd-snmp
 
   Known Issue:  The new optional perl module support is disabled (due to
   configure/make issues) until someone who is familiar with the functionality 
   can contribute a patch.
-
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index 102d5119be2b..4868bb367cb3 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,15 +1,15 @@
-MD5 4de33887b781bae561d062dc883c0560 ChangeLog 3081
+MD5 c76f0ddf54d09ea7f0718c9579f91ba5 ChangeLog 2920
 MD5 1014c064a1b0b0715df9f42f367d9e31 net-snmp-5.0.1.ebuild 1809
 MD5 655d785ecb9fac3d4ac713621fa7e43e net-snmp-5.0.2a-r1.ebuild 2040
 MD5 caf55f9acf6ac1a2229436801387d735 net-snmp-5.0.2a.ebuild 1941
 MD5 ac54b4c8335205eeddf06366bed58386 net-snmp-5.0.6-r1.ebuild 2342
-MD5 88c8aed764f4d07f5e6ae02f47879668 net-snmp-5.0.8.ebuild 2492
 MD5 7fa4efb6d9bd412657cf2425a161c638 net-snmp-5.0.6.ebuild 2302
+MD5 88c8aed764f4d07f5e6ae02f47879668 net-snmp-5.0.8.ebuild 2492
 MD5 d127de412720bd3804be2526d4ac7dea files/digest-net-snmp-5.0.1 67
 MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a 68
 MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a-r1 68
 MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6 67
-MD5 d967ea531257d3b6328dffa4637b27ff files/net-snmp-5.0.6-gentoo.diff 885
-MD5 aab0f5782525e1224951f71ba800f172 files/net-snmpd.rc6 736
 MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6-r1 67
 MD5 d87102db9b8bd989270ab11bec140004 files/digest-net-snmp-5.0.8 67
+MD5 d967ea531257d3b6328dffa4637b27ff files/net-snmp-5.0.6-gentoo.diff 885
+MD5 aab0f5782525e1224951f71ba800f172 files/net-snmpd.rc6 736