summaryrefslogtreecommitdiff
path: root/docbook/wsdg_src
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2016-07-27 15:31:06 -0700
committerJoão Valverde <j@v6e.pt>2016-07-29 10:55:34 +0000
commitf5dff39232f98db9b9d60bf05a64eab98868aa59 (patch)
tree1896f4194ac453ffcff632f7210347ba8906e91f /docbook/wsdg_src
parente727ecf5e302c9f765d0038b234e6775fb4ca45b (diff)
downloadwireshark-f5dff39232f98db9b9d60bf05a64eab98868aa59.tar.gz
Use xz to compress the source tarball.
Compress the source tarball using xz instead of bzip2. Other open source projects (including many of our dependencies) have been using xz for a while so hopefully this won't be too much of a shock. Remove the patch-bzip2 Autotools target while we're here. Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d Reviewed-on: https://code.wireshark.org/review/16735 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'docbook/wsdg_src')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_sources.asciidoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 5d3676759f..a0bd342009 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -338,7 +338,7 @@ There are several ways to download the Wireshark source code (as
described in <<ChSrcObtain>>), but bringing the changes from the
official sources into your personal source tree is identical.
-First of all, you will download the new `.tar.bz2` file of the official
+First of all, you will download the new `.tar.xz` file of the official
sources the way you did it the first time.
If you haven't changed anything in the sources, you could simply throw
@@ -349,7 +349,7 @@ remember later that you really did change something before.
If you have changed your source tree, you have to merge the official
changes since the last update into your source tree. You will install
-the content of the `.tar.bz2` file into a new directory and use a good
+the content of the `.tar.xz` file into a new directory and use a good
merge tool (e.g. http://winmerge.sourceforge.net/[]for Win32) to bring
your personal source tree in sync with the official sources again.