[pytango] 02/05: Import Debian patch 9.2.0-1~exp1
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sun Sep 4 16:31:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pytango.
commit 0164f54c27e369058847edfadd085e019fbaccc9
Merge: e2b2cd6 a743443
Author: Sandor Bodo-Merle <sbodomerle at gmail.com>
Date: Fri Aug 26 11:15:20 2016 +0200
Import Debian patch 9.2.0-1~exp1
.gitignore | 51 +
IPython/Extensions/ipy_profile_tango.py | 26 -
IPython/config/profile/tango/ipython_config.py | 22 -
MANIFEST.in | 12 +
Makefile | 318 ++
PKG-INFO | 30 -
PyTango.py | 50 +
README.rst | 117 +
cPyTango/__init__.py | 24 -
cPyTango/cPyTango.py | 895 -----
cPyTango/enumeration.py | 109 -
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 | 23 +
debian/control | 51 +-
debian/copyright | 11 +-
.../0001-Fix-syntax-error-in-python-3.patch | 21 -
.../0001-correct-typo-s-lenght-length.patch | 48 +
.../patches/0002-Use-jquery-from-the-archive.patch | 25 +
debian/patches/series | 3 +-
debian/python-pytango.install | 2 -
debian/python-pytango.manpages | 1 -
debian/python-pytango.pyinstall | 2 -
...ango-doc.doc-base => python-tango-doc.doc-base} | 4 +-
...thon-pytango-doc.docs => python-tango-doc.docs} | 0
debian/python-tango.pydist | 1 +
debian/python3-pytango.install | 2 -
debian/python3-tango.pydist | 1 +
debian/rules | 33 +-
debian/source/local-options | 1 -
doc/_static/PowerSupplyDS.py | 13 +-
doc/_static/boost_python_install.py | 2 +-
doc/_static/itango.ico | Bin 16446 -> 0 bytes
doc/_static/itango.png | Bin 15517 -> 0 bytes
doc/_static/itango01.png | Bin 66682 -> 0 bytes
doc/_static/itango02.png | Bin 55182 -> 0 bytes
doc/_static/itango03.png | Bin 17471 -> 0 bytes
doc/_static/itango04.png | Bin 87205 -> 0 bytes
doc/_static/itango05.png | Bin 2885381 -> 0 bytes
doc/_static/itango06.png | Bin 137259 -> 0 bytes
doc/_static/{default.css => pytango.css} | 44 +-
doc/_templates/index.html | 10 +-
doc/_templates/indexsidebar.html | 18 +-
doc/_templates/layout.html | 2 +-
doc/api.rst | 4 +-
doc/client_api/attribute_proxy.rst | 4 +-
doc/client_api/device_proxy.rst | 4 +-
doc/client_api/green.rst | 17 +-
doc/client_api/group.rst | 16 +-
doc/client_api/miscellaneous.rst | 2 +-
doc/client_api/other.rst | 54 +-
doc/conf.py | 79 +-
doc/contents.rst | 2 +-
doc/data_types.rst | 127 +-
doc/database.rst | 18 +-
doc/encoded.rst | 4 +-
doc/environment.yml | 6 +
doc/exception.rst | 234 +-
doc/faq.rst | 259 +-
doc/green.rst | 101 +-
doc/howto.rst | 385 +-
doc/itango.rst | 706 +---
doc/mock_tango_extension.py | 100 +
doc/quicktour.rst | 102 +-
doc/revision.rst | 69 +-
doc/server_api/attribute.rst | 12 +-
doc/server_api/device.rst | 12 +-
doc/server_api/device_class.rst | 4 +-
doc/server_api/index.rst | 2 +-
doc/server_api/logging.rst | 14 +-
doc/server_api/server.rst | 42 +-
doc/server_api/util.rst | 4 +-
doc/sphinxext/ipython_console_highlighting.py | 125 -
doc/sphinxext/tango_console_highlighting.py | 139 -
doc/start.rst | 76 +-
doc/tep.rst | 2 +-
doc/tep/tep-0001.rst | 48 +-
doc/tep/tep-0002.rst | 4 +-
doc/utilities.rst | 44 +-
examples/Clock/Clock.py | 21 +
examples/Clock/ClockDS.py | 60 +
examples/Clock/client.py | 36 +
examples/TuringMachine/TuringMachine.py | 69 +
examples/TuringMachine/turing_client.py | 18 +
.../dynamic/common}/__init__.py | 0
examples/dynamic/common/roi.py | 13 +
examples/dynamic/dynamic_client.py | 23 +
examples/dynamic/dynamic_server.py | 44 +
examples/many/many_client.py | 17 +
examples/many/many_server.py | 36 +
examples/multi/multi_client.py | 24 +
examples/multi/multi_server.py | 47 +
.../simple/common}/__init__.py | 0
examples/simple/common/roi.py | 13 +
examples/simple/simple_client.py | 23 +
examples/simple/simple_server.py | 45 +
{src/boost/cpp => ext}/api_util.cpp | 2 +-
{src/boost/cpp => ext}/archive_event_info.cpp | 2 +-
{src/boost/cpp => ext}/attr_conf_event_data.cpp | 2 +-
{src/boost/cpp => ext}/attribute_alarm_info.cpp | 2 +-
{src/boost/cpp => ext}/attribute_dimension.cpp | 2 +-
{src/boost/cpp => ext}/attribute_event_info.cpp | 2 +-
{src/boost/cpp => ext}/attribute_info.cpp | 2 +-
{src/boost/cpp => ext}/attribute_info_ex.cpp | 5 +-
{src/boost/cpp => ext}/attribute_proxy.cpp | 2 +-
{src/boost/cpp => ext}/base_types.cpp | 29 +-
{src/boost/cpp => ext}/base_types_numpy.hpp | 2 +-
{src/boost/cpp => ext}/callback.cpp | 6 +-
{src/boost/cpp => ext}/callback.h | 2 +-
{src/boost/cpp => ext}/change_event_info.cpp | 2 +-
{src/boost/cpp => ext}/command_info.cpp | 2 +-
{src/boost/cpp => ext}/connection.cpp | 2 +-
ext/constants.cpp | 341 ++
{src/boost/cpp => ext}/data_ready_event_data.cpp | 2 +-
{src/boost/cpp => ext}/database.cpp | 2 +-
{src/boost/cpp => ext}/db.cpp | 2 +-
{src/boost/cpp => ext}/defs.h | 5 +-
{src/boost/cpp => ext}/dev_command_info.cpp | 2 +-
{src/boost/cpp => ext}/dev_error.cpp | 2 +-
{src/boost/cpp => ext}/device_attribute.cpp | 40 +-
{src/boost/cpp => ext}/device_attribute.h | 2 +-
{src/boost/cpp => ext}/device_attribute_config.cpp | 2 +-
.../boost/cpp => ext}/device_attribute_history.cpp | 2 +-
{src/boost/cpp => ext}/device_attribute_numpy.hpp | 8 +-
{src/boost/cpp => ext}/device_data.cpp | 25 +-
{src/boost/cpp => ext}/device_data_history.cpp | 2 +-
{src/boost/cpp => ext}/device_info.cpp | 2 +-
ext/device_pipe.cpp | 415 +++
ext/device_pipe.h | 51 +
{src/boost/cpp => ext}/device_proxy.cpp | 117 +-
{src/boost/cpp => ext}/enums.cpp | 29 +-
{src/boost/cpp => ext}/event_data.cpp | 2 +-
{src/boost/cpp => ext}/exception.cpp | 2 +-
{src/boost/cpp => ext}/exception.h | 2 +-
{src/boost/cpp => ext}/fast_from_py.h | 4 +-
{src/boost/cpp => ext}/fast_from_py_numpy.hpp | 2 +-
{src/boost/cpp => ext}/from_py.cpp | 84 +-
{src/boost/cpp => ext}/from_py.h | 7 +-
{src/boost/cpp => ext}/group.cpp | 2 +-
{src/boost/cpp => ext}/group_reply.cpp | 2 +-
{src/boost/cpp => ext}/group_reply_list.cpp | 2 +-
{src/boost/cpp => ext}/locker_info.cpp | 2 +-
{src/boost/cpp => ext}/locking_thread.cpp | 2 +-
{src/boost/cpp => ext}/periodic_event_info.cpp | 2 +-
.../archive_event_info.cpp => ext/pipe_info.cpp | 18 +-
{src/boost/cpp => ext}/poll_device.cpp | 2 +-
.../sip/DbData.sip => ext/precompiled_header.cpp | 4 +-
{src/boost/cpp => ext}/precompiled_header.hpp | 2 +-
{src/boost/cpp => ext}/pytango.cpp | 10 +-
{src/boost/cpp => ext}/pytgutils.cpp | 2 +-
{src/boost/cpp => ext}/pytgutils.h | 2 +-
{src/boost/cpp => ext}/pyutils.cpp | 7 +-
{src/boost/cpp => ext}/pyutils.h | 24 +-
{src/boost/cpp => ext}/server/attr.cpp | 83 +-
{src/boost/cpp => ext}/server/attr.h | 83 +-
{src/boost/cpp => ext}/server/attribute.cpp | 104 +-
{src/boost/cpp => ext}/server/attribute.h | 2 +-
ext/server/auto_monitor.cpp | 151 +
{src/boost/cpp => ext}/server/command.cpp | 27 +-
{src/boost/cpp => ext}/server/command.h | 2 +-
{src/boost/cpp => ext}/server/device_class.cpp | 80 +-
{src/boost/cpp => ext}/server/device_class.h | 24 +-
{src/boost/cpp => ext}/server/device_impl.cpp | 204 +-
{src/boost/cpp => ext}/server/device_impl.h | 136 +-
{src/boost/cpp => ext}/server/dserver.cpp | 2 +-
.../boost/cpp => ext}/server/encoded_attribute.cpp | 2 +-
{src/boost/cpp => ext}/server/log4tango.cpp | 2 +-
{src/boost/cpp => ext}/server/multi_attribute.cpp | 2 +-
.../cpp => ext}/server/multi_class_attribute.cpp | 8 +-
ext/server/pipe.cpp | 448 +++
ext/server/pipe.h | 86 +
{src/boost/cpp => ext}/server/subdev.cpp | 2 +-
{src/boost/cpp => ext}/server/tango_util.cpp | 3 +-
.../cpp => ext}/server/user_default_attr_prop.cpp | 6 +-
.../server/user_default_pipe_prop.cpp | 12 +-
{src/boost/cpp => ext}/server/wattribute.cpp | 2 +-
{src/boost/cpp => ext}/server/wattribute_numpy.hpp | 2 +-
{src/boost/cpp => ext}/tango_numpy.h | 3 +-
{src/boost/cpp => ext}/tgutils.h | 42 +-
{src/boost/cpp => ext}/time_val.cpp | 2 +-
{src/boost/cpp => ext}/to_py.cpp | 77 +-
{src/boost/cpp => ext}/to_py.h | 11 +-
{src/boost/cpp => ext}/to_py_numpy.hpp | 73 +-
{src/boost/cpp => ext}/version.cpp | 4 +-
images/banner.xcf | Bin 0 -> 1305732 bytes
images/itango_console.png | Bin 0 -> 66700 bytes
images/itango_qtconsole.png | Bin 0 -> 87266 bytes
images/logo-2009.xcf | Bin 0 -> 3059144 bytes
images/logo-2010.png | Bin 0 -> 1363560 bytes
images/logo-2010.xcf | Bin 0 -> 9367953 bytes
images/logo-medium-2009.png | Bin 0 -> 56077 bytes
images/logo-medium-2010.png | Bin 0 -> 98513 bytes
images/logo-small-2009.png | Bin 0 -> 17765 bytes
images/logo-small-2010.png | Bin 0 -> 99573 bytes
images/tango.jpg | Bin 0 -> 8694 bytes
readthedocs.yml | 2 +
scripts/itango | 27 -
setup.cfg | 7 +
setup.py | 301 +-
src/boost/cpp/constants.cpp | 290 --
src/boost/cpp/precompiled_header.cpp | 12 -
src/boost/python/green.py | 191 -
src/boost/python/ipython/__init__.py | 77 -
src/boost/python/ipython/common.py | 66 -
src/boost/python/ipython/eventlogger.py | 79 -
src/boost/python/ipython/ipython_00_10/__init__.py | 15 -
.../python/ipython/ipython_00_10/ipy_install.py | 99 -
src/boost/python/ipython/ipython_00_10/ipy_qt.py | 373 --
.../python/ipython/ipython_00_10/ipython_00_10.py | 969 -----
src/boost/python/ipython/ipython_00_11/__init__.py | 18 -
.../python/ipython/ipython_00_11/ipy_install.py | 102 -
.../python/ipython/ipython_00_11/ipython_00_11.py | 1269 -------
src/boost/python/ipython/ipython_10_00/__init__.py | 18 -
.../python/ipython/ipython_10_00/ipy_install.py | 102 -
.../python/ipython/ipython_10_00/ipython_10_00.py | 1331 -------
.../python/ipython/resource/ITangoConsole.svg | 422 ---
src/boost/python/ipython/resource/database.png | Bin 13726 -> 0 bytes
src/boost/python/ipython/resource/device.png | Bin 65909 -> 0 bytes
src/boost/python/ipython/resource/motor.png | Bin 13299 -> 0 bytes
src/boost/python/ipython/resource/serial.png | Bin 6323 -> 0 bytes
src/boost/python/ipython/resource/starter.png | Bin 15763 -> 0 bytes
src/sip/Makefile | 58 -
src/sip/Tango/__init__.py | 29 -
src/sip/Tango/__init_tango.py | 67 -
src/sip/Tango/release.py | 58 -
src/sip/setup.cfg | 2 -
src/sip/setup.py | 298 --
src/sip/sip/AttributeInfo.sip | 104 -
src/sip/sip/AttributeInfoEx.sip | 176 -
src/sip/sip/CommandInfo.sip | 119 -
src/sip/sip/Database.sip | 181 -
src/sip/sip/DbDatum.sip | 187 -
src/sip/sip/DbDevImportInfo.sip | 25 -
src/sip/sip/DbDevInfo.sip | 24 -
src/sip/sip/DeviceAttribute.sip | 30 -
src/sip/sip/DeviceAttributeConfig.sip | 38 -
src/sip/sip/DeviceInfo.sip | 24 -
src/sip/sip/DeviceProxy.sip | 222 --
src/sip/sip/Tango.sip | 52 -
src/sip/sip/configure.py | 59 -
src/sip/sip/connection.sip | 51 -
src/sip/sip/constants.sip | 218 --
src/sip/sip/std_utils.sip | 101 -
src/swig/Makefile | 106 -
src/swig/deviceproxy.i | 224 --
src/swig/tango.i | 21 -
{src/boost/python => tango}/__init__.py | 51 +-
{src/boost/python => tango}/api_util.py | 8 +-
src/boost/python/futures.py => tango/asyncio.py | 88 +-
tango/asyncio_tools.py | 100 +
{src/boost/python => tango}/attr_data.py | 27 +-
{src/boost/python => tango}/attribute_proxy.py | 118 +-
tango/auto_monitor.py | 77 +
{src/boost/python => tango}/base_types.py | 177 +-
{src/boost/python => tango}/callback.py | 4 +-
{src/boost/python => tango}/client.py | 55 +-
{src/boost/python => tango}/codec.py | 0
{src/boost/python => tango}/connection.py | 10 +-
.../boost/python => tango}/databaseds/DataBase.xmi | 0
{src/boost/python => tango}/databaseds/DataBaseds | 0
{src/boost/python => tango}/databaseds/__init__.py | 0
.../python => tango}/databaseds/create_db.sql | 0
.../databaseds/create_db_tables.sql | 0
{src/boost/python => tango}/databaseds/database.py | 376 +-
.../databaseds/db_access/__init__.py | 0
.../databaseds/db_access/beacon.py | 66 +-
.../databaseds/db_access/sqlite3.py | 8 +-
.../boost/python => tango}/databaseds/db_errors.py | 0
.../python => tango}/databaseds/mysql2sqlite.sh | 0
{src/boost/python => tango}/db.py | 48 +-
{src/boost/python => tango}/device_attribute.py | 4 +-
{src/boost/python => tango}/device_class.py | 70 +-
{src/boost/python => tango}/device_data.py | 4 +-
{src/boost/python => tango}/device_proxy.py | 515 ++-
{src/boost/python => tango}/device_server.py | 180 +-
{src/boost/python => tango}/encoded_attribute.py | 36 +-
{src/boost/python => tango}/exception.py | 60 +-
{src/boost/python => tango}/futures.py | 26 +-
{src/boost/python => tango}/gevent.py | 26 +-
{src/boost/python => tango}/globals.py | 2 +-
tango/green.py | 284 ++
{src/boost/python => tango}/group.py | 254 +-
{src/boost/python => tango}/group_reply.py | 4 +-
{src/boost/python => tango}/group_reply_list.py | 4 +-
{src/boost/python => tango}/log4tango.py | 50 +-
tango/pipe.py | 168 +
tango/pipe_data.py | 192 +
{src/boost/python => tango}/pytango_init.py | 10 +-
{src/boost/python => tango}/pytango_pprint.py | 24 +-
{src/boost/python => tango}/pyutil.py | 22 +-
{src/boost/python => tango}/release.py | 11 +-
{src/boost/python => tango}/server.py | 630 +++-
tango/tango_asyncio.py | 110 +
{src/boost/python => tango}/tango_futures.py | 8 +-
{src/boost/python => tango}/tango_gevent.py | 11 +-
{src/boost/python => tango}/tango_numpy.py | 16 +-
{src/boost/python => tango}/time_val.py | 10 +-
{src/boost/python => tango}/utils.py | 410 ++-
win/PyTango_VS10/PyTango.props | 472 +++
win/PyTango_VS10/PyTango.sln | 93 +
win/PyTango_VS10/PyTango.vcxproj | 926 +++++
win/PyTango_VS10/PyTango.vcxproj.filters | 284 ++
win/PyTango_VS14/PyTango.props | 399 +++
win/PyTango_VS14/PyTango.sln | 53 +
win/PyTango_VS14/PyTango.vcxproj | 521 +++
win/PyTango_VS14/PyTango.vcxproj.filters | 284 ++
win/PyTango_VS8/PyTango.sln | 76 +
win/PyTango_VS8/PyTango.vcproj | 1293 +++++++
win/PyTango_VS9/PyTango.sln | 158 +
win/PyTango_VS9/PyTango.vcproj | 3751 ++++++++++++++++++++
win/PyTango_VS9/PyTango.vsprops | 316 ++
winsetup.py | 78 +
322 files changed, 17246 insertions(+), 12654 deletions(-)
diff --cc debian/changelog
index ad57059,0000000..5cc5b67
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,168 -1,0 +1,191 @@@
++pytango (9.2.0-1~exp1) experimental; urgency=medium
++
++ * Imported Upstream version 9.2.0
++ - Filter out sourceless binary executable: examples/many/many_client
++ * debian/patch
++ - Drop unnecessary patch 0001-Fix-syntax-error-in-python-3.patch
++ - Add 0001-Fix-syntax-error-in-python-3.patch - spelling fix
++ - 0002-Use-jquery-from-the-archive.patch - fix jquery reference
++ * debian/control
++ - Update build depends:
++ - add: python-six, python-gevent, python-concurrent.futures, libtango-dev
++ - Rename package pytango=>tango; add transitional packages
++ - Standards-Version bump to 3.9.8 (nothing to do)
++ - Updated the Vcs-X (git -> https)
++ * Ship extra pydist files so dependent packages will use the correct
++ python-tango dependency
++ * Drop itango deps for now - until a separate itango package is made
++ * debian/rules
++ - Build with pybuild
++ * Add myself to uploaders
++
++ -- Sandor Bodo-Merle <sbodomerle at gmail.com> Fri, 26 Aug 2016 11:15:20 +0200
++
+pytango (8.1.8-2) unstable; urgency=medium
+
+ * debian/patches
+ - 0001-Fix-syntax-error-in-python-3.patch (Closes: #814824)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 21 Feb 2016 14:03:38 +0100
+
+pytango (8.1.8-1) unstable; urgency=medium
+
+ * Imported Upstream version 8.1.8
+ * debian/patch
+ - 0001-fix-compilation-with-python3.4.patch (deleted, applyed upstream)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sat, 13 Feb 2016 16:19:55 +0100
+
+pytango (8.1.6-1) unstable; urgency=medium
+
+ * debian/control
+ - Build-deps: libtango8-dev (>= 8.1.2c+dfsg-7~) (Closes: #797284)
+ * debian/patch
+ - 0001-fix-compilation-with-python3.4.patch
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Thu, 03 Sep 2015 18:23:34 +0100
+
+pytango (8.1.6-1~exp1) experimental; urgency=medium
+
+ * Imported Upstream version 8.1.6
+ * debian/watch
+ - Use the pypi.debian.net redirector
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 09 Feb 2015 18:23:34 +0100
+
+pytango (8.1.5-1) unstable; urgency=medium
+
+ * Imported Upstream version 8.1.5
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Wed, 01 Oct 2014 11:55:00 +0200
+
+pytango (8.1.4-1) unstable; urgency=medium
+
+ * Imported Upstream version 8.1.4
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 30 Sep 2014 20:38:16 +0200
+
+pytango (8.1.1-1) unstable; urgency=low
+
+ * Imported Upstream version 8.1.1
+ * debian/patch
+ - 0001-fix-from-upstream-FTBFS-s390.patch (applyed by upstream)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Wed, 27 Nov 2013 20:27:22 +0100
+
+pytango (8.0.3-3) unstable; urgency=low
+
+ * debian/control
+ - Build-Depends: remove log4tango4 which is not a direct build dependency.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 25 Aug 2013 09:17:58 +0200
+
+pytango (8.0.3-2) unstable; urgency=low
+
+ * debian/patch
+ + 0001-fix-from-upstream-FTBFS-s390.patch (Closes: #711761)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 21 Jul 2013 08:48:11 +0200
+
+pytango (8.0.3-1) unstable; urgency=low
+
+ * Imported Upstream version 8.0.3
+ * Bump Standards-Version 3.9.4 (nothing to do)
+ * Switch to debhelper level 9
+ * debian/rules
+ - updated the clean target to build twice.
+ * debian/patches
+ - 0001-feature-forwarded-fix-FTBFS-with-sphinx-beta-version.patch (deleted)
+ this patch was applyed by the upstream
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 20 May 2013 22:05:20 +0200
+
+pytango (8.0.2-1) unstable; urgency=low
+
+ * debian/patches
+ + 0001-feature-forwarded-fix-FTBFS-with-sphinx-beta-version.patch
+ (Closes: #706471)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 07 May 2013 09:28:11 +0200
+
+pytango (8.0.2-1~exp1) experimental; urgency=low
+
+ * Imported Upstream version 8.0.2
+ * debian/control
+ - add python3-pytango binary package
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 21 Sep 2012 21:48:10 +0200
+
+pytango (7.2.3-2) unstable; urgency=low
+
+ * debian/rules
+ - use dh_sphinxdoc only for the doc package (Closes: #670955)
+ * debian/control
+ - add Build-Depends-Indep
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 01 May 2012 18:08:18 +0200
+
+pytango (7.2.3-1) unstable; urgency=low
+
+ * Imported Upstream version 7.2.3
+ * debian/control
+ - add the python-pytango-doc package
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 25 Apr 2012 20:50:02 +0100
+
+pytango (7.2.2-3) unstable; urgency=low
+
+ * bump the Standards-Version to 3.9.3
+ - use the copyright format 1.0
+ * dpkg/rules
+ - updated to build on squeeze
+ * dpkg/control
+ - better dependencies thanks to cme (config-edit)
+ - X-Python-Version: >= 2.5 -> 2.6
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 26 Feb 2012 14:49:19 +0100
+
+pytango (7.2.2-2) unstable; urgency=low
+
+ * use dh_numpy for better python-numpy dependency.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 29 Jan 2012 11:32:31 +0100
+
+pytango (7.2.2-1) unstable; urgency=low
+
+ * import 7.2.2 upstream version. (Closes: #636468)
+ * use dh_sphinxdoc
+ * debian/control
+ - Build-Depends
+ - python-sphinx (>= 1.0.7+dfsg)
+ - add the Vcs- fields
+ - follow Debian Science policy for Maintainers
+ * debian/copyright fixed using config-edit
+ * debian/patches
+ - remove all patches thanks to the --install-html option.
+ * use pyinstall file to install the ipython profile.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 12 Dec 2011 18:05:59 +0200
+
+pytango (7.2.0-2) unstable; urgency=low
+
+ * debian/control
+ - bump the Standards-Version to 3.9.2
+ - Build-Depends
+ + libtango7 (>= 7.2) (updated)
+ + python-all-dev (>= 2.6.6-3~) (updated)
+ + python-setuptool (removed)
+ * debian/copyright
+ - use the right dep5 location
+ * Install the spock profile also for python2.7 Thanks Jakub Wilk for
+ the report (Closes: #632077)
+ * Update my email address since I am DD now.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sat, 14 May 2011 14:01:37 +0200
+
+pytango (7.2.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #614245)
+ * Thanks to Justin B Rye for package description review
+
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr> Mon, 09 Aug 2010 11:26:05 +0200
diff --cc debian/control
index 7ece0be,0000000..ec81e0b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,70 -1,0 +1,95 @@@
+Source: pytango
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
- Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
++Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>,
++ Sandor Bodo-Merle <sbodomerle at gmail.com>
+Section: science
+Priority: extra
+Build-Depends: debhelper (>= 9),
++ dh-python,
+ libboost-python-dev,
- libtango8-dev (>= 8.1.2c+dfsg-7~),
++ libtango-dev,
+ pkg-config,
+ python-all-dev,
++ python-concurrent.futures,
++ python-gevent,
+ python-numpy,
++ python-setuptools,
++ python-six,
+ python3-all-dev,
- python3-numpy
++ python3-numpy,
++ python3-setuptools,
++ python3-six
+Build-Depends-Indep: graphviz,
+ python-sphinx
- Standards-Version: 3.9.4
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pytango.git
- Vcs-Git: git://anonscm.debian.org/debian-science/packages/pytango.git
++Standards-Version: 3.9.8
++Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/pytango.git
++Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/pytango.git
+Homepage: http://www.tango-controls.org/static/PyTango/latest/doc/html/
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
+
+Package: python-pytango
+Architecture: any
++Section: oldlibs
++Depends: ${misc:Depends},
++ python-tango
++Pre-Depends: ${misc:Pre-Depends}
++Description: transitional dummy package for python-tango
++ This is a transitional package to ease upgrades to the
++ python-tango package. It can be safely removed.
++
++Package: python-tango
++Architecture: any
+Section: python
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
- ${python:Depends},
- ipython
++ ${python:Depends}
+Provides: ${python:Provides}
+Description: API for the TANGO control system (Python 2)
+ TANGO is an object oriented distributed control system using CORBA,
+ mainly developed by the Controls Section of the ALBA Synchrotron.
+ PyTango provides bindings for its client- and server-side C++ APIs.
+ With PyTango, you can write TANGO device servers and TANGO applications
+ (scripts, CLIs, GUIs) that access TANGO device servers in pure Python.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-pytango
+Architecture: any
++Section: oldlibs
++Depends: ${misc:Depends},
++ python3-tango
++Pre-Depends: ${misc:Pre-Depends}
++Description: transitional dummy package for python3-tango
++ This is a transitional package to ease upgrades to the
++ python3-tango package. It can be safely removed.
++
++Package: python3-tango
++Architecture: any
+Section: python
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
- ${python3:Depends},
- ipython3
++ ${python3:Depends}
+Provides: ${python3:Provides}
+Description: API for the TANGO control system (Python 3)
+ TANGO is an object oriented distributed control system using CORBA,
+ mainly developed by the Controls Section of the ALBA Synchrotron.
+ PyTango provides bindings for its client- and server-side C++ APIs.
+ With PyTango, you can write TANGO device servers and TANGO applications
+ (scripts, CLIs, GUIs) that access TANGO device servers in pure Python.
+ .
+ This is the Python 3 version of the package.
+
- Package: python-pytango-doc
++Package: python-tango-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+ ${sphinxdoc:Depends}
+Description: API for the TANGO control system
+ TANGO is an object oriented distributed control system using CORBA,
+ mainly developed by the Controls Section of the ALBA Synchrotron.
+ PyTango provides bindings for its client- and server-side C++ APIs.
+ With PyTango, you can write TANGO device servers and TANGO applications
+ (scripts, CLIs, GUIs) that access TANGO device servers in pure Python.
+ .
- This package contains the documentation for the python-pytango library.
-
++ This package contains the documentation for the python-tango library.
diff --cc debian/copyright
index 4bb78ff,0000000..cce78c8
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,55 -1,0 +1,54 @@@
- Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Tiago Coutinho
+Upstream-Contact: tcoutinho at cells.es
+Source: http://pypi.python.org/packages/source/P/PyTango
+
- Files: debian/*
- Copyright: © 2006-2011, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
- License: LGPL-3+
-
+Files: *
+Copyright: © 2010-2012, CELLS / ALBA Synchrotron, Bellaterra, Spain
+License: LGPL-3+
+
++Files: debian/*
++Copyright: © 2006-2011, Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
++License: LGPL-3+
++
+Files: doc/_static/jssor*
+Copyright: Copyright 2014 Jssor
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this
+ permission notice shall be included in all copies or substantial
+ portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: LGPL-3+
+ Tango is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ Tango is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
-
diff --cc debian/patches/0001-correct-typo-s-lenght-length.patch
index 0000000,0000000..9f0d21d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-correct-typo-s-lenght-length.patch
@@@ -1,0 -1,0 +1,48 @@@
++From 325ce80f72596e81c77561b0f942498886164688 Mon Sep 17 00:00:00 2001
++From: Bodo-Merle Sandor <sbodomerle at gmail.com>
++Date: Sun, 28 Aug 2016 13:45:42 +0200
++Subject: [PATCH] correct typo s/lenght/length/
++
++---
++ ext/exception.cpp | 2 +-
++ tango/device_server.py | 4 ++--
++ 2 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/ext/exception.cpp b/ext/exception.cpp
++index 3bb4ce3..703af8a 100644
++--- a/ext/exception.cpp
+++++ b/ext/exception.cpp
++@@ -27,7 +27,7 @@ const char *non_string_seq = "Parameter must be a non string sequence "
++
++ const char *non_valid_image = "Parameter must be an IMAGE. This is a sequence"
++ " of sequences (with all the sub-sequences having"
++- " the same lenght) or a bidimensional numpy.array";
+++ " the same length) or a bidimensional numpy.array";
++
++ const char *non_valid_spectrum = "Parameter must be an SPECTRUM. This is a"
++ " sequence of scalar values or a unidimensional"
++diff --git a/tango/device_server.py b/tango/device_server.py
++index c00e8da..c979289 100644
++--- a/tango/device_server.py
+++++ b/tango/device_server.py
++@@ -1570,7 +1570,7 @@ def __doc_Attribute():
++ can be any type of FLAT sequence of elements compatible with the
++ attribute type.
++ In the new form (without dim_x or dim_y) data should be any
++- sequence for SPECTRUM and a SEQUENCE of equal-lenght SEQUENCES
+++ sequence for SPECTRUM and a SEQUENCE of equal-length SEQUENCES
++ for IMAGE attributes.
++ The recommended sequence is a C continuous and aligned numpy
++ array, as it can be optimized.
++@@ -1596,7 +1596,7 @@ def __doc_Attribute():
++ can be any type of FLAT sequence of elements compatible with the
++ attribute type.
++ In the new form (without dim_x or dim_y) data should be any
++- sequence for SPECTRUM and a SEQUENCE of equal-lenght SEQUENCES
+++ sequence for SPECTRUM and a SEQUENCE of equal-length SEQUENCES
++ for IMAGE attributes.
++ The recommended sequence is a C continuous and aligned numpy
++ array, as it can be optimized.
++--
++2.9.3
++
diff --cc debian/patches/0002-Use-jquery-from-the-archive.patch
index 0000000,0000000..5321271
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-jquery-from-the-archive.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 3f223a28f97eeb30a2543abe9130ef82bf1df14d Mon Sep 17 00:00:00 2001
++From: Bodo-Merle Sandor <sbodomerle at gmail.com>
++Date: Tue, 30 Aug 2016 20:21:51 +0200
++Subject: [PATCH] Use jquery from the archive
++
++---
++ doc/_templates/index.html | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/doc/_templates/index.html b/doc/_templates/index.html
++index b71ff99..6ccefde 100644
++--- a/doc/_templates/index.html
+++++ b/doc/_templates/index.html
++@@ -1,7 +1,7 @@
++ {% extends "layout.html" %}
++ {% set title = 'PyTango documentation' %}
++
++-{% set script_files = script_files + ["http://code.jquery.com/jquery-1.9.1.min.js",
+++{% set script_files = script_files + ["_static/jquery.js",
++ "_static/jssor.js",
++ "_static/jssor.slider.js"] %}
++
++--
++2.9.3
++
diff --cc debian/patches/series
index 586daea,0000000..bcd1482
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
- 0001-Fix-syntax-error-in-python-3.patch
++0001-correct-typo-s-lenght-length.patch
++0002-Use-jquery-from-the-archive.patch
diff --cc debian/python-tango-doc.doc-base
index b4836e5,0000000..ad09fc1
mode 100644,000000..100644
--- a/debian/python-tango-doc.doc-base
+++ b/debian/python-tango-doc.doc-base
@@@ -1,9 -1,0 +1,9 @@@
+Document: pytango-manual
+Title: PyTango documentation manual
+Author: Tiago Coutinho <tcoutinho at cells.es>
+Abstract: PyTango is the Python binding of the Tango Control System C++ libraries.
+Section: Text
+
+Format: HTML
- Index: /usr/share/doc/python-pytango-doc/html/index.html
- Files: /usr/share/doc/python-pytango-doc/html/*
++Index: /usr/share/doc/python-tango-doc/html/index.html
++Files: /usr/share/doc/python-tango-doc/html/*
diff --cc debian/python-tango-doc.docs
index 8ed30c1,0000000..8ed30c1
mode 100644,000000..100644
--- a/debian/python-tango-doc.docs
+++ b/debian/python-tango-doc.docs
diff --cc debian/python-tango.pydist
index 0000000,0000000..b8b0863
new file mode 100644
--- /dev/null
+++ b/debian/python-tango.pydist
@@@ -1,0 -1,0 +1,1 @@@
++pytango python-tango; PEP386
diff --cc debian/python3-tango.pydist
index 0000000,0000000..1b3ca9c
new file mode 100644
--- /dev/null
+++ b/debian/python3-tango.pydist
@@@ -1,0 -1,0 +1,1 @@@
++pytango python3-tango; PEP386
diff --cc debian/rules
index d04e851,0000000..640a49c
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,41 -1,0 +1,24 @@@
+#!/usr/bin/make -f
+
- PYTHON2=$(shell pyversions -vr)
- PYTHON3=$(shell py3versions -vr)
++export PYBUILD_NAME=tango
++export PYBUILD_INSTALL_ARGS_python2=--install-html=$(CURDIR)/debian/python-tango-doc/usr/share/doc/python-tango-doc/html
+
+%:
- dh $@ --with python2,python3
++ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
- build-python%:
- python$* setup.py build
-
- override_dh_auto_build: $(PYTHON3:%=build-python%)
- dh_auto_build
-
-
- install-python%:
- python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb --install-html=$(CURDIR)/debian/python-pytango-doc/usr/share/doc/python-pytango-doc/html
- # install itango3
- mv $(CURDIR)/debian/tmp/usr/bin/itango $(CURDIR)/debian/tmp/usr/bin/itango3
- # install the ipython >= 0.11 profiles
- install -d $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/IPython/config/profile/tango
- install -p -m644\
- $(CURDIR)/IPython/config/profile/tango/ipython_config.py\
- $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/IPython/config/profile/tango
- dh_numpy3
-
- override_dh_auto_install: $(PYTHON3:%=install-python%)
- dh_auto_install -- --install-html=$(CURDIR)/debian/python-pytango-doc/usr/share/doc/python-pytango-doc/html
++override_dh_auto_install:
++ dh_auto_install -O--buildsystem=pybuild
+ dh_numpy
++ dh_numpy3
+
+override_dh_installdocs:
+ dh_installdocs
- ifneq (,$(filter python-pytango-doc, $(shell dh_listpackages)))
++ifneq (,$(filter python-tango-doc, $(shell dh_listpackages)))
+ # add the - for backport where dh_sphinxdoc is not available
- -dh_sphinxdoc -ppython-pytango-doc
++ -dh_sphinxdoc -ppython-tango-doc
+endif
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+ rm -rf *.egg-info
--
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