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

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

The following commit has been merged in the master branch:
commit f550446fd2df449a94ebb19cf3c1f69c28421de8
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Tue Jun 15 21:50:29 2010 +0200

    Python fix for #585990 by Jakub Wilk <jwilk at debian.org>

diff --git a/debian/ffado-mixer-qt4.install b/debian/ffado-mixer-qt4.install
index a14709e..c831c4c 100644
--- a/debian/ffado-mixer-qt4.install
+++ b/debian/ffado-mixer-qt4.install
@@ -1,7 +1,6 @@
 debian/tmp/usr/share/libffado2/python/*
+debian/tmp/usr/share/ffado-mixer-qt4/
 debian/tmp/usr/bin/ffado-mixer
-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/01-python26.patch b/debian/patches/01-python26.patch
deleted file mode 100644
index 5649aec..0000000
--- a/debian/patches/01-python26.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Python modules path is detected wrongly.
- This is an easy workaround to fix FTBFS in maverick.
----
- SConstruct |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- libffado-2.0.0+svn1813.orig/SConstruct
-+++ libffado-2.0.0+svn1813/SConstruct
-@@ -48,7 +48,7 @@ Toggle debug-build. DEBUG means \"-g -Wa
-     PathOption( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathOption.PathAccept ),
-     PathOption( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathOption.PathAccept ),
-     PathOption( "PYPKGDIR", "The directory where the python modules get installed.",
--        distutils.sysconfig.get_python_lib( prefix="$PREFIX" ), PathOption.PathAccept ),
-+        distutils.sysconfig.get_python_lib(), PathOption.PathAccept ),
-     BoolOption( "ENABLE_BEBOB", "Enable/Disable support for the BeBoB platform.", True ),
-     BoolOption( "ENABLE_FIREWORKS", "Enable/Disable support for the ECHO Audio FireWorks platform.", True ),
-     BoolOption( "ENABLE_OXFORD", "Enable/Disable support for the Oxford Semiconductor FW platform.", True ),
diff --git a/debian/patches/02-uifiles_path.patch b/debian/patches/02-uifiles_path.patch
deleted file mode 100644
index b8b4ec6..0000000
--- a/debian/patches/02-uifiles_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
----
- 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
deleted file mode 100644
index aec4eaa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-01-python26.patch
-02-uifiles_path.patch
diff --git a/debian/rules b/debian/rules
index 334d74b..5a04b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ endif
 DEB_SCONS_EXTRA_FLAGS := \
 	PREFIX=/usr \
 	SHAREDIR=/usr/share/libffado2/ \
+	PYPKGDIR=/usr/share/ffado-mixer-qt4/ \
 	WILL_DEAL_WITH_XDG_MYSELF=1 \
 	$(EXPLICIT_TARGET) \
 	$(NJOBS)

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