aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-02-04 17:19:58 -0800
committerGerald Combs <gerald@wireshark.org>2019-02-05 01:21:10 +0000
commit2ed12a238b067633149f40a9cc54d69965691f68 (patch)
tree9c6b1ca97c7477c4ca345d76974bf76fc9583afa
parent7f5c5e4ae7086448037423f61548bb7d9f48278c (diff)
2.9 → 3.1.
Change-Id: Iea6b55037bfb62d2e9b333148cbdc55fcd53dfa2 Reviewed-on: https://code.wireshark.org/review/31888 Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--CMakeLists.txt6
-rw-r--r--debian/changelog2
-rw-r--r--docbook/attributes.asciidoc2
-rw-r--r--docbook/developer-guide-docinfo.xml2
-rw-r--r--docbook/user-guide-docinfo.xml2
5 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cfe7b5265..52e497a802 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,9 @@ project(${_project_name} C CXX)
# Updated by tools/make-version.pl
set(GIT_REVISION 0)
-set(PROJECT_MAJOR_VERSION 2)
-set(PROJECT_MINOR_VERSION 9)
-set(PROJECT_PATCH_VERSION 1)
+set(PROJECT_MAJOR_VERSION 3)
+set(PROJECT_MINOR_VERSION 1)
+set(PROJECT_PATCH_VERSION 0)
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 e80ab85d0a..27fa13e409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wireshark (2.9.1) unstable; urgency=low
+wireshark (3.1.0) unstable; urgency=low
* Self-made package
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc
index 2aed7bea1e..cfd98dab25 100644
--- a/docbook/attributes.asciidoc
+++ b/docbook/attributes.asciidoc
@@ -1,6 +1,6 @@
// Common attributes
-:wireshark-version: 2.9.1
+:wireshark-version: 3.1.0
// Required for btn, kbd:, and menu: macros.
:experimental:
diff --git a/docbook/developer-guide-docinfo.xml b/docbook/developer-guide-docinfo.xml
index 60768aba7f..bb8e3d9ec9 100644
--- a/docbook/developer-guide-docinfo.xml
+++ b/docbook/developer-guide-docinfo.xml
@@ -1,7 +1,7 @@
<!-- Document information for the Developer's Guide. -->
<!-- Updated by tools/make-version.pl -->
-<subtitle>For Wireshark 2.9</subtitle>
+<subtitle>For Wireshark 3.1</subtitle>
<!-- <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title> -->
diff --git a/docbook/user-guide-docinfo.xml b/docbook/user-guide-docinfo.xml
index 14707734c5..1240b3be35 100644
--- a/docbook/user-guide-docinfo.xml
+++ b/docbook/user-guide-docinfo.xml
@@ -1,7 +1,7 @@
<!-- Document information for the User's Guide. -->
<!-- Updated by tools/make-version.pl -->
-<subtitle>For Wireshark 2.9</subtitle>
+<subtitle>For Wireshark 3.1</subtitle>
<!--
<title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title>