ganglia · jbuchbinder · Dec 25, 2011 · Dec 25, 2011 · Dec 25, 2011 · Dec 25, 2011
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,5 @@ libmetrics/**/.libs
 libmetrics/**/*.la
 libmetrics/**/*.lo
 libmetrics/**/*.o
-libmetrics/ChangeLog
 libmetrics/INSTALL
 libtool
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
 #
 
 include $(top_srcdir)/ganglia.inc
@@ -36,16 +35,9 @@ ganglia.html: ganglia.sub
 README: ganglia.sub
 	pod2text ganglia.sub README
 
-CHANGE_LOG_GEN_BIN = scripts/svn2cl.sh
-CHANGE_LOG_GEN_FLAGS = -i --alternate-strip-prefix="/trunk/monitor-core/" --break-before-msg=1 --reparagraph --revision HEAD:1
-
-ChangeLog:
-	touch ChangeLog
-	$(CHANGE_LOG_GEN_BIN) $(CHANGE_LOG_GEN_FLAGS)
-
 CLEANFILES = ganglia.sub pod2htm*
 
-dist-local: README ganglia.html ChangeLog
+dist-local: README ganglia.html
 
 
 # We go through and make sure all the files have

diff --git a/README.SVN → README.GIT b/README.SVN → README.GIT
@@ -1,6 +1,6 @@
 Welcome to the Bleeding Edge of Ganglia Development
 
-The SVN source represents the latest snapshot of Ganglia
+The git source represents the latest snapshot of Ganglia
 development.
 
 For best results, make sure you have in your development environment
@@ -17,15 +17,7 @@ Additionally,  you might need the following
 
 CheckOut the source files of Ganglia:
 
-  svn co http://ganglia.svn.sourceforge.net/svnroot/ganglia/trunk/monitor-core ganglia
-
-If you are interested in getting a snapshot for distribution
-you have to edit the configure.in file to set the variable GANGLIA_SNAPSHOT
-to "yes" and update the value of the GANGLIA_NANO_VERSION variable with the
-version number that your snapshot represents and that usually corresponds
-to the numeric value returned by:
-
-  ./svnversion .
+  git clone git://github.com/ganglia/monitor-core.git ganglia
 
 To prepare the distribution for compilation, run the bootstrapping script:
 

diff --git a/bootstrap b/bootstrap
@@ -1,19 +1,8 @@
 #!/bin/sh
-# $Id$
 echo "Bootstrapping libmetrics"
 cd libmetrics && ./bootstrap || exit 1
 cd ..
 
-MINOR=`grep 'GANGLIA_MINOR_VERSION=' configure.in | cut -d "=" -f 2`
-if [ $MINOR -eq 1 ]; then
-  #XXX: only for 3.1
-  SVNVERSION=`svnversion . | cut -d ":" -f 1 | sed -e "s/[A-Z]//g"`
-  if [ "$SVNVERSION" = "exported" ]; then
-    SVNVERSION=0
-  fi
-  perl -pi -e "s/GANGLIA_NANO_VERSION=\d+/GANGLIA_NANO_VERSION=$SVNVERSION/g" configure.in
-fi
-
 echo "Create distribution timestamp"
 touch Makefile.am
 echo "Running aclocal" &&
@@ -23,9 +12,9 @@ autoheader &&
 echo "Creating build" &&
 mkdir -p build &&
 echo "Running automake" &&
-automake --add-missing --copy 2>/dev/null
+automake --add-missing --copy --foreign 2>/dev/null
 echo "Running libtoolize" &&
-libtoolize --automake --copy && automake --add-missing --copy &&
+libtoolize --automake --copy && automake --add-missing --copy --foreign &&
 echo "Running autoconf" &&
 autoconf -f || exit 1
 

diff --git a/configure.in b/configure.in
@@ -1,5 +1,4 @@
 dnl
-dnl $Id$
 dnl
 dnl "Copyright (c) 2001 by Matt Massie and The Regents of the University
 dnl  of California.  All rights reserved."
@@ -54,10 +53,6 @@ GANGLIA_MICRO_VERSION=1
 #   appears to be consistent with the way Blastwave does things
 REL=1
 
