[pytango] 08/483: fixes #3284318
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.
commit d1e2da3bd30eea8074f1e5b1bf5da038313099ca
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Mon Apr 11 15:37:50 2011 +0000
fixes #3284318
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@16495 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
PyTango/ipython/__init__.py | 25 +++++++++++++------------
PyTango/ipython/ipy_cli.py | 25 +++++++++++++------------
PyTango/ipython/ipy_install.py | 25 +++++++++++++------------
PyTango/ipython/ipy_qt.py | 25 +++++++++++++------------
PyTango/ipython/ipython.py | 25 +++++++++++++------------
PyTango/ipython/ipython_00_10.py | 25 +++++++++++++------------
doc/conf.py | 25 +++++++++++++------------
doc/revision.rst | 3 ++-
8 files changed, 93 insertions(+), 85 deletions(-)
diff --git a/PyTango/ipython/__init__.py b/PyTango/ipython/__init__.py
index e56afa1..274bc67 100644
--- a/PyTango/ipython/__init__.py
+++ b/PyTango/ipython/__init__.py
@@ -1,24 +1,25 @@
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
from ipython import *
diff --git a/PyTango/ipython/ipy_cli.py b/PyTango/ipython/ipy_cli.py
index c449165..5237fbf 100644
--- a/PyTango/ipython/ipy_cli.py
+++ b/PyTango/ipython/ipy_cli.py
@@ -1,24 +1,25 @@
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
import re
import StringIO
diff --git a/PyTango/ipython/ipy_install.py b/PyTango/ipython/ipy_install.py
index cc029e7..597a4e8 100644
--- a/PyTango/ipython/ipy_install.py
+++ b/PyTango/ipython/ipy_install.py
@@ -1,26 +1,27 @@
#!/usr/bin/env python
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
import sys
import os
diff --git a/PyTango/ipython/ipy_qt.py b/PyTango/ipython/ipy_qt.py
index e8afe84..0d08165 100644
--- a/PyTango/ipython/ipy_qt.py
+++ b/PyTango/ipython/ipy_qt.py
@@ -1,24 +1,25 @@
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
import operator
import logging
diff --git a/PyTango/ipython/ipython.py b/PyTango/ipython/ipython.py
index c302349..02b9035 100644
--- a/PyTango/ipython/ipython.py
+++ b/PyTango/ipython/ipython.py
@@ -1,24 +1,25 @@
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
try:
import IPython
diff --git a/PyTango/ipython/ipython_00_10.py b/PyTango/ipython/ipython_00_10.py
index 7e1c25f..f32f8d9 100644
--- a/PyTango/ipython/ipython_00_10.py
+++ b/PyTango/ipython/ipython_00_10.py
@@ -1,26 +1,27 @@
#!/usr/bin/env python
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
"""An IPython profile designed to provide a user friendly interface to Tango"""
diff --git a/doc/conf.py b/doc/conf.py
index 914799c..bc4638d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -1,24 +1,25 @@
-#############################################################################
-##
-## This file is part of PyTango, a python binding for Tango
+################################################################################
##
+## This file is part of Taurus, a Tango User Interface Library
+##
## http://www.tango-controls.org/static/PyTango/latest/doc/html/index.html
##
-## (copyleft) CELLS / ALBA Synchrotron, Bellaterra, Spain
-##
-## This is free software; you can redistribute it and/or modify
+## Copyright 2011 CELLS / ALBA Synchrotron, Bellaterra, Spain
+##
+## PyTango 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
+## the Free Software Foundation, either version 3 of the License, or
## (at your option) any later version.
-##
-## This software is distributed in the hope that it will be useful,
+##
+## PyTango 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 program; if not, see <http://www.gnu.org/licenses/>.
-###########################################################################
+## along with PyTango. If not, see <http://www.gnu.org/licenses/>.
+##
+################################################################################
#
# PyTango documentation build configuration file, created by
diff --git a/doc/revision.rst b/doc/revision.rst
index f929c11..980e0d8 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -71,7 +71,8 @@ Version history
| | - from sourceforge: |
| | - 3284174: 7.1.4 does not build with gcc 4.5 and tango 7.2.6 |
| | - 3284265: [pytango][7.1.4] a few files without licence and copyright |
-| | - 3284265: [pytango][7.1.4] a few files without licence and copyright |
+| | - 3284318: copyleft vs copyright |
+
+------------+-------------------------------------------------------------------------------------+
| 7.1.4 | Features: |
| | - from sourceforge: |
--
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