2.5.0 → 2.5.1.

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

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}")

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))

debian/changelog

@@ -1,4 +1,4 @@
-wireshark (2.5.0) unstable; urgency=low
+wireshark (2.5.1) unstable; urgency=low
 
   * Self-made package
 

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.

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 = "";