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

[Picca Frédéric-Emmanuel]

The following commit has been merged in the master branch:
commit 6168cfe083e653cddfde385dc22c321303782e62
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Sat Mar 26 14:28:08 2011 +0100

    * regenerate the patch serie with gbp-pq

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
new file mode 100644
index 0000000..c53c2eb
--- /dev/null
+++ b/debian/patches/0001-feature-fix-compilation-with-tango-7.2.0.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000..33f92d3
--- /dev/null
+++ b/debian/patches/0002-feature-fix-the-doc-generation.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 0000000..84bf556
--- /dev/null
+++ b/debian/patches/0003-debian-link-with-boost-depending-on-the-python-versi.patch
@@ -0,0 +1,39 @@
+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/0004-debian-install-the-spock-ipython-profile.patch b/debian/patches/0004-debian-install-the-spock-ipython-profile.patch
new file mode 100644
index 0000000..be4f716
--- /dev/null
+++ b/debian/patches/0004-debian-install-the-spock-ipython-profile.patch
@@ -0,0 +1,48 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
+Date: Sat, 26 Mar 2011 14:26:48 +0100
+Subject: debian install the spock ipython profile
+
+---
+ IPython/Extensions/ipy_profile_spock.py |   17 +++++++++++++++++
+ setup.py                                |    3 ++-
+ 2 files changed, 19 insertions(+), 1 deletions(-)
+ create mode 100644 IPython/Extensions/ipy_profile_spock.py
+
+diff --git a/IPython/Extensions/ipy_profile_spock.py b/IPython/Extensions/ipy_profile_spock.py
+new file mode 100644
+index 0000000..3ba6579
+--- /dev/null
++++ b/IPython/Extensions/ipy_profile_spock.py
+@@ -0,0 +1,17 @@
++""" IPython 'spock' profile, to preload PyTango and offer a friendly interface to Tango.
++
++Created with PyTango {pytangover} for IPython {ipyver} """
++
++import IPython.ipapi
++import ipy_defaults
++
++def main():
++    ip = IPython.ipapi.get()
++    try:
++        ip.ex("import IPython.ipapi")
++        ip.ex("import PyTango.ipython")
++        ip.ex("PyTango.ipython.init_ipython(IPython.ipapi.get())")
++    except ImportError:
++        print "Unable to start spock profile, is PyTango installed?"
++
++main()
+diff --git a/setup.py b/setup.py
+index b395c92..7c48b58 100644
+--- a/setup.py
++++ b/setup.py
+@@ -95,7 +95,8 @@ please_debug = False
+ packages = [
+     'PyTango',
+     'PyTango.ipython',
+-    'PyTango3'
++    'PyTango3',
++    'IPython.Extensions'
+ ]
+ 
+ provides = [
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9f3a47c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+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

-- 
Packaging for pytango