More 2.1.1 → 2.1.2 changes
authorPascal Quantin <pascal.quantin@gmail.com>
Thu, 14 Jul 2016 22:19:01 +0000 (00:19 +0200)
committerPascal Quantin <pascal.quantin@gmail.com>
Thu, 14 Jul 2016 22:21:53 +0000 (22:21 +0000)
Change-Id: If1a7f1232bbb23b27063d4ef618c2059293ff0c4
Reviewed-on: https://code.wireshark.org/review/16441
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
CMakeLists.txt
configure.ac
debian/changelog
docbook/asciidoc.conf
make-version.pl

index 34fc9382dbd34ab6b57fca9d36adfb21646500d2..968c326032ee76e3d6bd0aae7afbec6b7fc6bd74 100644 (file)
@@ -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}")
index f194e9447744b892ce2e3e8148fa5b89780e0385..cdd0f3357374bed94fb7636ab82c6022913b2708 100644 (file)
@@ -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/)
index 863a8591144396220225a354162c009cefdfc4bb..5168bc5ee1bc817ea19db0c57f11d0ac6e2af9e8 100644 (file)
@@ -1,4 +1,4 @@
-wireshark (2.1.1) unstable; urgency=low
+wireshark (2.1.2) unstable; urgency=low
 
   * Self-made package
 
index 7a9207eb5740b236c5b5d7a06dd98fdc89de66dc..ec9a5cf2908d85f7cd424f357c56d8832b8c3c77 100644 (file)
@@ -2,7 +2,7 @@
 
 [attributes]
 
-wireshark-version=2.1.1
+wireshark-version=2.1.2
 
 [replacements]
 
index f5c21dd521aa97f269026e9845b30bd65fce3ef9..a8e6084bea13259224f0e7559711602e7d8416c2 100755 (executable)
@@ -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,