[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 3f2a5ff9dfc1bf18a45d9ff00d3cdc86d6f80492
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Apr 21 09:51:53 2012 +0200

    add the tango-icons

diff --git a/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch b/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch
index 274ba99..af9fedf 100644
--- a/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch
+++ b/debian/patches/0001-debian-fix-ftbfs-qt4-qapplication.patch
@@ -4,13 +4,13 @@ Subject: debian fix ftbfs qt4 qapplication
 
 ---
  setup.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 1f911e3..ec98755 100644
+index 39a7be8..6638cb5 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -254,8 +254,8 @@ class build_resources(Command):
+@@ -255,8 +255,8 @@ class build_resources(Command):
              self.out = sys.stdout
          else:
              self.out = StringIO.StringIO()
diff --git a/debian/patches/0002-fix-tango-icons-installation.patch b/debian/patches/0002-fix-tango-icons-installation.patch
new file mode 100644
index 0000000..53e9755
--- /dev/null
+++ b/debian/patches/0002-fix-tango-icons-installation.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 21 Apr 2012 09:51:12 +0200
+Subject: fix tango-icons installation
+
+---
+ setup.py |   18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 6638cb5..01c7866 100644
+--- a/setup.py
++++ b/setup.py
+@@ -171,15 +171,15 @@ requires = [
+ 
+ def get_resource_package_data():
+     data = ['*.rcc']
+-#    tango_icons_dir = abspath('lib', 'taurus', 'qt', 'qtgui', 'resource',
+-#                              'tango-icons')
+-#    for tango_icon_item in os.listdir(tango_icons_dir):
+-#        if tango_icon_item.startswith("."):
+-#            continue
+-#        abs_item = os.path.join(tango_icons_dir, tango_icon_item)
+-#        if not os.path.isdir(abs_item):
+-#            continue
+-#        data.append('tango-icons/%s/*' % tango_icon_item)
++    tango_icons_dir = abspath('lib', 'taurus', 'qt', 'qtgui', 'resource',
++                              'tango-icons')
++    for tango_icon_item in os.listdir(tango_icons_dir):
++        if tango_icon_item.startswith("."):
++            continue
++        abs_item = os.path.join(tango_icons_dir, tango_icon_item)
++        if not os.path.isdir(abs_item):
++            continue
++        data.append('tango-icons/%s/*' % tango_icon_item)
+     return data
+  
+ package_data = { 
diff --git a/debian/patches/series b/debian/patches/series
index 5aa3827..100cc29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-debian-fix-ftbfs-qt4-qapplication.patch
+0002-fix-tango-icons-installation.patch

-- 
framework for TANGO control system client applications