[SCM] mustang-plug/master: Add Mustang II V2.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d2783e52c0a615dc66fbc72b8e2c1d1e3ad1f3ec
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jul 10 11:25:14 2014 +0100

    Add Mustang II V2.

diff --git a/debian/patches/1002-firmware_mustang_II_v2.patch b/debian/patches/1002-firmware_mustang_II_v2.patch
new file mode 100644
index 0000000..4e75d8d
--- /dev/null
+++ b/debian/patches/1002-firmware_mustang_II_v2.patch
@@ -0,0 +1,35 @@
+Origin: upstream, http://code.piorekf.org/plug/commits/2fb4eca6a29c9
+Description: Add Mustang II V2 VID
+---
+ plug/mustang.cpp |    9 +++++----
+ plug/mustang.h   |    1 +
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+--- mustang-plug.orig/plug/mustang.cpp
++++ mustang-plug/plug/mustang.cpp
+@@ -42,10 +42,11 @@ int Mustang::start_amp(char list[][32],
+         // get handle for the device
+         if((amp_hand = libusb_open_device_with_vid_pid(NULL, USB_VID, OLD_USB_PID)) == NULL)
+             if((amp_hand = libusb_open_device_with_vid_pid(NULL, USB_VID, NEW_USB_PID)) == NULL)
+-            {
+-                libusb_exit(NULL);
+-                return -100;
+-            }
++            	if((amp_hand = libusb_open_device_with_vid_pid(NULL, USB_VID, V2_USB_PID)) == NULL)
++            	{
++				    libusb_exit(NULL);
++				    return -100;
++				}
+ 
+         // detach kernel driver
+         ret = libusb_kernel_driver_active(amp_hand, 0);
+--- mustang-plug.orig/plug/mustang.h
++++ mustang-plug/plug/mustang.h
+@@ -14,6 +14,7 @@
+ #define USB_VID 0x1ed8
+ #define OLD_USB_PID 0x0004  //Mustang I and II
+ #define NEW_USB_PID 0x0005  //Mustang III, IV and V
++#define V2_USB_PID 0x0014   // Mustang II (and I?) V2
+ 
+ // amp's VID and PID while in update mode
+ #define USB_UPDATE_VID 0x1ed8
diff --git a/debian/patches/series b/debian/patches/series
index 6564181..516d4c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 1001-firmware_mustange_III_to_V.patch
+1002-firmware_mustang_II_v2.patch

-- 
mustang-plug packaging