[sardana] branch master updated (6121f4e -> 54974c9)

[Frédéric-Emmanuel Picca]

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

picca pushed a change to branch master
in repository sardana.

  discards  6121f4e   improve the description thanks to Justin B Rye (Closes: #735164)
      adds  cee149d   Imported Upstream version 1.3.0
      adds  f5145ce   Merge tag 'upstream/1.3.0'
      adds  f4f2f9c   improve the sardana package description
      adds  f99f5d8   Bump Standard-Versions to 3.9.5 (Nothing to do)
      adds  43c5aa7   remove patches now that sphinx 1.2.1 is available
      adds  11699bb   prepare for release
      adds  9ebd069   missing sardana.spock.ipython_01_00 module
      adds  54974c9   release

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6121f4e)
            \
             N -- N -- N   refs/heads/master (54974c9)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

No new revisions were added by this update.

Summary of changes:
 PKG-INFO                                           |  17 +-
 debian/changelog                                   |  18 +-
 debian/control                                     |   2 +-
 ...-FTBFS-until-the-PyTango-binding-is-fixed.patch | 375 ---------------------
 ...pstream-install-also-the-ipython_01_00-mo.patch |  20 ++
 debian/patches/series                              |   2 +-
 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_00_11 => ipython_01_00}/__init__.py   |   0
 .../{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 +-
 48 files changed, 895 insertions(+), 804 deletions(-)
 delete mode 100644 debian/patches/0001-fix-the-FTBFS-until-the-PyTango-binding-is-fixed.patch
 create mode 100644 debian/patches/0001-forwarded-upstream-install-also-the-ipython_01_00-mo.patch
 create mode 100644 doc/man/spock.1
 copy src/sardana/spock/{ipython_00_11 => ipython_01_00}/__init__.py (100%)
 copy src/sardana/spock/{ipython_00_11 => ipython_01_00}/genutils.py (97%)

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