[SCM] Packaging for pytango branch, master, updated. a32eb5d948f5dd7648fb2a011ae00af37f98c9e4

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 6f62095eaecf1f6a336307cd501540149e16bd87
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Apr 11 10:15:19 2011 +0200

    refresh the patch series
    
    only one remaining since most of the patches were imported by the upstream

diff --git a/debian/patches/0004-debian-install-the-spock-ipython-profile.patch b/debian/patches/0001-debian-install-the-spock-ipython-profile.patch
similarity index 95%
rename from debian/patches/0004-debian-install-the-spock-ipython-profile.patch
rename to debian/patches/0001-debian-install-the-spock-ipython-profile.patch
index be4f716..26d9093 100644
--- a/debian/patches/0004-debian-install-the-spock-ipython-profile.patch
+++ b/debian/patches/0001-debian-install-the-spock-ipython-profile.patch
@@ -32,10 +32,10 @@ index 0000000..3ba6579
 +
 +main()
 diff --git a/setup.py b/setup.py
-index b395c92..7c48b58 100644
+index 850cd08..36e05e1 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -95,7 +95,8 @@ please_debug = False
+@@ -96,7 +96,8 @@ please_debug = False
  packages = [
      'PyTango',
      'PyTango.ipython',
diff --git a/debian/patches/0001-feature-fix-compilation-with-tango-7.2.0.patch b/debian/patches/0001-feature-fix-compilation-with-tango-7.2.0.patch
deleted file mode 100644
index c53c2eb..0000000
--- a/debian/patches/0001-feature-fix-compilation-with-tango-7.2.0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Sat, 26 Mar 2011 14:24:26 +0100
-Subject: feature fix compilation with tango 7.2.0
-
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index b7a2a0b..7b41b8e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -135,7 +135,7 @@ def uniquify(seq):
- 
- include_dirs = [
-     os.path.abspath('src'),
--    os.path.join(TANGO_ROOT, 'include'),
-+    os.path.join(TANGO_ROOT, 'include/tango'),
-     os.path.join(OMNI_ROOT, 'include'),
-     os.path.join(NUMPY_ROOT, 'include'),
- ]
--- 
diff --git a/debian/patches/0002-feature-fix-the-doc-generation.patch b/debian/patches/0002-feature-fix-the-doc-generation.patch
deleted file mode 100644
index 33f92d3..0000000
--- a/debian/patches/0002-feature-fix-the-doc-generation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Sat, 26 Mar 2011 14:25:04 +0100
-Subject: feature fix the doc generation
-
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 7b41b8e..d04c46b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -291,7 +291,7 @@ class build_ext(dftbuild_ext):
-             #self.compiler.compiler_so = " ".join(compiler_pars)
-         dftbuild_ext.build_extensions(self)
- 
--cmdclass = {'build_ext' : build_ext }
-+cmdclass['build_ext'] = build_ext
- 
- if sphinx:
-     from sphinx.setup_command import BuildDoc
--- 
diff --git a/debian/patches/0003-debian-link-with-boost-depending-on-the-python-versi.patch b/debian/patches/0003-debian-link-with-boost-depending-on-the-python-versi.patch
deleted file mode 100644
index 84bf556..0000000
--- a/debian/patches/0003-debian-link-with-boost-depending-on-the-python-versi.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Sat, 26 Mar 2011 14:26:18 +0100
-Subject: debian link with boost depending on the python version
-
----
- setup.py |   12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index d04c46b..b395c92 100644
---- a/setup.py
-+++ b/setup.py
-@@ -210,7 +210,6 @@ else:
-     include_dirs += [ os.path.join(BOOST_ROOT, 'include') ]
-     
-     libraries += [
--        'boost_python',
-         'pthread',
-         'rt',
-         'dl',
-@@ -220,6 +219,17 @@ else:
-         'COS4',
-     ]
- 
-+    # when building with multiple version of python on debian we need
-+    # to link against boost_python-py25/-py26 etc...
-+    import platform
-+    if platform.dist()[0] in ['debian']:
-+        if distutils.sysconfig.get_python_version() == '2.5':
-+            libraries += ['boost_python-py25']
-+        elif distutils.sysconfig.get_python_version() == '2.6':
-+            libraries += ['boost_python-py26']
-+    else:
-+        libraries += ['boost_python']
-+
-     library_dirs += [ os.path.join(OMNI_ROOT, 'lib') ]
- 
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 9f3a47c..6c7e7b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-0001-feature-fix-compilation-with-tango-7.2.0.patch
-0002-feature-fix-the-doc-generation.patch
-0003-debian-link-with-boost-depending-on-the-python-versi.patch
-0004-debian-install-the-spock-ipython-profile.patch
+0001-debian-install-the-spock-ipython-profile.patch

-- 
Packaging for pytango