More 2.1.1 → 2.1.2 changes

Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4
Reviewed-on: https://code.wireshark.org/review/16441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

CMakeLists.txt

@@ -178,9 +178,9 @@ include(CMakeInstallDirs)
 set(GIT_REVISION 0)
 set(PROJECT_MAJOR_VERSION 2)
 set(PROJECT_MINOR_VERSION 1)
-set(PROJECT_PATCH_VERSION 1)
+set(PROJECT_PATCH_VERSION 2)
 set(PROJECT_BUILD_VERSION ${GIT_REVISION})
-set(PROJECT_VERSION_EXTENSION "")
+set(PROJECT_VERSION_EXTENSION "-git")
 
 if(DEFINED ENV{WIRESHARK_VERSION_EXTRA})
 	set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")

configure.ac

@@ -7,9 +7,9 @@
 #
 m4_define([version_major], [2])
 m4_define([version_minor], [1])
-m4_define([version_micro], [1])
+m4_define([version_micro], [2])
 dnl Updated by make-version.pl
-m4_define([version_extra], [])
+m4_define([version_extra], [-git])
 m4_define([version_micro_extra], m4_join([], version_micro, version_extra))
 
 AC_INIT(Wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/)

debian/changelog

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

docbook/asciidoc.conf

@@ -2,7 +2,7 @@
 
 [attributes]
 
-wireshark-version=2.1.1
+wireshark-version=2.1.2
 
 [replacements]
 

make-version.pl

@@ -85,7 +85,7 @@ my $set_release = 0;
 my %version_pref = (
 	"version_major" => 2,
 	"version_minor" => 1,
-	"version_micro" => 1,
+	"version_micro" => 2,
 	"version_build" => 0,
 
 	"enable"        => 1,