From d21e83b98b488341684a43d7bd904c8c1768a760 Mon Sep 17 00:00:00 2001 From: Gilbert Ramirez Date: Mon, 5 Mar 2001 22:53:41 +0000 Subject: [PATCH] Move version to 0.8.16. Fix build for splitting build dir from src dir. Note the use of updated GTK+ release for Win32 binaries. svn path=/trunk/; revision=3107 --- README.win32 | 9 ++++----- config.h.win32 | 8 ++++---- configure.in | 6 +++--- epan/config.h.win32 | 4 ++-- epan/configure.in | 4 ++-- epan/dfilter/Makefile.am | 4 ++-- epan/ftypes/Makefile.am | 4 ++-- image/editcap.rc | 10 +++++----- image/ethereal.rc | 10 +++++----- image/tethereal.rc | 10 +++++----- 10 files changed, 34 insertions(+), 35 deletions(-) diff --git a/README.win32 b/README.win32 index 8dbacb1776..20e27d602e 100644 --- a/README.win32 +++ b/README.win32 @@ -1,4 +1,4 @@ -$Id: README.win32,v 1.18 2001/01/12 02:35:49 gram Exp $ +$Id: README.win32,v 1.19 2001/03/05 22:53:36 gram Exp $ Running Ethereal, Tethereal, and Editcap on Win32 ================================================= @@ -22,7 +22,7 @@ Plugins (gryphon.dll and mgcp.dll) can go in: C:\Ethereal\plugins\ Where is the version number, without brackets. -For example, C:\Ethereal\plugins\0.8.15 +For example, C:\Ethereal\plugins\0.8.16 Yes, the location of plugins needs to be more flexible. @@ -41,7 +41,8 @@ in time: Ethereal Version GTK+/GLIB version ---------------- ----------------- -0.8.11 and after 20000805 +0.8.16 and after 20001226 +0.8.11 - 0.8.15 20000805 0.8.9 - 0.8.10 20000416 0.8.8 and before 19990828 @@ -117,9 +118,7 @@ to generate C source. The "special" files and their requisite tools are: Source Output Tool ------ ------ ---- -dfilter-grammar.y *.[ch] Bison or Yacc dfilter-scanner.l *.c Flex -wiretap/ascend-grammar.y *.[ch] Bison or Yacc wiretap/ascend-scanner.l *.c Flex ncp2222.py packet-ncp2222.c Python diff --git a/config.h.win32 b/config.h.win32 index 44f86054e6..dd994f7bc6 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.24 2001/01/12 04:06:22 gram Exp $ */ +/* $Id: config.h.win32,v 1.25 2001/03/05 22:53:36 gram Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -139,8 +139,8 @@ #define PACKAGE "ethereal" /* Version number of package */ -#define VERSION "0.8.15" +#define VERSION "0.8.16" -/* Plugin installation directory */ -#define PLUGIN_DIR "/usr/local/lib/ethereal/plugins/0.8.15" +/* Plugin installation directory... */ +#define PLUGIN_DIR "C:/ethereal/plugins/0.8.16" diff --git a/configure.in b/configure.in index e07cbb3028..1eed5da6d9 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.113 2001/02/01 20:21:13 gram Exp $ +# $Id: configure.in,v 1.114 2001/03/05 22:53:37 gram Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -13,7 +13,7 @@ AC_INIT(etypes.h) AC_PREREQ(2.13) -AM_INIT_AUTOMAKE(ethereal, 0.8.15) +AM_INIT_AUTOMAKE(ethereal, 0.8.16) AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes) @@ -482,7 +482,7 @@ AC_ARG_WITH(plugindir, *) PLUGIN_DIR="$withval" esac ], - : ${PLUGIN_DIR=$libdir/ethereal/plugins/0.8.15} + : ${PLUGIN_DIR=$libdir/ethereal/plugins/0.8.16} ) PLUGIN_DIR=`( diff --git a/epan/config.h.win32 b/epan/config.h.win32 index d7d3a37d89..2ca4bdbc67 100644 --- a/epan/config.h.win32 +++ b/epan/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.4 2001/01/12 04:18:49 gram Exp $ */ +/* $Id: config.h.win32,v 1.5 2001/03/05 22:53:38 gram Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -105,4 +105,4 @@ #define PACKAGE "libethereal.a" /* Version number of package */ -#define VERSION "0.8.15" +#define VERSION "0.8.16" diff --git a/epan/configure.in b/epan/configure.in index 51f84b489b..d10e59b0c0 100644 --- a/epan/configure.in +++ b/epan/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.4 2001/02/01 20:21:15 gram Exp $ +# $Id: configure.in,v 1.5 2001/03/05 22:53:38 gram Exp $ dnl dnl Process this file with autoconf 2.13 or later to produce a dnl configure script; 2.12 doesn't generate a "configure" script that @@ -13,7 +13,7 @@ AC_INIT(epan.c) AC_PREREQ(2.13) -AM_INIT_AUTOMAKE(libethereal.a, 0.8.15) +AM_INIT_AUTOMAKE(libethereal.a, 0.8.16) AM_CONFIG_HEADER(config.h) dnl Checks for programs. diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am index 09755684dc..d15a4e47cb 100644 --- a/epan/dfilter/Makefile.am +++ b/epan/dfilter/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am,v 1.8 2001/02/27 20:34:08 gram Exp $ +# $Id: Makefile.am,v 1.9 2001/03/05 22:53:39 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -31,7 +31,7 @@ CLEANFILES = \ libdfilter.a \ *~ -INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/$(LEMON) +INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. -I$(srcdir)/$(LEMON) libdfilter_a_SOURCES = \ dfilter.c \ diff --git a/epan/ftypes/Makefile.am b/epan/ftypes/Makefile.am index 650cd2b5a5..de18d0c22a 100644 --- a/epan/ftypes/Makefile.am +++ b/epan/ftypes/Makefile.am @@ -1,6 +1,6 @@ # Makefile.am # -# $Id: Makefile.am,v 1.3 2001/02/02 04:03:41 gram Exp $ +# $Id: Makefile.am,v 1.4 2001/03/05 22:53:40 gram Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs @@ -31,7 +31,7 @@ CLEANFILES = \ libftypes.a \ *~ -INCLUDES = -I$(srcdir)/../.. +INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. libftypes_a_SOURCES = \ ftypes.c \ diff --git a/image/editcap.rc b/image/editcap.rc index 033a89490a..fb6f9a563b 100644 --- a/image/editcap.rc +++ b/image/editcap.rc @@ -3,8 +3,8 @@ ETHEREAL_ICON ICON "ethereal.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,8,15,0 - PRODUCTVERSION 0,8,15,0 + FILEVERSION 0,8,16,0 + PRODUCTVERSION 0,8,16,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x3L @@ -21,12 +21,12 @@ BEGIN BEGIN VALUE "CompanyName", "The Ethereal developer community\0" VALUE "FileDescription", "Editcap\0" - VALUE "FileVersion", "0.8.15\0" - VALUE "InternalName", "Editcap 0.8.15\0" + VALUE "FileVersion", "0.8.16\0" + VALUE "InternalName", "Editcap 0.8.16\0" VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs , Gilbert Ramirez and others\0" VALUE "OriginalFilename", "Editcap.exe\0" VALUE "ProductName", "Editcap\0" - VALUE "ProductVersion", "0.8.15\0" + VALUE "ProductVersion", "0.8.16\0" END END BLOCK "VarFileInfo" diff --git a/image/ethereal.rc b/image/ethereal.rc index 29989ab668..d66e3c8a35 100644 --- a/image/ethereal.rc +++ b/image/ethereal.rc @@ -3,8 +3,8 @@ ETHEREAL_ICON ICON "ethereal.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,8,15,0 - PRODUCTVERSION 0,8,15,0 + FILEVERSION 0,8,16,0 + PRODUCTVERSION 0,8,16,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x3L @@ -21,12 +21,12 @@ BEGIN BEGIN VALUE "CompanyName", "The Ethereal developer community, http://www.ethereal.com/\0" VALUE "FileDescription", "Ethereal\0" - VALUE "FileVersion", "0.8.15\0" - VALUE "InternalName", "Ethereal 0.8.15\0" + VALUE "FileVersion", "0.8.16\0" + VALUE "InternalName", "Ethereal 0.8.16\0" VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs , Gilbert Ramirez and others\0" VALUE "OriginalFilename", "Ethereal.exe\0" VALUE "ProductName", "Ethereal\0" - VALUE "ProductVersion", "0.8.15\0" + VALUE "ProductVersion", "0.8.16\0" END END BLOCK "VarFileInfo" diff --git a/image/tethereal.rc b/image/tethereal.rc index b924879de4..0122efde3c 100644 --- a/image/tethereal.rc +++ b/image/tethereal.rc @@ -3,8 +3,8 @@ ETHEREAL_ICON ICON "ethereal.ico" VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,8,15,0 - PRODUCTVERSION 0,8,15,0 + FILEVERSION 0,8,16,0 + PRODUCTVERSION 0,8,16,0 FILEFLAGSMASK 0x0L #ifdef _DEBUG FILEFLAGS 0x3L @@ -21,12 +21,12 @@ BEGIN BEGIN VALUE "CompanyName", "The Ethereal developer community\0" VALUE "FileDescription", "Tethereal\0" - VALUE "FileVersion", "0.8.15\0" - VALUE "InternalName", "Tethereal 0.8.15\0" + VALUE "FileVersion", "0.8.16\0" + VALUE "InternalName", "Tethereal 0.8.16\0" VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs , Gilbert Ramirez and others\0" VALUE "OriginalFilename", "Tethereal.exe\0" VALUE "ProductName", "Tethereal\0" - VALUE "ProductVersion", "0.8.15\0" + VALUE "ProductVersion", "0.8.16\0" END END BLOCK "VarFileInfo"