[sardana] branch master updated (97529f8 -> 2ec796d)

[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.

      from  97529f8   release
       new  09fc775   Import Upstream version 2.1.1
       new  7f24d82   Import Debian patch 2.1.1-1~exp1
       new  2ec796d   release

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 PKG-INFO                                           |   4 +-
 debian/changelog                                   |  12 +
 debian/source/local-options                        |   1 -
 doc/man/MacroServer.1                              |   4 +-
 doc/man/Pool.1                                     |   4 +-
 doc/man/Sardana.1                                  |   4 +-
 doc/man/diffractometeralignment.1                  |   4 +-
 doc/man/hklscan.1                                  |   4 +-
 doc/man/macroexecutor.1                            |   4 +-
 doc/man/sequencer.1                                |   4 +-
 doc/man/spock.1                                    | 389 +--------------------
 doc/man/ubmatrix.1                                 |   4 +-
 doc/source/users/getting_started/installing.rst    | 152 +++++---
 setup.py                                           |   4 +-
 src/sardana/release.py                             |   2 +-
 src/sardana/spock/ipython_00_10/genutils.py        |   6 +-
 src/sardana/spock/ipython_00_11/genutils.py        |   6 +-
 src/sardana/spock/ipython_01_00/genutils.py        |   8 +-
 src/sardana/spock/release.py                       |   2 +-
 src/sardana/spock/spockms.py                       |   2 +-
 src/sardana/taurus/core/tango/sardana/pool.py      |   9 +-
 .../qt/qtgui/extra_macroexecutor/dooroutput.py     |  31 +-
 22 files changed, 173 insertions(+), 487 deletions(-)
 delete mode 100644 debian/source/local-options

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