1.99.9 → 1.99.10.
authorGerald Combs <gerald@wireshark.org>
Wed, 2 Sep 2015 18:27:12 +0000 (11:27 -0700)
committerGerald Combs <gerald@wireshark.org>
Wed, 2 Sep 2015 18:29:10 +0000 (18:29 +0000)
Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d
Reviewed-on: https://code.wireshark.org/review/10363
Reviewed-by: Gerald Combs <gerald@wireshark.org>
CMakeLists.txt
config.nmake
configure.ac
debian/changelog
docbook/asciidoc.conf
epan/CMakeLists.txt
epan/Makefile.am
make-version.pl
wiretap/CMakeLists.txt
wiretap/Makefile.am

index e4f506d179c173b77d191dee5f408e00120350ee..33b1bd4f42a854fc6a30d1dcf980f77f04ed5526 100644 (file)
@@ -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}")
index 4d639bc54c3f8efdf99f606f8d1ff2b442045951..0233a71db6dd8b79b4abac0cfade2d4034b4bb40 100644 (file)
@@ -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
index e2d745b0a98a3e6ec5fa33e1957f70d3295995e0..401983b5d5509cd8d6ee1a55f96e81bf7977f95d 100644 (file)
@@ -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], [])
 
index b05f02fd56918bf724177e70f08d263814cbe226..78ad77a56d9d4af87520aaaec9ac7a42ae3e97d6 100644 (file)
@@ -1,4 +1,4 @@
-wireshark (1.99.9) unstable; urgency=low
+wireshark (1.99.10) unstable; urgency=low
 
   * Self-made package
 
index 38eafa4ac59f11a35f5da40407474fc617239341..c651bb91b4b54bc95725659bc722beb56ab12f7c 100644 (file)
@@ -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
index 02488243988a68428b5678edf02541e06bb25ed9..a994163d86ea1f33e8f247d0abc92cb3526dae07 100644 (file)
@@ -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}")
index 9b51dc1705e4c60f217ab429ba3278c71f1f01a6..6375382646c990b9d48cf6066b66c14e21b08cbc 100644 (file)
@@ -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
 
index 66609a68fed9cabb588facb9381be29e79bf3065..a2f4e64f0abe1c175b2d81bff00cb38184f05c81 100755 (executable)
@@ -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 = "";
index 458bd70c7f75c3c4ddd55b924e19b83051f0e5e5..22c42860f2d4828ab7acd58aba86c4a5e593bb25 100644 (file)
@@ -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"
index b82ba2e537f736590da865dca70dd4ae5fcb9420..8f5f2e68bdaaebd52b535f75168191f6c310d5ae 100644 (file)
@@ -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