diff options
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/asciidoc.conf | 2 | ||||
| -rw-r--r-- | docbook/release-notes.asciidoc | 4 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rw-r--r-- | filetap/Makefile.am | 2 | ||||
| -rwxr-xr-x | make-version.pl | 4 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/config.nmake b/config.nmake index fb5d2b3c65..500dfe81ab 100644 --- a/config.nmake +++ b/config.nmake @@ -34,8 +34,8 @@ GIT_REVISION=0 # The current Wireshark version. Recommended: Leave unchanged. # Updated by make-version.pl VERSION_MAJOR=1 -VERSION_MINOR=11 -VERSION_MICRO=4 +VERSION_MINOR=99 +VERSION_MICRO=0 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index e95f758ed3..4692b88b41 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,8 @@ # Define variables for the components of the Wireshark version number. # m4_define([version_major], [1]) -m4_define([version_minor], [11]) -m4_define([version_micro], [4]) +m4_define([version_minor], [99]) +m4_define([version_micro], [0]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index 2960af0f09..f6c531b1b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.11.4) unstable; urgency=low +wireshark (1.99.0) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 72b45bc0b2..793a0da9ec 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -4,7 +4,7 @@ # Yes, these are fake macros. # We should probably replace some or all of them with attributes. -wireshark-version:\[\]=1.11.4 +wireshark-version:\[\]=1.99.0 wireshark-major-minor-version:\[\]=1.11 wireshark-authors-url:\[\]=http://www.wireshark.org/about.html#authors diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index b7969473a3..0cd28a7560 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -16,8 +16,8 @@ The following bugs have been fixed: //* ws-buglink:5000[] //* ws-buglink:6000[Wireshark bug] -//* cve-idlink:2013-2486[] -//* Wireshark always manages to score tickets for Burning Man, Coachella, and SXSW while you end up working double shifts. (ws-buglink:0000[]) +//* cve-idlink:2014-2486[] +//* Wireshark insists on calling you on your land line which is keeping you from abandoning it for cellular. (ws-buglink:0000[]) * "On-the-wire" packet lengths are limited to 65535 bytes. (ws-buglink:8808[], ws-buglink:9390) * "Follow TCP Stream" shows only the first HTTP req+res. (ws-buglink:9044[]) diff --git a/epan/Makefile.am b/epan/Makefile.am index 9b8c8b2b29..0128e1f4e0 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -54,7 +54,7 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` noinst_LTLIBRARIES = libwireshark_generated.la libwireshark_asmopt.la lib_LTLIBRARIES = libwireshark.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwireshark_la_LDFLAGS = -version-info 0:4:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff --git a/filetap/Makefile.am b/filetap/Makefile.am index 5412b944bd..6cc57d3564 100644 --- a/filetap/Makefile.am +++ b/filetap/Makefile.am @@ -27,7 +27,7 @@ include Makefile.common lib_LTLIBRARIES = libfiletap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libfiletap_la_LDFLAGS = -version-info 0:4:0 @LDFLAGS_SHAREDLIB@ +libfiletap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL diff --git a/make-version.pl b/make-version.pl index 8c11bdceb4..ee2600906b 100755 --- a/make-version.pl +++ b/make-version.pl @@ -75,8 +75,8 @@ my $set_version = 0; my $set_release = 0; my %version_pref = ( "version_major" => 1, - "version_minor" => 11, - "version_micro" => 4, + "version_minor" => 99, + "version_micro" => 0, "version_build" => 0, "enable" => 1, diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 04900bf493..859c8baa2d 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -28,7 +28,7 @@ include Makefile.common noinst_LTLIBRARIES = libwiretap_generated.la lib_LTLIBRARIES = libwiretap.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -libwiretap_la_LDFLAGS = -version-info 0:4:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL |