diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/attributes.asciidoc | 2 | ||||
| -rw-r--r-- | docbook/release-notes.asciidoc | 5 | ||||
| -rwxr-xr-x | make-version.pl | 10 |
5 files changed, 13 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fb8ba98b02..0a26f26b79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ project(Wireshark C CXX) set(GIT_REVISION 0) set(PROJECT_MAJOR_VERSION 2) set(PROJECT_MINOR_VERSION 9) -set(PROJECT_PATCH_VERSION 0) +set(PROJECT_PATCH_VERSION 1) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) set(PROJECT_VERSION_EXTENSION "") set(PROJECT_RELEASE_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}") diff --git a/debian/changelog b/debian/changelog index b6e3f2c99e..e80ab85d0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (2.9.0) unstable; urgency=low +wireshark (2.9.1) unstable; urgency=low * Self-made package diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc index 37ea00451f..4871854ee1 100644 --- a/docbook/attributes.asciidoc +++ b/docbook/attributes.asciidoc @@ -1,6 +1,6 @@ // Common attributes -:wireshark-version: 2.9.0 +:wireshark-version: 2.9.1 // We're migrating from AsciiDoc. :compat-mode: diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index db51095e51..265c240067 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -37,6 +37,11 @@ Dumpcap might not quit if Wireshark or TShark crashes. === New and Updated Features The following features are new (or have been significantly updated) +since version 2.9.0: + +* Nothing yet. + +The following features are new (or have been significantly updated) since version 2.6.0: * The Windows .exe installers now ship with Npcap instead of WinPcap. diff --git a/make-version.pl b/make-version.pl index bb222bb924..54735cd82b 100755 --- a/make-version.pl +++ b/make-version.pl @@ -73,7 +73,7 @@ my $set_release = 0; my %version_pref = ( "version_major" => 2, "version_minor" => 9, - "version_micro" => 0, + "version_micro" => 1, "version_build" => 0, "enable" => 1, @@ -84,12 +84,12 @@ my %version_pref = ( "format" => "git %Y%m%d%H%M%S", # 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 = ""; |