From c061522765a5553c25f51792d0dc3ede45e9abe9 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 6 Feb 2018 15:52:09 -0800
Subject: [PATCH] =?UTF-8?q?2.5.0=20=E2=86=92=202.5.1.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I185a3f359acfe5dfd06c0b7f5fff3b6586be1ff9
Reviewed-on: https://code.wireshark.org/review/25647
Reviewed-by: Gerald Combs <gerald@wireshark.org>
---
 CMakeLists.txt              |  2 +-
 configure.ac                |  2 +-
 debian/changelog            |  2 +-
 docbook/attributes.asciidoc |  2 +-
 make-version.pl             | 10 +++++-----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bf72577bb..de949c1fab 100644
--- 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 34fca41127..c7bcc4b2e2 100644
--- 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 90c0a28d04..20acd8f513 100644
--- 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 00a5f7bd38..fb933d01ca 100644
--- 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 d56457f040..8742494000 100755
--- 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 = "";