Fri Sep 21 00:28:30 PDT 2012

9 files changed, 367 insertions, 67 deletions

diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD
index 4e383731b..616472e31 100644
--- a/extra/fluidsynth/PKGBUILD
+++ b/extra/fluidsynth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 151334 2012-02-25 14:36:41Z pierre $
+# $Id: PKGBUILD 166870 2012-09-20 10:08:01Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=fluidsynth
-pkgver=1.1.5
-pkgrel=2
+pkgver=1.1.6
+pkgrel=1
 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
 arch=('i686' 'x86_64')
 url="http://www.fluidsynth.org/"
@@ -13,12 +13,15 @@ makedepends=('cmake' 'ladspa' 'doxygen')
 optdepends=('pulseaudio: PulseAudio sound support')
 license=('LGPL')
 backup=('etc/conf.d/fluidsynth')
+install=$pkgname.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'fluidsynth.conf'
-        'fluidsynthd')
-md5sums=('657e49e682b316432a4421dbb0313c3e'
-         '16c5f4d4cbdddc6c5fcbd4fd4cc142f1'
-         'b296dbfb524c2164f552f68bd9abe2ec')
+        'fluidsynth.rc'
+        'fluidsynth.systemd')
+md5sums=('ae5aca6de824b4173667cbd3a310b263'
+         '7d0ab0d75d4e87652f4cb7ffeac8a82b'
+         'b296dbfb524c2164f552f68bd9abe2ec'
+         'e0406748a154409907df62292be32e8a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -38,8 +41,11 @@ package() {
   install -Dm644 "$srcdir/fluidsynth.conf" \
     "$pkgdir/etc/conf.d/fluidsynth"
 
-  install -Dm755 "$srcdir/fluidsynthd" \
+  install -Dm755 "$srcdir/fluidsynth.rc" \
     "$pkgdir/etc/rc.d/fluidsynth"
+
+  install -Dm644 "$srcdir/fluidsynth.systemd" \
+    "$pkgdir/usr/lib/systemd/system/fluidsynth.service"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/fluidsynth/fluidsynth.conf b/extra/fluidsynth/fluidsynth.conf
index 5267d5835..b8465fa2e 100644
--- a/extra/fluidsynth/fluidsynth.conf
+++ b/extra/fluidsynth/fluidsynth.conf
@@ -1,2 +1,2 @@
 FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000"
-FSYNTH_SOUNDFONT=""
\ No newline at end of file
+FSYNTH_SOUNDFONT="" # path to your soundfont
diff --git a/extra/fluidsynth/fluidsynth.install b/extra/fluidsynth/fluidsynth.install
new file mode 100644
index 000000000..86e05f892
--- /dev/null
+++ b/extra/fluidsynth/fluidsynth.install
@@ -0,0 +1,19 @@
+post_install() {
+	echo
+	echo "  > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth"
+	echo
+	echo "  > Systemd users need to copy the service file from:"
+	echo "      /usr/lib/systemd/system/fluidsynth.service"
+	echo "  > to:"
+	echo "      /etc/systemd/system/multi-user.target.wants/"
+	echo "  > and then edit accordingly."
+	echo
+	echo "  > PulseAudio output when running as a daemon"
+	echo "  > is known to be problematic. See:"
+	echo "      https://bbs.archlinux.org/viewtopic.php?id=135092"
+	echo
+}
+
+post_upgrade() {
+	post_install
+}
diff --git a/extra/fluidsynth/fluidsynth.rc b/extra/fluidsynth/fluidsynth.rc
new file mode 100644
index 000000000..ca1e8fa6e
--- /dev/null
+++ b/extra/fluidsynth/fluidsynth.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth
+
+PID=`pidof -o %PPID /usr/bin/fluidsynth`
+case "$1" in
+   start)
+     stat_busy "Starting Fluidsynth soundfont synthesizer"
+     [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 &
+     if [ $? -gt 0 ]; then
+       stat_fail
+     else
+       echo $PID > /var/run/fluidsynth.pid
+       add_daemon fluidsynth
+       stat_done
+     fi
+     ;;
+   stop)
+     stat_busy "Stopping Fluidsynth soundfont synthesizer"
+     [ ! -z "$PID" ]  && kill $PID &> /dev/null 2>&1
+     if [ $? -gt 0 ]; then
+       stat_fail
+     else
+       rm /var/run/fluidsynth.pid
+       rm_daemon fluidsynth
+       stat_done
+     fi
+     ;;
+   restart)
+     $0 stop
+     sleep 1
+     $0 start
+     ;;
+   *)
+     echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
diff --git a/extra/fluidsynth/fluidsynth.systemd b/extra/fluidsynth/fluidsynth.systemd
new file mode 100644
index 000000000..06784fe05
--- /dev/null
+++ b/extra/fluidsynth/fluidsynth.systemd
@@ -0,0 +1,9 @@
+[Unit]
+Description=FluidSynth Daemon
+After=sound.target
+
+[Service]
+ExecStart=/usr/bin/fluidsynth -is -a alsa -m alsa_seq -r 48000 # append soundfont path here
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 738fdd14b..dd4088bde 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 165509 2012-08-21 14:11:50Z dan $
+# $Id: PKGBUILD 166873 2012-09-20 13:16:25Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.7.12
+pkgver=1.7.12.1
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -109,8 +109,8 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('ceb1a6b17a3e33bbc70eadf8fce5876c'
-         '0070ad185cfc29da545abe35ba8862e7'
+md5sums=('1c16e94ca43c2811806567ed6e73d704'
+         'efaef000a05938971606fad472a1b9f0'
          '8e2648910fd5dd4f1c41d3c7fa9e9156'
          '2e42bf97779a1c6411d89043334c9e78'
          '042524f942785772d7bd52a1f02fe5ae'
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 1eff95fe7..4a952f56c 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 161318 2012-06-09 06:49:32Z tpowa $
+# $Id: PKGBUILD 166869 2012-09-20 09:33:33Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
-pkgver=6.0.5
-pkgrel=6
+pkgver=6.0.6
+pkgrel=1
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -17,25 +17,12 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz
         hylafax 
         hylafax.cron.daily 
         config.local
-        configure-6.0.5.patch 
-        hylafax-libtiff4.patch
         faxq.service
         hfaxd.service)
-md5sums=('eb9ac942354ad708e20e4583cec6615f'
-         '6602288a405324d8c8e3c5eac2bf19fd'
-         '52beffe7dc296b4f9ce9fd0387f7804e'
-         '60f2a7e62c256ead4e9238cb31b35b90'
-         '51d9f639bb76e5e39cdc8e2ac07e208d'
-         '3d239c186f24720e945508d349b069b1'
-         '832c8e8098e2dfa56040c975b554590c'
-         '38a00db6d9d765d130b2d8d3a98e5c24')
 
-build() {
+build () {
   cd "$srcdir/${pkgname}-${pkgver}"
   cp ../config.local .
-  # fix compiling
-  patch -Np0 -i ../configure-6.0.5.patch
-  patch -Np1 -i ../hylafax-libtiff4.patch
   ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}"
   make
 }
@@ -58,3 +45,9 @@ package () {
 
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
+md5sums=('d063d45049c8fcbabefe09d662313067'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '60f2a7e62c256ead4e9238cb31b35b90'
+         '832c8e8098e2dfa56040c975b554590c'
+         '38a00db6d9d765d130b2d8d3a98e5c24')
diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD
index 772ebec46..a3ebc3d37 100644
--- a/extra/libffado/PKGBUILD
+++ b/extra/libffado/PKGBUILD
@@ -1,49 +1,46 @@
-# $Id: PKGBUILD 157813 2012-04-30 03:19:10Z heftig $
+# $Id: PKGBUILD 166872 2012-09-20 10:13:42Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: galiyosha@gmail.com
 # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
 
 pkgname=libffado
-pkgver=2.0.1
-pkgrel=7
+pkgver=2.1.0
+pkgrel=1
 pkgdesc="Driver for FireWire audio devices"
 arch=('i686' 'x86_64')
 url="http://www.ffado.org/"
 license=('GPL')
-depends=('libiec61883' 'libavc1394' 'libsigc++'
-         'libxml++' 'alsa-lib' 'dbus')
-makedepends=('scons' 'python2-pyqt')
+depends=('libiec61883' 'libavc1394' 'dbus-c++'
+         'libxml++' 'alsa-lib' 'libsigc++' 'libconfig')
+makedepends=('scons' 'subversion' 'python2-pyqt')
 optdepends=('python2: ffado-diag'
             'python2-pyqt: mixer applet')
 provides=('ffado')
-source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz"
-        "libffado-gcc47.patch" "fix-segfault-on-close.patch" '60-ffado.rules')
-md5sums=('786f31facd417e6207e429f50af0e15e'
-         '287bb3f506e31626c4b8f91f0e1d9407'
-         'ac9763cb2dc2f3eb4e1894e30645c6f1'
-         'f03a3e950801c4405b8934084651bca8')
+source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
+        'python2-qt.patch')
+md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
+         '10aa837f5521da213caa93e1ddc58c0e')
+
+_scons-conf() {
+  scons DEBUG=False \
+        PREFIX=/usr \
+        MANDIR=/usr/share/man \
+        UDEVDIR=/usr/lib/udev/rules.d \
+        COMPILE_FLAGS="$CFLAGS" $@
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 -i "$srcdir"/libffado-gcc47.patch
-  patch -p3 -i "$srcdir"/fix-segfault-on-close.patch
-
-  # hack to use CFLAGS without optimising
-  sed -i 's/-O2//g' SConstruct
+  # python2 fix
+  patch -Np1 -i "$srcdir/python2-qt.patch"
 
-  if [ "$CARCH" = "x86_64" ]; then
-    sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct
+  # build!
+  if [ "$CARCH" = 'x86_64' ]; then
+    _scons-conf ENABLE_OPTIMIZATIONS=True
   else
-    sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct
+    _scons-conf
   fi
-
-  # python2 fix
-  sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct
-  sed -i 's:python support/tools:python2 support/tools:' \
-    support/tools/SConscript
-
-  scons PREFIX=/usr
 }
 
 package() {
@@ -51,16 +48,6 @@ package() {
 
   scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install
 
-  # add audio device rules
-  # see https://bugs.archlinux.org/task/26342
-  install -Dm644 "$srcdir/60-ffado.rules" \
-    "$pkgdir/usr/lib/udev/rules.d/60-ffado.rules"
-
-  # python2 fix
-  for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i"
-  done
-
   # desktop files & icons
   install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
     "$pkgdir/usr/share/applications/ffadomixer.desktop"
diff --git a/extra/libffado/python2-qt.patch b/extra/libffado/python2-qt.patch
new file mode 100644
index 000000000..042aa2665
--- /dev/null
+++ b/extra/libffado/python2-qt.patch
@@ -0,0 +1,246 @@
+diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct
+--- libffado-2.1.0.orig/SConstruct	2012-09-19 14:18:53.827448582 +0800
++++ libffado-2.1.0/SConstruct	2012-09-19 14:20:01.670414379 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/python
++#!/usr/bin/python2
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007, 2008, 2010 Arnold Krille
+@@ -134,7 +134,7 @@
+ 
+ def CheckForPyModule( context, module ):
+     context.Message( "Checking for the python module '" + module + "' " )
+-    ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
++    ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" )
+     context.Result( ret[0] )
+     return ret[0]
+ 
+@@ -351,7 +351,7 @@
+ 
+ # PyQT checks
+ build_mixer = False
+-if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
++if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
+     env['PYUIC4'] = True
+     build_mixer = True
+ 
+diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py
+--- libffado-2.1.0.orig/admin/dbus.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/dbus.py	2012-09-19 14:19:02.957399122 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py
+--- libffado-2.1.0.orig/admin/doxygen.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/doxygen.py	2012-09-19 14:19:02.957399122 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py
+--- libffado-2.1.0.orig/admin/pkgconfig.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/pkgconfig.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py
+--- libffado-2.1.0.orig/admin/pyuic.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/pyuic.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py
+--- libffado-2.1.0.orig/admin/pyuic4.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/pyuic4.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+@@ -21,10 +21,8 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-import imp
+-
+ def pyuic4_action( target, source, env ):
+-	env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
++	env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
+ 	return 0
+ 
+ def pyuic4_string( target, source, env ):
+@@ -34,7 +32,7 @@
+ 	context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " )
+ 	ret = True
+ 	try:
+-		imp.find_module( "pyqtconfig" )
++		import PyQt4.pyqtconfig
+ 	except ImportError:
+ 		ret = False
+ 	context.Result( ret )
+diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py
+--- libffado-2.1.0.orig/admin/scanreplace.py	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/admin/scanreplace.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ #
+diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript
+--- libffado-2.1.0.orig/doc/SConscript	2012-09-19 14:18:53.857448419 +0800
++++ libffado-2.1.0/doc/SConscript	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python2
+ 
+ Import( 'env' )
+ 
+diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript
+--- libffado-2.1.0.orig/support/dbus/SConscript	2012-09-19 14:18:53.827448582 +0800
++++ libffado-2.1.0/support/dbus/SConscript	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/bin/env python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007,2008,2011 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript
+--- libffado-2.1.0.orig/support/mixer-qt4/SConscript	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/mixer-qt4/SConscript	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2009 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py
+--- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2008 by Pieter Palmers
+ #               2007-2009 by Arnold Krille
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in
+--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2009 by Pieter Palmers
+ #               2007-2009 by Arnold Krille
+diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in
+--- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:18:53.834115214 +0800
++++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2008 by Pieter Palmers
+ #               2007-2009 by Arnold Krille
+diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript
+--- libffado-2.1.0.orig/support/tools/SConscript	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/SConscript	2012-09-19 14:20:51.970141882 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2007-2008 Arnold Krille
+ # Copyright (C) 2007-2008 Pieter Palmers
+@@ -43,7 +43,7 @@
+ # For the installation of the stuff
+ e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e )
+ 
+-e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" )
++e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" )
+ 
+ e.ScanReplace( "ffado-diag.in" )
+ 
+diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static
+--- libffado-2.1.0.orig/support/tools/ffado-diag-static	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/ffado-diag-static	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ 
+ #
+@@ -74,7 +74,7 @@
+     # check libraries
+     print "   gcc ............... %s" % get_version_first_line('gcc --version')
+     print "   g++ ............... %s" % get_version_first_line('g++ --version')
+-    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
++    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
+     print "   jackd ............. %s" % get_version_first_line('jackd --version')
+     print "     path ............ %s" % get_command_path('jackd')
+     print "     flags ........... %s" % get_package_flags("jack")
+diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in
+--- libffado-2.1.0.orig/support/tools/ffado-diag.in	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/ffado-diag.in	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ 
+ #
+@@ -120,7 +120,7 @@
+     print " Prerequisites (dynamic at run-time)..."
+     print "   gcc ............... %s" % get_version_first_line('gcc --version')
+     print "   g++ ............... %s" % get_version_first_line('g++ --version')
+-    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
++    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
+     print "   jackd ............. %s" % get_version_first_line('jackd --version')
+     print "     path ............ %s" % get_command_path('jackd')
+     print "     flags ........... %s" % get_package_flags("jack")
+diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py
+--- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/ffado-sandbox-install.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ 
+ #
+diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py
+--- libffado-2.1.0.orig/support/tools/listirqinfo.py	2012-09-19 14:18:53.830781898 +0800
++++ libffado-2.1.0/support/tools/listirqinfo.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ 
+ #
+diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py
+--- libffado-2.1.0.orig/tests/dbus_test.py	2012-09-19 14:18:53.837448529 +0800
++++ libffado-2.1.0/tests/dbus_test.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2007 by Pieter Palmers
+ #               2007-2008 by Arnold Krille
+diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py
+--- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py	2012-09-19 14:18:53.837448529 +0800
++++ libffado-2.1.0/tests/python/test-eap-ctrl.py	2012-09-19 14:19:02.957399123 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Copyright (C) 2005-2009 by Pieter Palmers
+ #