diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-10-07 12:39:47 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-10-07 19:41:19 +0000 |
| commit | d98debe6d04e3b2a07c8c9a03ad3a4de54ccbc27 (patch) | |
| tree | 54a2da35ca4a77ea193cb3efbae27bd2071f3dba | |
| parent | 9033f137a9e31dc9d8d77c3b1229580d1044604d (diff) | |
1.99.0 → 1.99.1.
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6
Reviewed-on: https://code.wireshark.org/review/4532
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 088aa50aee..7e877fb6d5 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=0 +VERSION_MICRO=1 VERSION_BUILD=$(GIT_REVISION) # Local build information. Recommended: Unique string for your diff --git a/configure.ac b/configure.ac index 294f342a7d..9e82ce0f5e 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], [0]) +m4_define([version_micro], [1]) m4_define([version_micro_extra], version_micro) m4_append([version_micro_extra], []) diff --git a/debian/changelog b/debian/changelog index f6c531b1b4..7475d1ba9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.99.0) unstable; urgency=low +wireshark (1.99.1) unstable; urgency=low * Self-made package diff --git a/docbook/asciidoc.conf b/docbook/asciidoc.conf index 9f93e67dc9..8785940465 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.0 +wireshark-version:\[\]=1.99.1 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 7fdc734875..1b409b9d19 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" => 0, + "version_micro" => 1, "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 = ""; |