[SCM] Free Firewire Audio Drivers (ffado.org) packaging branch, master, updated. debian/2.0.0+svn1813-1-20-ge631fb1

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

The following commit has been merged in the master branch:
commit e631fb1955dae44e8ff6e5783efe1192a52d97f9
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Jun 15 16:07:11 2010 +0200

    New python patch by Alessio Treglia.

diff --git a/debian/ffado-mixer-qt4.dirs b/debian/ffado-mixer-qt4.dirs
new file mode 100644
index 0000000..d738110
--- /dev/null
+++ b/debian/ffado-mixer-qt4.dirs
@@ -0,0 +1 @@
+usr/share/ffado-mixer-qt4/ffado/mixer
diff --git a/debian/ffado-mixer-qt4.install b/debian/ffado-mixer-qt4.install
index 401d92c..a14709e 100644
--- a/debian/ffado-mixer-qt4.install
+++ b/debian/ffado-mixer-qt4.install
@@ -1,4 +1,7 @@
 debian/tmp/usr/share/libffado2/python/*
 debian/tmp/usr/bin/ffado-mixer
-debian/tmp/usr/lib/python*
+debian/tmp/usr/lib/python*/*-packages/ffado/*.py
+debian/tmp/usr/lib/python*/*-packages/ffado/mixer/*.py
+support/mixer-qt4/ffado/*.ui usr/share/ffado-mixer-qt4/ffado
+support/mixer-qt4/ffado/mixer/*.ui usr/share/ffado-mixer-qt4/ffado/mixer
 support/xdg/ffado.org-ffadomixer.desktop usr/share/applications/
diff --git a/debian/patches/02-uifiles_path.patch b/debian/patches/02-uifiles_path.patch
new file mode 100644
index 0000000..b8b4ec6
--- /dev/null
+++ b/debian/patches/02-uifiles_path.patch
@@ -0,0 +1,15 @@
+---
+ support/mixer-qt4/ffado/config.py.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- libffado-2.0.0+svn1813.orig/support/mixer-qt4/ffado/config.py.in
++++ libffado-2.0.0+svn1813/support/mixer-qt4/ffado/config.py.in
+@@ -24,6 +24,8 @@ if os.path.exists('support/mixer-qt4/ffa
+     UIDIR = "support/mixer-qt4"
+ if os.path.exists('ffado/mixer/globalmixer.ui'):
+     UIDIR = "."
++if os.path.exists('/usr/share/ffado-mixer-qt4/ffado/mixer/globalmixer.ui'):
++    UIDIR = "/usr/share/ffado-mixer-qt4"
+ 
+ import os.path
+ from PyQt4 import uic
diff --git a/debian/patches/series b/debian/patches/series
index 1e9634d..aec4eaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-python26.patch
+02-uifiles_path.patch

-- 
Free Firewire Audio Drivers (ffado.org) packaging