[SCM] midisport-firmware packaging branch, master, updated. debian/1.2-1-16-g5ff9202

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 570808ffdbfbe3dc57d144cd5aff138f9d7c8fb2
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Thu Jul 15 11:19:33 2010 +0200

    Provide patches in the package.
    
    Looks like upstream doesn't have time to release a new version.
    I've contacted them in early April, so it's now time to patch
    locally.

diff --git a/debian/patches/configure.ac.patch b/debian/patches/configure.ac.patch
new file mode 100644
index 0000000..ab6360e
--- /dev/null
+++ b/debian/patches/configure.ac.patch
@@ -0,0 +1,17 @@
+From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+Forwarded: yes (by mail to Clemens Ladisch)
+Description: Support newer udev releases
+ New udev versions have udevinfo renamed to udevadm.
+ configure needs to be adjusted to figure out the
+ available udev version.
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,7 @@ if test ! -x "$FXLOAD"; then
+ fi
+ 
+ AC_MSG_CHECKING([for udev version])
+-udev_ver=`udevinfo -V | awk '{ print $3 }'`
++udev_ver=`udevadm -V`
+ if test -n "$udev_ver"; then
+   AC_MSG_RESULT([$udev_ver])
+ else
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3dc9762
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+udev-rule.patch
+configure.ac.patch
diff --git a/debian/patches/udev-rule.patch b/debian/patches/udev-rule.patch
new file mode 100644
index 0000000..3b857c0
--- /dev/null
+++ b/debian/patches/udev-rule.patch
@@ -0,0 +1,33 @@
+From: Adrian Knoth <adi at drcomp.erfurt.thur.de>
+Forwarded: yes (by mail to Clemens Ladisch)
+Bug-Debian: http://bugs.debian.org/574180
+Description: Fix broken udev rule
+ fxload once used the DEVICE environment variable to determine the
+ target device. However, with usbfs no longer in place, this variable
+ points to the nonexistent file(s) in /proc/bus/usb instead of
+ /dev/bus/usb. The udev rules need to be augmented to pass the right
+ device path to fxload.
+--- a/42-midisport-firmware.rules.in
++++ b/42-midisport-firmware.rules.in
+@@ -4,15 +4,15 @@
+ # (some udev versions don't work with SYSFS{bInterfaceNumber})
+ 
+ # MidiSport 2x2
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1001/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport2x2.ihx"
++ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1001/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport2x2.ihx -D /dev/%P"
+ # MidiSport 1x1
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1010/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport1x1.ihx"
++ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1010/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport1x1.ihx -D /dev/%P"
+ # KeyStation
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1014/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSportKS.ihx"
++ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1014/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSportKS.ihx -D /dev/%P"
+ # MidiSport 4x4
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1020/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport4x4.ihx"
++ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1020/*", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport4x4.ihx -D /dev/%P"
+ # MidiSport 8x8
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/110", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.10.ihx"
+-ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/121", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.21.ihx"
++ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/110", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.10.ihx -D /dev/%P"
++ACTION=="add", SUBSYSTEM=="usb", DEVPATH=="/*.0", ENV{PRODUCT}=="763/1031/121", RUN+="@fxload@ -s @firmwaredir@/MidiSportLoader.ihx -I @firmwaredir@/MidiSport8x8-2.21.ihx -D /dev/%P"
+ 
+ # vim: ft=conf

-- 
midisport-firmware packaging