2.5.0 → 2.5.1.

Change-Id: I185a3f359acfe5dfd06c0b7f5fff3b6586be1ff9
Reviewed-on: https://code.wireshark.org/review/25647
Reviewed-by: Gerald Combs <gerald@wireshark.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bf72577bb289b22b378a75eadb343792912e77e..de949c1fabefb7a07ef3866064801c9693c5c3f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ project(Wireshark C CXX)
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 2)
 set(PROJECT_MINOR_VERSION 5)
-set(PROJECT_PATCH_VERSION 0)
+set(PROJECT_PATCH_VERSION 1)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
 set(PROJECT_VERSION_EXTENSION "")
 set(PROJECT_RELEASE_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}")

diff --git a/configure.ac b/configure.ac
index 34fca411273ae0df07c5948375892c93d96eca7b..c7bcc4b2e274cae615c1f717afab95e3b2e91b90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@
 #
 m4_define([version_major], [2])
 m4_define([version_minor], [5])
-m4_define([version_micro], [0])
+m4_define([version_micro], [1])
 dnl Updated by make-version.pl
 m4_define([version_extra], [])
 m4_define([version_micro_extra], m4_join([], version_micro, version_extra))

diff --git a/debian/changelog b/debian/changelog
index 90c0a28d04549098c90abefa0f830da67dae974a..20acd8f513a8b75f5359a0edc5c10336975eddfc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.5.0) unstable; urgency=low
+wireshark (2.5.1) unstable; urgency=low
 
   * Self-made package
 

diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc
index 00a5f7bd385a4895f73004a82fd3bf07511f907c..fb933d01ca1cde02a38366c6d9eed409ab887353 100644 (file)
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.asciidoc
@@ -1,6 +1,6 @@
 // Common attributes
 
-:wireshark-version: 2.5.0
+:wireshark-version: 2.5.1
 // We're migrating from AsciiDoc.
 :compat-mode:
 // Required for btn, kbd:, and menu: macros.

diff --git a/make-version.pl b/make-version.pl
index d56457f040bf6888c425652216037a8e94cdd045..87424940006244faf8a928067f9d76c5e58dbe81 100755 (executable)
--- a/make-version.pl
+++ b/make-version.pl
@@ -85,7 +85,7 @@ my $set_release = 0;
 my %version_pref = (
        "version_major" => 2,
        "version_minor" => 5,
-       "version_micro" => 0,
+       "version_micro" => 1,
        "version_build" => 0,
 
        "enable"        => 1,
@@ -95,12 +95,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 = "";