-# If we are releasing a snapshot (beta), set GANGLIA_SNAPSHOT to "yes"
-# If we are creating an official release, set it to "no" 
-GANGLIA_SNAPSHOT="yes"
-
 # If there are any changes to libganglia in this release, you need to...
 #   LIBGANGLIA_MICRO_VERSION += 1;
 #   LIBGANGLIA_INTERFACE_AGE += 1;
@@ -70,14 +65,7 @@ LIBGANGLIA_INTERFACE_AGE=0
 LIBGANGLIA_BINARY_AGE=0
 ### END RELEASE VARIABLES #############################
 
-if test x"$GANGLIA_SNAPSHOT" != xyes;
-then
 GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION
-else
-GANGLIA_NANO_VERSION=0
-AC_DEFINE_UNQUOTED(GANGLIA_NANO_VERSION, $GANGLIA_NANO_VERSION, GANGLIA_NANO_VERSION)
-GANGLIA_VERSION=$GANGLIA_MAJOR_VERSION.$GANGLIA_MINOR_VERSION.$GANGLIA_MICRO_VERSION.$GANGLIA_NANO_VERSION
-fi
 
 AM_INIT_AUTOMAKE(ganglia, $GANGLIA_VERSION)
 

diff --git a/debian/gmetad.conf b/debian/gmetad.conf
@@ -1,7 +1,6 @@
 # This is an example of a Ganglia Meta Daemon configuration file
 #                http://ganglia.sourceforge.net/
 #
-# $Id$
 #
 # Setting the debug_level above zero will make gmetad output
 # debugging information and stay in the foreground

diff --git a/ganglia.spec.in b/ganglia.spec.in
@@ -1,5 +1,4 @@
 #
-# $Id$
 #
 # @configure_input@
 #

diff --git a/gmetad/cleanup.c b/gmetad/cleanup.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 /*
  * cleanup.c - Enforces metric/host delete time. Helps keep
  *    memory usage trim and fit by deleting expired metrics from hash.

diff --git a/gmetad/daemon_init.c b/gmetad/daemon_init.c
@@ -1,7 +1,6 @@
 /**
  * @file daemon_init.c Functions for standalone daemons
  */ 
-/* $Id$ */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>

diff --git a/gmetad/data_thread.c b/gmetad/data_thread.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/poll.h>

diff --git a/gmetad/gmetad.c b/gmetad/gmetad.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>

diff --git a/gmetad/gmetad.conf.in b/gmetad/gmetad.conf.in
@@ -1,7 +1,6 @@
 # This is an example of a Ganglia Meta Daemon configuration file
 #                http://ganglia.sourceforge.net/
 #
-# $Id$
 #
 #-------------------------------------------------------------------------------
 # Setting the debug_level to 1 will keep daemon in the forground and

diff --git a/gmetad/gmetad.init b/gmetad/gmetad.init
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 #
 # chkconfig: 2345 20 80
 # description: gmetad startup script

diff --git a/gmetad/metric_hash.c b/gmetad/metric_hash.c
@@ -1,6 +1,5 @@
 /* C code produced by gperf version 2.7.2 */
 /* Command-line: gperf -G -l -H metric_hash -t -F ', 0' -N in_metric_list -k '1,6,$' -W metrics ./metric_hash.gperf  */
-/* $Id$ */
 /* Included for the metric_tyep definition */
 #include <gmetad.h>
 

diff --git a/gmetad/type_hash.c b/gmetad/type_hash.c
@@ -30,7 +30,6 @@ error "gperf generated tables don't work with this execution character set. Plea
 
 #line 1 "type_hash.gperf"
 
-/* $Id$ */
 /* Recognizes metric types. 
  * Build with: gperf -G -l -H type_hash -t -F ', 0' -N in_type_list -k 1,$ \
  * -W types ./type_hash.gperf > type_hash.c

diff --git a/gmetad/type_hash.gperf b/gmetad/type_hash.gperf
@@ -1,5 +1,4 @@
 %{
-/* $Id$ */
 /* Recognizes metric types. 
  * Build with: gperf -G -l -H type_hash -t -F ', 0' -N in_type_list -k 1,$ \
  * -W types ./type_hash.gperf > type_hash.c

diff --git a/gmetad/xml_hash.c b/gmetad/xml_hash.c
@@ -30,7 +30,6 @@ error "gperf generated tables don't work with this execution character set. Plea
 
 #line 1 "xml_hash.gperf"
 
-/* $Id$ */
 #include <gmetad.h>
 #line 5 "xml_hash.gperf"
 struct xml_tag;

