diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-12-10 11:15:16 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-12-10 19:17:18 +0000 |
commit | 3f08a858195c2f8a85a9eae44247eb82654ce313 (patch) | |
tree | 95afb64a9a0ffc1b46d18ad3285ad284fbb9309c | |
parent | 4c229ca40dcc0a75b356282e7e9dabd90fa7f1e3 (diff) |
1.99.1 → 1.99.2.
Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98
Reviewed-on: https://code.wireshark.org/review/5705
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | config.nmake | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | docbook/asciidoc.conf | 2 | ||||
-rwxr-xr-x | make-version.pl | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/config.nmake b/config.nmake index 4236cbd2b0..00683fac36 100644 --- a/config.nmake +++ b/config.nmake @@ -35,7 +35,7 @@ GIT_REVISION=0 # Updated by make-version.pl VERSION_MAJOR=1 VERSION_MINOR=99 -VERSION_MICRO=1 +VERSION_MICRO=2 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index b0ed456f76..42c01ec7b3 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # m4_define([version_major], [1]) m4_define([version_minor], [99]) -m4_define([version_micro], [1]) +m4_define([version_micro], [2]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index 7475d1ba9b..f9f42cb83b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.99.1) unstable; urgency=low +wireshark (1.99.2) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 2fa4850804..97c3a9a6c3 100644 --- a/docbook/asciidoc.conf +++ b/docbook/asciidoc.conf @@ -4,7 +4,7 @@ # Yes, these are fake macros. # We should probably replace some or all of them with attributes. -wireshark-version:\[\]=1.99.1 +wireshark-version:\[\]=1.99.2 wireshark-major-minor-version:\[\]=1.99 wireshark-authors-url:\[\]=https://www.wireshark.org/about.html#authors diff --git a/make-version.pl b/make-version.pl index b447268909..e735a6a712 100755 --- a/make-version.pl +++ b/make-version.pl @@ -76,7 +76,7 @@ my $set_release = 0; my %version_pref = ( "version_major" => 1, "version_minor" => 99, - "version_micro" => 1, + "version_micro" => 2, "version_build" => 0, "enable" => 1, @@ -87,12 +87,12 @@ my %version_pref = ( "is_release" => 0, # 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 = ""; |