[SCM] framework for TANGO control system client applications branch, master, updated. upstream/3.0.0_rc3-44-g9dc61ba

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 9dc61baae8fc3fbc866fbc91e4f2223aafdec18d
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Feb 18 15:40:22 2012 +0100

    fix ftbfs

diff --git a/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch b/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch
new file mode 100644
index 0000000..274ba99
--- /dev/null
+++ b/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 18 Feb 2012 15:39:57 +0100
+Subject: debian fix ftbfs qt4 qapplication
+
+---
+ setup.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1f911e3..ec98755 100644
+--- a/setup.py
++++ b/setup.py
+@@ -254,8 +254,8 @@ class build_resources(Command):
+             self.out = sys.stdout
+         else:
+             self.out = StringIO.StringIO()
+-        import PyQt4.Qt
+-        self.app = PyQt4.Qt.QApplication([])
++        #import PyQt4.Qt
++        #self.app = PyQt4.Qt.QApplication([])
+ 
+     def finalize_options (self):
+         if self.logo is None:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5aa3827
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-debian-fix-ftbfs-qt4-qapplication.patch

-- 
framework for TANGO control system client applications