aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2017-05-11 21:15:28 +0200
committerMichael Mann <mmann78@netscape.net>2017-05-12 03:07:31 +0000
commit46ef2dabfda873fcad35c57b9de75da598d4b5a3 (patch)
tree44eeb40c85b124a1ed5654ad2313f5a2ad37d57e /packaging
parentd2e7e0b5196b166d96c4eaa154d2a06e71dcee1f (diff)
Windows: update LZ4 to 1.7.5 and USBPcap to 1.2.0.1
Change-Id: I02eb4c255a0794b650f566abdadcac16e97196af Reviewed-on: https://code.wireshark.org/review/21609 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/CMakeLists.txt2
-rw-r--r--packaging/nsis/config.nsh.in2
-rw-r--r--packaging/wix/CMakeLists.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 19628ef..71e9fb7 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -66,7 +66,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION})
string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}")
-set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5")
+set(USBPCAP_DISPLAY_VERSION "1.2.0.1")
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in
index 6921254..de0b13c 100644
--- a/packaging/nsis/config.nsh.in
+++ b/packaging/nsis/config.nsh.in
@@ -14,7 +14,7 @@
!define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@"
!define WINPCAP_PACKAGE_VERSION @WINPCAP_PACKAGE_VERSION@
!define PCAP_DISPLAY_VERSION @PCAP_DISPLAY_VERSION@
-!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5"
+!define USBPCAP_DISPLAY_VERSION "1.2.0.1"
!define VERSION @VERSION@
!define VERSION_MAJOR @VERSION_MAJOR@
!define VERSION_MINOR @VERSION_MINOR@
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 49691d3..9baa2e7 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -90,7 +90,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION})
string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}")
-set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5")
+set(USBPCAP_DISPLAY_VERSION "1.2.0.1")
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})