[pytango] 103/483: c

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit e11dc7410d936c1ce5383a2e44afc39615f01e5a
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Thu Mar 1 09:34:46 2012 +0000

    c
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@19525 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 MANIFEST.in                                                           | 4 ++++
 PyTango/ipython/ipython_00_12/examples/notebooks/notebook_launcher.py | 2 ++
 setup.py                                                              | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 0f8fe68..6b0c822 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,6 +2,8 @@ recursive-include PyTango *.py
 recursive-include PyTango3 *.py
 recursive-include IPython *.py
 recursive-include win *.sln *.vcproj
+recursive-include PyTango/ipython/ipython_00_12/examples *
+
 include winsetup.py
 
 graft src
@@ -10,8 +12,10 @@ graft build/sphinx/html
 
 global-exclude *.pyc
 global-exclude *.pyo
+global-exclude .svn
 exclude setup.cfg
 exclude .project
+exclude .ropeproject
 exclude .pydevproject
 exclude images/*
 exclude src/precompiled_header.hpp.gch
diff --git a/PyTango/ipython/ipython_00_12/examples/notebooks/notebook_launcher.py b/PyTango/ipython/ipython_00_12/examples/notebooks/notebook_launcher.py
index 94e80c8..0d855f8 100644
--- a/PyTango/ipython/ipython_00_12/examples/notebooks/notebook_launcher.py
+++ b/PyTango/ipython/ipython_00_12/examples/notebooks/notebook_launcher.py
@@ -182,6 +182,8 @@ def merge_dirs(base, overlay, target, preserve_originals=False):
         # instead, just symlink them.
         # this keeps both walkers in sync.
         for subdir in set(base_dirs[:] + over_dirs[:]):
+            if subdir.startswith("."):
+                continue
             if subdir not in over_dirs:
                 base_dirs.remove(subdir)
                 from_base_dirs.append(os.path.join(base_path, subdir))
diff --git a/setup.py b/setup.py
index 7834488..dd16521 100644
--- a/setup.py
+++ b/setup.py
@@ -121,9 +121,9 @@ class build(dftbuild):
         
         if IPython and not self.without_spock:
             if _IPY_VER > [0,10]:
-                self.distribution.py_modules.append('IPython.config.profile.spock')
+                self.distribution.py_modules.append('IPython.config.profile.tango')
             else:
-                self.distribution.py_modules.append('IPython.Extensions.ipy_profile_spock')
+                self.distribution.py_modules.append('IPython.Extensions.ipy_profile_tango')
             
         dftbuild.run(self)
         

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git