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

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

The following commit has been merged in the master branch:
commit 248f828f92c3733eb0c5f03a4bfaa74b3e11e020
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Wed Apr 25 07:39:33 2012 +0200

    fix compilation

diff --git a/debian/patches/0001-fix-compilation.patch b/debian/patches/0001-fix-compilation.patch
new file mode 100644
index 0000000..8314099
--- /dev/null
+++ b/debian/patches/0001-fix-compilation.patch
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Wed, 25 Apr 2012 07:39:12 +0200
+Subject: fix compilation
+
+---
+ setup.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 676d34f..4129405 100644
+--- a/setup.py
++++ b/setup.py
+@@ -699,8 +699,8 @@ if sphinx:
+         
+         def run(self):
+             import PyQt4.Qt
+-            if PyQt4.Qt.qApp.instance() is None:
+-                self.app = PyQt4.Qt.QApplication([])
++            #if PyQt4.Qt.qApp.instance() is None:
++            #    self.app = PyQt4.Qt.QApplication([])
+             
+             try:
+                 return self.doit()
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f672ff
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-compilation.patch

-- 
framework for TANGO control system client applications