diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-07-15 00:19:01 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-07-14 22:21:53 +0000 |
| commit | 42e72d529cdbab62d52a26332985ecf28b997a87 (patch) | |
| tree | 867e80c5e6101accd49b601395ea6d9747321caf | |
| parent | af5daa6b5a147f1f62c499248cc70510c59934a6 (diff) | |
| download | wireshark-42e72d529cdbab62d52a26332985ecf28b997a87.tar.gz | |
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>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/asciidoc.conf | 2 | ||||
| -rwxr-xr-x | make-version.pl | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 34fc9382db..968c326032 100644 --- a/CMakeLists.txt +++ b/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}") diff --git a/configure.ac b/configure.ac index f194e94477..cdd0f33573 100644 --- a/configure.ac +++ b/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/) diff --git a/debian/changelog b/debian/changelog index 863a859114..5168bc5ee1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (2.1.1) unstable; urgency=low +wireshark (2.1.2) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 7a9207eb57..ec9a5cf290 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -2,7 +2,7 @@ [attributes] -wireshark-version=2.1.1 +wireshark-version=2.1.2 [replacements] diff --git a/make-version.pl b/make-version.pl index f5c21dd521..a8e6084bea 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" => 1, - "version_micro" => 1, + "version_micro" => 2, "version_build" => 0, "enable" => 1, |