The branch, build-main has been updated via 25c6b915e42d3f6d00a889fba5bb803f8d34576a (commit) via 90e379f58839e4b757f73af72fb263b08bc0138a (commit) from 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 ++++++++ nsis_template.py | 17 +++++++++++++++++ pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/messages.py | 2 +- setup.py | 4 ++-- 5 files changed, 29 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4a03674..f899d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.2.0.3): + - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py + and nsis_template.py. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/nsis_template.py b/nsis_template.py index 3c6ce10..f3de719 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -1,6 +1,23 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + NSIS_SCRIPT_TEMPLATE = """ ;{program_name}.nsi ; diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 411c05d..ef6fd76 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.0.2' +__VERSION__ = '0.2.0.3' from frontend import * diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 95a0a43..ffb9577 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Contributors to the code of this programme: # Dick Kniep <dick.kniep@lindix.nl> diff --git a/setup.py b/setup.py index 8aeceee..abb5df2 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # import the PyHoca-GUI import sys hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).