[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#693444: unblock: mustang-plug/1.1-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package mustang-plug 1.1-2, it provides just a small fix for
the firmware update of some Mustang models.

As usual, a patch is attached.

Thanks in advance for any reply,
Regards.

unblock mustang-plug/1.1-2

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-33-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for mustang-plug-1.1 mustang-plug-1.1

 changelog                                     |    8 ++++
 mustang-plug.mustang.udev                     |    1 
 patches/1001-firmware_mustange_III_to_V.patch |   52 ++++++++++++++++++++++++++
 patches/series                                |    1 
 4 files changed, 62 insertions(+)

diff -Nru mustang-plug-1.1/debian/changelog mustang-plug-1.1/debian/changelog
--- mustang-plug-1.1/debian/changelog	2012-05-19 18:49:11.000000000 +0100
+++ mustang-plug-1.1/debian/changelog	2012-11-16 14:33:34.000000000 +0000
@@ -1,3 +1,11 @@
+mustang-plug (1.1-2) unstable; urgency=low
+
+  * Fix firmware update for Mustang III, IV and V.
+    Patch taken from upstream VCS.
+  * Also update debian/mustang-plug.mustang.udev.
+
+ -- Alessio Treglia <alessio@debian.org>  Fri, 16 Nov 2012 14:33:29 +0000
+
 mustang-plug (1.1-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru mustang-plug-1.1/debian/mustang-plug.mustang.udev mustang-plug-1.1/debian/mustang-plug.mustang.udev
--- mustang-plug-1.1/debian/mustang-plug.mustang.udev	2012-05-16 23:20:57.000000000 +0100
+++ mustang-plug-1.1/debian/mustang-plug.mustang.udev	2012-11-16 14:33:02.000000000 +0000
@@ -1,3 +1,4 @@
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1ed8", ATTRS{idProduct}=="0004", GROUP="plugdev"
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1ed8", ATTRS{idProduct}=="0005", GROUP="plugdev"
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1ed8", ATTRS{idProduct}=="0006", GROUP="plugdev"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1ed8", ATTRS{idProduct}=="0007", GROUP="plugdev"
diff -Nru mustang-plug-1.1/debian/patches/1001-firmware_mustange_III_to_V.patch mustang-plug-1.1/debian/patches/1001-firmware_mustange_III_to_V.patch
--- mustang-plug-1.1/debian/patches/1001-firmware_mustange_III_to_V.patch	1970-01-01 01:00:00.000000000 +0100
+++ mustang-plug-1.1/debian/patches/1001-firmware_mustange_III_to_V.patch	2012-11-16 14:27:13.000000000 +0000
@@ -0,0 +1,52 @@
+Description: Fix firmware update for Mustang III, IV and V.
+Origin: upstream, https://bitbucket.org/piorekf/plug/changeset/15dba9c8
+---
+ plug/mainwindow.cpp |    2 +-
+ plug/mustang.cpp    |   10 +++++++---
+ plug/mustang.h      |    3 ++-
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
+--- mustang-plug.orig/plug/mainwindow.cpp
++++ mustang-plug/plug/mainwindow.cpp
+@@ -664,7 +664,7 @@ void MainWindow::update_firmware()
+     QString filename;
+     int ret = 0;
+ 
+-    QMessageBox::information(this, "Prepare", "Please power off the amplifier, then power it back on while holding \"Save\" button.<br>After pressing \"OK\" choose firmware file and then update will begin.<br>It will take about one minute. You will be notified when it's finished.");
++    QMessageBox::information(this, "Prepare", "Please power off the amplifier, then power it back on while holding down:<ul><li>The \"Save\" button (Mustang I and II)</li><li>The Data Wheel (Mustang III, IV and IV)</li></ul>After pressing \"OK\" choose firmware file and then update will begin.It will take about one minute. You will be notified when it's finished.");
+ 
+     filename = QFileDialog::getOpenFileName(this, tr("Open..."), QDir::homePath(), tr("Mustang firmware (*.upd)"));
+     if(filename.isEmpty())
+--- mustang-plug.orig/plug/mustang.cpp
++++ mustang-plug/plug/mustang.cpp
+@@ -1286,11 +1286,15 @@ int Mustang::update(char *filename)
+             return ret;
+ 
+         // get handle for the device
+-        amp_hand = libusb_open_device_with_vid_pid(NULL, USB_UPDATE_VID, USB_UPDATE_PID);
++        amp_hand = libusb_open_device_with_vid_pid(NULL, USB_UPDATE_VID, OLD_USB_UPDATE_PID);
+         if(amp_hand == NULL)
+         {
+-            libusb_exit(NULL);
+-            return -100;
++            amp_hand = libusb_open_device_with_vid_pid(NULL, USB_UPDATE_VID, NEW_USB_UPDATE_PID);
++            if(amp_hand == NULL)
++            {
++                libusb_exit(NULL);
++                return -100;
++            }
+         }
+ 
+         // detach kernel driver
+--- mustang-plug.orig/plug/mustang.h
++++ mustang-plug/plug/mustang.h
+@@ -17,7 +17,8 @@
+ 
+ // amp's VID and PID while in update mode
+ #define USB_UPDATE_VID 0x1ed8
+-#define USB_UPDATE_PID 0x0006
++#define OLD_USB_UPDATE_PID 0x0006  //Mustang I and II
++#define NEW_USB_UPDATE_PID 0x0007  //Mustang III, IV, V
+ 
+ // for USB communication
+ #define TMOUT 500
diff -Nru mustang-plug-1.1/debian/patches/series mustang-plug-1.1/debian/patches/series
--- mustang-plug-1.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mustang-plug-1.1/debian/patches/series	2012-11-16 14:21:24.000000000 +0000
@@ -0,0 +1 @@
+1001-firmware_mustange_III_to_V.patch

Reply to: