aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2020-09-15 16:46:17 -0700
committerGerald Combs <gerald@wireshark.org>2020-09-15 17:29:32 -0700
commit573894d870b466d475009959412f25dfa68c67bb (patch)
treed6d524f3eda1ab446f4ee8937420ecea48077563
parent53ebca9b34a032cfa25d353598a438c750302780 (diff)
downloadwireshark-573894d870b466d475009959412f25dfa68c67bb.tar.gz
wireshark-573894d870b466d475009959412f25dfa68c67bb.tar.bz2
wireshark-573894d870b466d475009959412f25dfa68c67bb.zip
Version: 3.3.0 → 3.3.1.v3.3.1rc0
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog2
-rw-r--r--debian/libwireshark0.symbols1
-rw-r--r--docbook/attributes.adoc2
-rw-r--r--docbook/release-notes.adoc4
5 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f5d342f46..da1c19c070 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ project(${_project_name} C CXX)
set(GIT_REVISION 0)
set(PROJECT_MAJOR_VERSION 3)
set(PROJECT_MINOR_VERSION 3)
-set(PROJECT_PATCH_VERSION 0)
+set(PROJECT_PATCH_VERSION 1)
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
set(PROJECT_VERSION_EXTENSION "")
diff --git a/debian/changelog b/debian/changelog
index 6c206ec941..cb141b2378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (3.3.0) unstable; urgency=low
+wireshark (3.3.1) unstable; urgency=low
* Self-made package
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 2665dcbaba..097cbcbec7 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -245,7 +245,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
decode_as_default_reset@Base 1.12.0~rc1
decode_as_list@Base 1.12.0~rc1
decode_bits_in_field@Base 1.9.1
- decode_bits_in_field_long@Base 3.3.0
decode_build_reset_list@Base 2.3.0
decode_cleanup@Base 3.3.0
decode_clear_all@Base 2.3.0
diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc
index cb94f1dcfc..9a04c89d24 100644
--- a/docbook/attributes.adoc
+++ b/docbook/attributes.adoc
@@ -1,6 +1,6 @@
// Common attributes
-:wireshark-version: 3.3.0
+:wireshark-version: 3.3.1
// Required for btn, kbd:, and menu: macros.
:experimental:
diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc
index 61ca81c5a2..3ca9b9a238 100644
--- a/docbook/release-notes.adoc
+++ b/docbook/release-notes.adoc
@@ -29,6 +29,10 @@ See the “New and Updated Features” section below for more details.
=== New and Updated Features
+The following features are new (or have been significantly updated) since version 3.3.0:
+
+* Nothing of note.
+
The following features are new (or have been significantly updated) since version 3.2.0:
* Windows executables and installers are now https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-signing-support-requirement-for-windows-and-wsus[signed using SHA-2 only].