From 46ef2dabfda873fcad35c57b9de75da598d4b5a3 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Thu, 11 May 2017 21:15:28 +0200 Subject: 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 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- packaging/nsis/CMakeLists.txt | 2 +- packaging/nsis/config.nsh.in | 2 +- packaging/wix/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packaging') diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 19628ef344..71e9fb706c 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 69212541e6..de0b13cbd1 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 49691d3f4b..9baa2e7de4 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}) -- cgit v1.2.1