aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2017-08-26 22:32:58 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2017-08-27 07:25:04 +0000
commitfb1acc778d6e71cbeb5f512a8f8fb179b4fdf46e (patch)
tree886e6b850e548ef9fb6ca8762a0f96dcdf195c4a
parenta08e998ca2e7a8229da7f8b292dad94734977f33 (diff)
Update USBPcap to 1.2.0.3
Change-Id: Ie5dbe818e214738ea8e82fe7d72fc8a20b30691b Reviewed-on: https://code.wireshark.org/review/23221 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
-rw-r--r--packaging/nsis/CMakeLists.txt2
-rw-r--r--packaging/nsis/config.nsh.in2
-rw-r--r--packaging/wix/CMakeLists.txt2
-rw-r--r--tools/win-setup.ps18
4 files changed, 7 insertions, 7 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index d5f148f3f3..64bf97100c 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.2.0.2")
+set(USBPCAP_DISPLAY_VERSION "1.2.0.3")
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 ef0df8080a..cbae0be420 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.2.0.2"
+!define USBPCAP_DISPLAY_VERSION "1.2.0.3"
!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 f1390733b3..9efad04503 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.2.0.2")
+set(USBPCAP_DISPLAY_VERSION "1.2.0.3")
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index 4a63a488b5..f6993cd923 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -99,8 +99,8 @@ Param(
# trouble instead of trying to catch exceptions everywhere.
$ErrorActionPreference = "Stop"
-$Win64CurrentTag = "2017-08-23"
-$Win32CurrentTag = "2017-08-23"
+$Win64CurrentTag = "2017-08-26"
+$Win32CurrentTag = "2017-08-26"
# Archive file / subdir.
$Win64Archives = @{
@@ -159,12 +159,12 @@ $Win32Archives = @{
$Win32Files = @(
"WinPcap_4_1_3.exe";
- "USBPcapSetup-1.2.0.2.exe";
+ "USBPcapSetup-1.2.0.3.exe";
)
$Win64Files = @(
"WinPcap_4_1_3.exe";
- "USBPcapSetup-1.2.0.2.exe";
+ "USBPcapSetup-1.2.0.3.exe";
)
$Archives = $Win64Archives;