[sardana] 02/08: Merge tag 'upstream/1.3.0'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to annotated tag debian/1.3.0-1
in repository sardana.

commit f5145cec8d06fad0084a9e25dd12dc015d041cd3
Merge: 6963021 cee149d
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 16 07:10:04 2014 +0100

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 PKG-INFO                                           |  17 +-
 doc/man/MacroServer.1                              |  18 +-
 doc/man/Pool.1                                     |  18 +-
 doc/man/Sardana.1                                  |  18 +-
 doc/man/spock.1                                    | 356 +++++++++++++++++++++
 doc/source/_templates/index.html                   |   2 +
 doc/source/_templates/indexsidebar.html            |   4 +-
 doc/source/devel/api/api_motor.rst                 |   4 +-
 doc/source/devel/guide_coding.rst                  |  52 +--
 .../howto_controllers/howto_motorcontroller.rst    |   6 +-
 doc/source/devel/howto_macros/index.rst            |   2 +-
 doc/source/devel/howto_macros/macros_general.rst   |  39 +--
 doc/source/devel/overview/overview_macroserver.rst |   2 +-
 doc/source/users/getting_started/installing.rst    |  25 +-
 setup.py                                           | 299 +++++++++--------
 src/sardana/macroserver/macro.py                   |   7 +-
 src/sardana/macroserver/macros/examples/scans.py   |  14 +-
 .../macroserver/macros/examples/submacros.py       |  15 +-
 src/sardana/macroserver/macros/ioregister.py       |   2 +-
 src/sardana/macroserver/macroserver.py             |   8 +-
 src/sardana/macroserver/msmacromanager.py          |   3 +-
 src/sardana/macroserver/scan/gscan.py              |   3 +-
 .../macroserver/scan/recorder/datarecorder.py      |  96 +++---
 src/sardana/macroserver/scan/recorder/output.py    | 128 ++++----
 src/sardana/pool/controller.py                     |  14 +-
 src/sardana/release.py                             |  19 +-
 src/sardana/sardanamanager.py                      |   4 +-
 src/sardana/sardanathreadpool.py                   |   4 +-
 src/sardana/spock/genutils.py                      |   4 +-
 src/sardana/spock/inputhandler.py                  |   2 +-
 src/sardana/spock/ipython_00_10/genutils.py        |  20 +-
 src/sardana/spock/ipython_00_11/genutils.py        |  18 +-
 .../ipython_01_00/__init__.py}                     |  31 +-
 .../{ipython_00_11 => ipython_01_00}/genutils.py   |  35 +-
 src/sardana/spock/magic.py                         |   7 +-
 src/sardana/spock/release.py                       |   1 +
 src/sardana/tango/core/SardanaDevice.py            |   2 +-
 src/sardana/tango/macroserver/Door.py              |   3 +-
 src/sardana/tango/macroserver/MacroServer.py       |   2 +-
 src/sardana/tango/pool/Controller.py               |   2 +-
 src/sardana/tango/pool/MeasurementGroup.py         |   2 +-
 src/sardana/tango/pool/Pool.py                     |   3 +-
 src/sardana/tango/pool/PoolDevice.py               |   2 +-
 43 files changed, 862 insertions(+), 451 deletions(-)

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