[netfilter-cvslog] r6797 - in trunk/conntrack-tools: . include src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-04-17 02:28:16 +0200 (Tue, 17 Apr 2007)
New Revision: 6797

Modified:
   trunk/conntrack-tools/Makefile.am
   trunk/conntrack-tools/configure.in
   trunk/conntrack-tools/include/Makefile.am
   trunk/conntrack-tools/src/conntrack.c
Log:
- bump version to 0.9.3
- show 'conntrack-tools' string when 'conntrack -V' is issued
- include missing headers to include/Makefile.am


Modified: trunk/conntrack-tools/Makefile.am
===================================================================
--- trunk/conntrack-tools/Makefile.am	2007-04-17 00:12:45 UTC (rev 6796)
+++ trunk/conntrack-tools/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
@@ -5,7 +5,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
 
 man_MANS = conntrack.8
-EXTRA_DIST = Make_global.am ChangeLog TODO
+EXTRA_DIST = $(man_MANS) Make_global.am ChangeLog TODO
 
 SUBDIRS   = src extensions
 DIST_SUBDIRS = include src extensions examples

Modified: trunk/conntrack-tools/configure.in
===================================================================
--- trunk/conntrack-tools/configure.in	2007-04-17 00:12:45 UTC (rev 6796)
+++ trunk/conntrack-tools/configure.in	2007-04-17 00:28:16 UTC (rev 6797)
@@ -1,4 +1,4 @@
-AC_INIT(conntrackd, 0.9.2, pablo at netfilter.org)
+AC_INIT(conntrackd, 0.9.3, pablo at netfilter.org)
 
 AC_CANONICAL_SYSTEM
 

Modified: trunk/conntrack-tools/include/Makefile.am
===================================================================
--- trunk/conntrack-tools/include/Makefile.am	2007-04-17 00:12:45 UTC (rev 6796)
+++ trunk/conntrack-tools/include/Makefile.am	2007-04-17 00:28:16 UTC (rev 6797)
@@ -1,5 +1,6 @@
 
 noinst_HEADERS = alarm.h jhash.h slist.h cache.h linux_list.h \
 		 sync.h conntrackd.h local.h us-conntrack.h \
-		 debug.h log.h hash.h mcast.h buffer.h
+		 debug.h log.h hash.h mcast.h buffer.h conntrack.h \
+		 state_helper.h network.h ignore.h
 

Modified: trunk/conntrack-tools/src/conntrack.c
===================================================================
--- trunk/conntrack-tools/src/conntrack.c	2007-04-17 00:12:45 UTC (rev 6796)
+++ trunk/conntrack-tools/src/conntrack.c	2007-04-17 00:28:16 UTC (rev 6797)
@@ -1104,7 +1104,7 @@
 		break;
 			
 	case CT_VERSION:
-		fprintf(stdout, "%s v%s\n", PROGNAME, VERSION);
+		printf("%s v%s (conntrack-tools)\n", PROGNAME, VERSION);
 		break;
 	case CT_HELP:
 		usage(argv[0]);