osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Pascal Quantin 2016-07-15 00:19:01 +02:00
parent af5daa6b5a
commit 42e72d529c
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

4
configure.ac
View File

@ -7,9 +7,9 @@
# #
m4_define([version_major], [2]) m4_define([version_major], [2])
m4_define([version_minor], [1]) m4_define([version_minor], [1])
m4_define([version_micro], [1]) m4_define([version_micro], [2])
dnl Updated by make-version.pl 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)) 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/) AC_INIT(Wireshark, [version_major.version_minor.version_micro_extra], http://bugs.wireshark.org/, , http://www.wireshark.org/)

2
debian/changelog vendored
View File

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

2
docbook/asciidoc.conf
View File

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

2
make-version.pl
View File

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