[sardana] 02/07: Merge tag 'upstream/1.5.0'

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository sardana.

commit e85624e9b76f0251a6540fef4b537d3c706c821e
Merge: 1953e65 5d09bd0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Feb 6 18:33:08 2015 +0100

    Merge tag 'upstream/1.5.0'
    
    Upstream version 1.5.0

 PKG-INFO                                           |   4 +-
 doc/man/MacroServer.1                              |   4 +-
 doc/man/MacroServer.py.1                           |  38 ---
 doc/man/Pool.1                                     |   4 +-
 doc/man/Sardana.1                                  |   4 +-
 doc/man/macroexecutor.1                            |   4 +-
 doc/man/sequencer.1                                |   4 +-
 doc/man/spock.1                                    |   6 +-
 setup.py                                           |   4 +-
 src/sardana/macroserver/macro.py                   |  16 +-
 src/sardana/macroserver/macros/env.py              |  27 +-
 src/sardana/macroserver/macros/ioregister.py       |  11 +-
 src/sardana/macroserver/macros/standard.py         | 140 +++++++++--
 src/sardana/macroserver/msoptions.py               |   4 +-
 src/sardana/macroserver/scan/gscan.py              |   9 +-
 src/sardana/macroserver/scan/recorder/storage.py   |  32 ++-
 src/sardana/pool/poolbaseelement.py                | 116 +--------
 src/sardana/pool/poolcontroller.py                 |   2 +-
 .../pool/poolcontrollers/OneDControllerTimer.py    | 255 -------------------
 .../core/tango/sardana => pool/test}/__init__.py   |  16 +-
 src/sardana/pool/test/dummyconfs.py                |  59 +++++
 .../sardana/__init__.py => pool/test/fake.py}      |  25 +-
 src/sardana/pool/test/helper.py                    |  62 +++++
 src/sardana/pool/test/test_ctacquisition.py        |  83 +++++++
 .../test/test_poolcontroller.py}                   |  57 ++---
 .../test/test_poolcontrollermanager.py}            |  25 +-
 .../test/test_poolcountertimer.py}                 |  60 ++---
 src/sardana/release.py                             |   2 +-
 src/sardana/requirements.py                        |   2 +-
 src/sardana/sardanacustomsettings.py               |  19 +-
 src/sardana/spock/inputhandler.py                  |   2 +
 src/sardana/spock/ipython_00_11/genutils.py        |   6 +-
 src/sardana/spock/ipython_01_00/genutils.py        |   6 +-
 src/sardana/spock/release.py                       |   2 +-
 src/sardana/spock/spockms.py                       |  19 +-
 src/sardana/tango/core/util.py                     |   8 +
 .../tango/sardana => tango/pool/test}/__init__.py  |  15 +-
 src/sardana/tango/pool/test/base.py                | 176 +++++++++++++
 src/sardana/tango/pool/test/test_Motor.py          |  76 ++++++
 src/sardana/taurus/core/tango/sardana/__init__.py  |   7 +
 .../taurus/core/tango/sardana/macroserver.py       |  10 +-
 src/sardana/taurus/core/tango/sardana/pool.py      |  17 +-
 .../build/doctrees/environment.pickle              | Bin 3633465 -> 0 bytes
 .../build/doctrees/index.doctree                   | Bin 3226 -> 0 bytes
 .../build/doctrees/macrobutton.doctree             | Bin 7220 -> 0 bytes
 .../macrobutton/_DoorStateListener.doctree         | Bin 8171 -> 0 bytes
 .../doctrees/macrobutton/_MacroButton.doctree      | Bin 39941 -> 0 bytes
 .../macrobutton/_MacroButtonAbortDoor.doctree      | Bin 11108 -> 0 bytes
 .../doctrees/macrobutton/favouriteseditor.doctree  | Bin 3931 -> 0 bytes
 .../macrobutton/macroparameterseditor.doctree      | Bin 3986 -> 0 bytes
 .../doctrees/macrobutton/sequenceeditor.doctree    | Bin 3911 -> 0 bytes
 .../build/doctrees/macrobutton_AllClasses.doctree  | Bin 5537 -> 0 bytes
 .../qt/qtgui/extra_macroexecutor/build/index.rst   |  10 -
 .../extra_macroexecutor/build/macrobutton.rst      |  51 ----
 .../build/macrobutton/_DoorStateListener.rst       |  15 --
 .../build/macrobutton/_MacroButton.rst             |  15 --
 .../build/macrobutton/_MacroButtonAbortDoor.rst    |  15 --
 .../build/macrobutton/favouriteseditor.rst         |  17 --
 .../build/macrobutton/macroparameterseditor.rst    |  17 --
 .../build/macrobutton/sequenceeditor.rst           |  17 --
 .../build/macrobutton_AllClasses.rst               |  15 --
 .../qt/qtgui/extra_macroexecutor/macrobutton.py    | 276 +++++++++++++--------
 62 files changed, 995 insertions(+), 891 deletions(-)

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