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

[Picca Frédéric-Emmanuel]

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

    * unapply all upstream modifications before switching to gbp-pq

diff --git a/IPython/Extensions/ipy_profile_spock.py b/IPython/Extensions/ipy_profile_spock.py
deleted file mode 100644
index 3ba6579..0000000
--- a/IPython/Extensions/ipy_profile_spock.py
+++ /dev/null
@@ -1,17 +0,0 @@
-""" 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 7c48b58..b7a2a0b 100644
--- a/setup.py
+++ b/setup.py
@@ -95,8 +95,7 @@ please_debug = False
 packages = [
     'PyTango',
     'PyTango.ipython',
-    'PyTango3',
-    'IPython.Extensions'
+    'PyTango3'
 ]
 
 provides = [
@@ -136,7 +135,7 @@ def uniquify(seq):
 
 include_dirs = [
     os.path.abspath('src'),
-    os.path.join(TANGO_ROOT, 'include/tango'),
+    os.path.join(TANGO_ROOT, 'include'),
     os.path.join(OMNI_ROOT, 'include'),
     os.path.join(NUMPY_ROOT, 'include'),
 ]
@@ -211,6 +210,7 @@ else:
     include_dirs += [ os.path.join(BOOST_ROOT, 'include') ]
     
     libraries += [
+        'boost_python',
         'pthread',
         'rt',
         'dl',
@@ -220,17 +220,6 @@ 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') ]
 
 
@@ -302,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

-- 
Packaging for pytango