From c8bdb95d21427284bd209179e03b191aff895bcb Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 2 Sep 2015 11:27:12 -0700 Subject: [PATCH] =?UTF-8?q?1.99.9=20=E2=86=92=201.99.10.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs --- CMakeLists.txt | 2 +- config.nmake | 2 +- configure.ac | 2 +- debian/changelog | 2 +- docbook/asciidoc.conf | 2 +- epan/CMakeLists.txt | 2 +- epan/Makefile.am | 2 +- make-version.pl | 10 +++++----- wiretap/CMakeLists.txt | 2 +- wiretap/Makefile.am | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4f506d179..33b1bd4f42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -180,7 +180,7 @@ include(CMakeInstallDirs) set(GIT_REVISION 0) set(PROJECT_MAJOR_VERSION 1) set(PROJECT_MINOR_VERSION 99) -set(PROJECT_PATCH_VERSION 9) +set(PROJECT_PATCH_VERSION 10) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}") diff --git a/config.nmake b/config.nmake index 4d639bc54c..0233a71db6 100644 --- a/config.nmake +++ b/config.nmake @@ -35,7 +35,7 @@ VCS_REVISION=0 # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=99 -VERSION_MICRO=9 +VERSION_MICRO=10 VERSION_BUILD=$(VCS_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index e2d745b0a9..401983b5d5 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # m4_define([version_major], [1]) m4_define([version_minor], [99]) -m4_define([version_micro], [9]) +m4_define([version_micro], [10]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index b05f02fd56..78ad77a56d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.99.9) unstable; urgency=low +wireshark (1.99.10) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 38eafa4ac5..c651bb91b4 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.99.9 +wireshark-version:\[\]=1.99.10 wireshark-major-minor-version:\[\]=1.99 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 0248824398..a994163d86 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1747,7 +1747,7 @@ add_library(epan ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/libwireshark.rc ) -set(FULL_SO_VERSION "0.0.9") +set(FULL_SO_VERSION "0.0.10") set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") diff --git a/epan/Makefile.am b/epan/Makefile.am index 9b51dc1705..6375382646 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -42,7 +42,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:9:0 @LDFLAGS_SHAREDLIB@ +libwireshark_la_LDFLAGS = -version-info 0:10:0 @LDFLAGS_SHAREDLIB@ include Makefile.common diff --git a/make-version.pl b/make-version.pl index 66609a68fe..a2f4e64f0a 100755 --- a/make-version.pl +++ b/make-version.pl @@ -82,7 +82,7 @@ my $set_release = 0; my %version_pref = ( "version_major" => 1, "version_minor" => 99, - "version_micro" => 9, + "version_micro" => 10, "version_build" => 0, "enable" => 1, @@ -92,12 +92,12 @@ my %version_pref = ( "format" => "git %Y%m%d%H%M%S", # Normal development builds - #"pkg_enable" => 1, - #"pkg_format" => "-%#", + "pkg_enable" => 1, + "pkg_format" => "-%#", # Development releases - "pkg_enable" => 0, - "pkg_format" => "", + #"pkg_enable" => 0, + #"pkg_format" => "", ); my $srcdir = "."; my $info_cmd = ""; diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index 458bd70c7f..22c42860f2 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -110,7 +110,7 @@ add_library(wiretap ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/wiretap.rc ) -set(FULL_SO_VERSION "0.0.9") +set(FULL_SO_VERSION "0.0.10") set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index b82ba2e537..8f5f2e68bd 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:9:0 @LDFLAGS_SHAREDLIB@ +libwiretap_la_LDFLAGS = -version-info 0:10:0 @LDFLAGS_SHAREDLIB@ AM_NON_GENERATED_CFLAGS =-DWS_BUILD_DLL