diff --git a/gmetad/xml_hash.gperf b/gmetad/xml_hash.gperf
@@ -1,5 +1,4 @@
 %{
-/* $Id$ */
 #include <gmetad.h>
 %}
 struct xml_tag;

diff --git a/gmond/g25_config.c b/gmond/g25_config.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <stdio.h>
 #include <dotconf.h>
 #include "ganglia_priv.h"

diff --git a/gmond/gmond.init b/gmond/gmond.init
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 #
 # chkconfig: 2345 70 40
 # description: gmond startup script

diff --git a/gstat/gstat.c b/gstat/gstat.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif /* HAVE_CONFIG_H */

diff --git a/lib/become_a_nobody.c b/lib/become_a_nobody.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/lib/daemon_inetd.c b/lib/daemon_inetd.c
@@ -1,7 +1,6 @@
 /**
  * @file daemon_inetd.c Functions for inetd daemons
  */
-/* $Id$ */
 #include <stdarg.h>
 #include <syslog.h>
 

diff --git a/lib/debug_msg.c b/lib/debug_msg.c
@@ -1,7 +1,6 @@
 /**
  * @file debug_msg.c Debug Message function
  */
-/* $Id$ */
 #include <stdio.h>
 #include <stdarg.h>
 

diff --git a/lib/error_msg.c b/lib/error_msg.c
@@ -1,7 +1,6 @@
 /**
  * @file error_msg.c Error Handling Functions
  */
-/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/lib/file.c b/lib/file.c
@@ -1,7 +1,6 @@
 /**
  * @file file.c Some file functions
  */
-/* $Id$ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

diff --git a/lib/ganglia.c b/lib/ganglia.c
@@ -1,7 +1,6 @@
 /**
  * @file gexec_funcs.c Functions to support gexec, gstat et al
  */
-/* $Id$ */
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/lib/hash.c b/lib/hash.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/lib/inetaddr.c b/lib/inetaddr.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * This code was originally written by the authors below but
  * I rewrote it and took out all the glib dependencies.
  *

diff --git a/lib/llist.c b/lib/llist.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * "Copyright (c) 1999 by Brent N. Chun and The Regents of the University 
  * of California.  All rights reserved."
  *

diff --git a/lib/my_inet_ntop.c b/lib/my_inet_ntop.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/lib/net.h b/lib/net.h
@@ -1,6 +1,5 @@
 #ifndef NET_H
 #define NET_H 1
-/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

diff --git a/lib/tcp.c b/lib/tcp.c
@@ -1,5 +1,4 @@
 /*
- * $Id$
  * This code was originally written by the authors below but 
  * I rewrote it and took out all the glib dependencies. 
  *

diff --git a/libmetrics/bootstrap b/libmetrics/bootstrap
@@ -1,17 +1,16 @@
 #!/bin/sh
-# $Id$
 #echo "Running make distclean"
 #make distclean
 echo "Running aclocal" &&
 aclocal &&
 echo "Running autoheader" &&
 autoheader &&
 echo "Preparing tree" &&
-mkdir -p build && touch ChangeLog && ../scripts/svn2cl.sh -i --alternate-strip-prefix="/trunk/monitor-core/libmetrics/" --break-before-msg=1 --reparagraph
+mkdir -p build && 
 echo "Running automake" &&
-automake --add-missing --copy 2>/dev/null
+automake --add-missing --copy --foreign 2>/dev/null
 echo "Running libtoolize" &&
-libtoolize --automake --copy && automake --add-missing --copy &&
+libtoolize --automake --copy && automake --add-missing --copy --foreign &&
 echo "Running autoconf" &&
 autoconf -f || exit 1
 echo
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     #
-    # $Id$
     #
     # @configure_input@
     #
@@ Expand Down @@