[pytango] 02/02: Merge remote-tracking branch 'origin'
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Tue Jan 31 17:13:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pytango.
commit 7ba1f4230d774c5ea6892f4e120c04ef5d0da060
Merge: a3249dc ca5e411
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Tue Jan 31 18:11:51 2017 +0100
Merge remote-tracking branch 'origin'
Conflicts:
debian/changelog
.gitignore | 1 +
.travis.yml | 44 +
README.rst | 19 +-
ci/ALBA/build.sh | 105 -
ci/ALBA/ct32suse11 | 4 -
ci/ALBA/ct64suse11 | 4 -
ci/ALBA/ct64suse121 | 4 -
ci/ESRF/build.sh | 109 -
ci/ESRF/ct32redhate4 | 7 -
ci/ESRF/ct32windows7 | 5 -
ci/ESRF/ct64debian6 | 7 -
ci/ESRF/ct64debian7 | 8 -
ci/ESRF/ct64redhate5 | 7 -
ci/README | 48 -
ci/build.sh | 20 -
debian/changelog | 9 +
debian/compat | 2 +-
debian/control | 2 +-
.../0001-correct-typo-s-lenght-length.patch | 48 -
debian/patches/series | 1 -
doc/_static/PowerSupplyDS.py | 24 +-
doc/_templates/index.html | 1 -
doc/howto.rst | 66 +-
doc/mock_tango_extension.py | 71 +-
doc/revision.rst | 34 +-
doc/server_api/device.rst | 33 +-
doc/server_api/server.rst | 79 +-
doc/start.rst | 2 +-
examples/Clock/Clock.py | 8 +-
examples/Clock/ClockDS.py | 18 +-
examples/TuringMachine/TuringMachine.py | 19 +-
ext/exception.cpp | 2 +-
ext/server/device_impl.cpp | 60 +-
ext/server/device_impl.h | 2 +
ext/server/pipe.cpp | 4 +-
images/banner.xcf | Bin 1305732 -> 0 bytes
images/itango_console.png | Bin 66700 -> 0 bytes
images/itango_qtconsole.png | Bin 87266 -> 0 bytes
images/logo-2009.xcf | Bin 3059144 -> 0 bytes
images/logo-2010.png | Bin 1363560 -> 0 bytes
images/logo-2010.xcf | Bin 9367953 -> 0 bytes
images/logo-medium-2009.png | Bin 56077 -> 0 bytes
images/logo-medium-2010.png | Bin 98513 -> 0 bytes
images/logo-small-2009.png | Bin 17765 -> 0 bytes
images/logo-small-2010.png | Bin 99573 -> 0 bytes
images/tango.jpg | Bin 8694 -> 0 bytes
setup.cfg | 6 +
setup.py | 74 +-
tango/__init__.py | 115 +-
tango/attribute_proxy.py | 2 +
tango/databaseds/database.py | 3 +-
tango/databaseds/db_access/beacon.py | 90 +-
tango/device_proxy.py | 133 +-
tango/device_server.py | 924 ++++---
tango/green.py | 3 -
tango/group.py | 5 +-
tango/release.py | 60 +-
tango/server.py | 943 ++-----
tango/tango_gevent.py | 30 +-
tango/tango_object.py | 585 ++++
tango/test_context.py | 271 ++
tango/test_utils.py | 59 +
tango/utils.py | 348 ++-
tests/DevTest.py | 2852 --------------------
tests/README | 20 -
tests/TangoRunner.py | 341 ---
tests/TestSuite.py | 296 --
tests/TestSuiteTemplate.py | 47 -
tests/ci/ALBA/build.sh | 100 -
tests/ci/build.sh | 20 -
tests/test_client.py | 263 ++
tests/test_event.py | 84 +
tests/test_server.py | 197 ++
73 files changed, 2987 insertions(+), 5761 deletions(-)
diff --cc debian/changelog
index 024f7bb,e3b57d0..8f36fcb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ pytango (9.2.1-1~exp1) experimental; urgency=medium
+
+ * Import Upstream version 9.2.1
+ * debian/patch
+ - drop 0001-correct-typo-s-lenght-length.patch (aplied upstream)
+ * Use compat level 10 (Closes: #843728)
+
+ -- Sandor Bodo-Merle <sbodomerle at gmail.com> Tue, 31 Jan 2017 12:56:49 +0100
+
+pytango (9.2.0-2) unstable; urgency=medium
+
+ * Add Breaks and Replace for python-pytango-doc (Closes: #836859)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Thu, 03 Nov 2016 11:22:02 +0100
+
pytango (9.2.0-1) unstable; urgency=medium
* Uploaded into Unstable
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git
More information about the debian-science-commits
mailing list