* Fix a distribution bug (we must distribute the plugins man pages even if the build machine does not compile them)

* Everything ready for 6.0, version number changed

SRC/ChangeLog

@@ -1,10 +1,10 @@
-6.0 (not yet released) 
+6.0 (2007-03-26)
 
-	* Plugins: several plugins (TODO: list) are now shipped with
+	* Plugins: several plugins (whois, postgresql, dns) are now
-	echoping and you can write your own. All new protocols will now be
+	shipped with echoping and you can write your own. All new
-	supported via plugins. Consequences:
+	protocols will now be supported via plugins. Consequences:
-	   - you now need an Unix with a working dlopen(3)
+	   * you now need an Unix with a working dlopen(3)
-	   - echoping now requires the popt parsing library
+	   * echoping now requires the popt parsing library
 	* popt: echoping now depends on popt. One main change: options
 	parsing is lightly different so some scripts *may* break. A
 	typical example is that "old-school" Unix aggreation of arguments

SRC/Makefile.am

@@ -9,6 +9,7 @@ echoping_LDADD =
 echoping_LDFLAGS = -export-dynamic
 DOCS=DETAILS PLUGINS
 SUBDIRS=plugins
+SVN_REPO=http://echoping.svn.sourceforge.net/svnroot/echoping
 
 TESTS=test-echoping-local test-echoping-remote 
 MORE_TESTS=test-echoping-proxy test-echoping-icp test-echoping-crypto test-echoping-tos test-echoping-ipv6 test-echoping-idn test-echoping-plugins
@@ -57,8 +58,9 @@ internal_tests: internal_tests.o $(echoping_OBJECTS)
 debug: 
 	$(MAKE) DEBUG=1 CFLAGS='-g -O0'
 
-upload: dist
+upload: 
-	@echo "Have you updated ChangeLog and tagged (cvs tag RELEASE_x_x_x) everything?"
+	@echo "Have you updated ChangeLog and tagged everything?"
+	@echo "[Tag is 'svn copy -m \"TAG Release x.y.z\" ${SVN_REPO}/trunk ${SVN_REPO}/tags/RELEASE_x_y_z']"
 	@echo "If so, make upload-force"
 
 upload-force: dist
@@ -71,7 +73,7 @@ realclean: distclean
 
 EXTRA_DIST = $(man_MANS) $(TESTS) $(DOCS) $(MORE_TESTS)
 
-## Otherwise, we depend on GNUmake, but for CVS users, not for regular
+## Otherwise, we depend on GNUmake, but for Subversion users, not for regular
 ## tarball users
 ##AUTOMAKE_OPTIONS = no-dependencies
 

SRC/configure-common.ac

@@ -1,5 +1,5 @@
 dnl $Id$
-AC_INIT(echoping, 6.0-BETA, bortz@users.sourceforge.net)
+AC_INIT(echoping, 6.0, bortz@users.sourceforge.net)
 AC_CANONICAL_HOST
 AC_PROG_CC(cc gcc)
 AC_LIBTOOL_DLOPEN

SRC/plugins/ldap/Makefile.am

@@ -2,9 +2,9 @@ if LDAPBUILD
 pkglib_LTLIBRARIES = ldap.la
 ldap_la_SOURCES = ldap.c
 ldap_la_LDFLAGS = -module
-man_MANS = echoping_ldap.1
 endif
+man_MANS = echoping_ldap.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) test.sh
 
 # $Id$

SRC/plugins/postgresql/Makefile.am

@@ -2,9 +2,9 @@ if PGSQLBUILD
 pkglib_LTLIBRARIES = postgresql.la
 postgresql_la_SOURCES = postgresql.c
 postgresql_la_LDFLAGS = -module
-man_MANS = echoping_postgresql.1
 endif
+man_MANS = echoping_postgresql.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) 
 
 # $Id$

SRC/plugins/whois/Makefile.am

@@ -5,4 +5,4 @@ whois_la_SOURCES = whois.c
 whois_la_LDFLAGS = -module
 man_MANS = echoping_whois.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_MANS) test.sh