This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 0c1a4acf1b9493fe291e58b5e46a81ae8f882e0c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 4 14:17:15 2019 +0100 Refer to https:// URLs wherever possible. --- COPYING | 6 +++--- README | 2 +- README.Unity | 2 +- README.i18n | 2 +- TODO | 2 +- debian/changelog | 1 + debian/control | 4 ++-- debian/copyright | 6 +++--- debian/watch | 2 +- man/man1/pyhoca-gui.1 | 2 +- nsis_template.py | 2 +- pyhoca-gui.spec | 4 ++-- pyhoca/wxgui/brokerlogon.py | 2 +- setup.py | 2 +- update-po.sh | 2 +- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/COPYING b/COPYING index dba13ed..be3f7b2 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -643,7 +643,7 @@ the "copyright" line and a pointer to where the full notice is found. 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, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. +<https://www.gnu.org/licenses/>. diff --git a/README b/README index beeaa9c..6fdcddc 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ pyhoca-gui - Copyright (C) 2010-2019 by Mike Gabriel <mike.gabriel@das-netzwerkt Copyright (C) 2010-2016 by Dick Kniep <dick.kniep@lindix.nl> Published under the terms of the GNU Affero General Public License. -See http://www.gnu.org/licenses/agpl.html for a recent copy. +See https://www.gnu.org/licenses/agpl.html for a recent copy. === What is pyhoca-gui? === diff --git a/README.Unity b/README.Unity index 8e511e8..7342446 100644 --- a/README.Unity +++ b/README.Unity @@ -2,7 +2,7 @@ pyhoca-gui - Copyright (C) 2010-2019 by Mike Gabriel <mike.gabriel@das-netzwerkt Copyright (C) 2010-2016 by Dick Kniep <dick.kniep@lindix.nl> Published under the terms of the GNU Affero General Public License. -See http://www.gnu.org/licenses/agpl.html for a recent copy. +See https://www.gnu.org/licenses/agpl.html for a recent copy. === The PyHoca-GUI icon does not appear on Unity (Ubuntu 12.04 or later)? === diff --git a/README.i18n b/README.i18n index e8e69e8..5124b77 100644 --- a/README.i18n +++ b/README.i18n @@ -16,7 +16,7 @@ THANKS!!! for the time you give to the X2Go project. And, if you are new to the team and language files for the language you want to feel responsible for do not yet exist, please subscribe to this mailing list first: - http://lists.x2go.org/listinfo/x2go-i18n + https://lists.x2go.org/listinfo/x2go-i18n Once you are subscribed, send an email to diff --git a/TODO b/TODO index 1f7dd12..588d109 100644 --- a/TODO +++ b/TODO @@ -2,7 +2,7 @@ pyhoca-gui - Copyright (C) 2010-2019 by Mike Gabriel <mike.gabriel@das-netzwerkt Copyright (C) 2010-2016 by Dick Kniep <dick.kniep@lindix.nl> Published under the terms of the GNU Affero General Public License. -See http://www.gnu.org/licenses/gpl.html for a recent copy. +See https://www.gnu.org/licenses/gpl.html for a recent copy. === pyhoca-gui TODOs === diff --git a/debian/changelog b/debian/changelog index 73bf75b..21f5468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ pyhoca-gui (0.5.0.8-0x2go1) UNRELEASED; urgency=medium - po/: Update translation files. - po/de.po: Update German translation. - Happy New Year! + - Refer to https:// URLs wherever possible. -- X2Go Release Manager <git-admin@x2go.org> Sun, 24 Sep 2017 11:28:17 +0200 diff --git a/debian/control b/debian/control index cc12bd4..8fc18b9 100644 --- a/debian/control +++ b/debian/control @@ -15,9 +15,9 @@ Build-Depends: python-distutils-extra, gnome-colors-common, Standards-Version: 3.9.6 -Homepage: http://code.x2go.org/releases/source/pyhoca-gui +Homepage: https://code.x2go.org/releases/source/pyhoca-gui Vcs-Git: git://code.x2go.org/pyhoca-gui.git -Vcs-Browser: http://code.x2go.org/gitweb/?p=pyhoca-gui.git;a=summary +Vcs-Browser: https://code.x2go.org/gitweb/?p=pyhoca-gui.git;a=summary X-Python-Version: >= 2.6 Package: pyhoca-gui diff --git a/debian/copyright b/debian/copyright index e2e4316..c87edf9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -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: PyHoca-GUI Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Source: http://wiki.x2go.org +Source: https://wiki.x2go.org Files: * Copyright: 2010-2019, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> @@ -78,7 +78,7 @@ License: AGPL-3+ GNU AFFERO GENERAL PUBLIC LICENSE Version 3, 19 November 2007 . - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. . diff --git a/debian/watch b/debian/watch index 685b078..75223fa 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-(.+)\.tar\.gz +https://code.x2go.org/releases/source/pyhoca-gui/pyhoca-gui-(.+)\.tar\.gz diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 6d638d7..14148ff 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -131,7 +131,7 @@ Set the DISPLAY environment variable to <hostname>:<screennumber>. In case you want to retrieve X2Go session profiles from an X2Go Session Broker use the following options: .TP \*(T<\fB\-\-broker\-url=<URL>\fR\*(T> -Specify the <URL> of the X2Go Session Broker. \fBpyhoca\-gui\fR can access http:// and ssh:// style URLs. +Specify the <URL> of the X2Go Session Broker. \fBpyhoca\-gui\fR can access http(s):// and ssh:// style URLs. Syntax of <URL> for HTTP brokerage: diff --git a/nsis_template.py b/nsis_template.py index 5738671..131901b 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -350,7 +350,7 @@ Section "$STARTMENU_LINKS" CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO).lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} (debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO, debug).lnk" "$INSTDIR\\{program_name}.exe" "--debug --libdebug --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 - CreateShortCut "$SMPROGRAMS\\{program_name}\\X2Go Website.lnk" "http://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0 + CreateShortCut "$SMPROGRAMS\\{program_name}\\X2Go Website.lnk" "https://www.x2go.org" "" "$INSTDIR\\icons\\pyhoca_x2go-logo-ubuntu.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\Uninstall.lnk" "$INSTDIR\\uninstall.exe" "" "$INSTDIR\\uninstall.exe" 0 SectionEnd diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec index 9ca5c7f..6a5cf5d 100644 --- a/pyhoca-gui.spec +++ b/pyhoca-gui.spec @@ -9,8 +9,8 @@ License: AGPL-3.0+ %else License: AGPLv3+ %endif -URL: http://www.x2go.org/ -Source0: http://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz +URL: https://www.x2go.org/ +Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch %if 0%{?suse_version} diff --git a/pyhoca/wxgui/brokerlogon.py b/pyhoca/wxgui/brokerlogon.py index 4454999..b86e236 100644 --- a/pyhoca/wxgui/brokerlogon.py +++ b/pyhoca/wxgui/brokerlogon.py @@ -73,7 +73,7 @@ class PyHocaGUI_BrokerDialogBoxPassword(wx.Dialog): if self._PyHocaGUI.session_profiles.get_broker_url().upper() in ('HTTP', 'SSH'): self.brokerTxt.SetFocus() if self._PyHocaGUI.session_profiles.get_broker_type() == 'http': - self.brokerTxt.SetValue('http://<host>[:<port>]/json/') + self.brokerTxt.SetValue('http(s)://<host>[:<port>]/json/') self.userTxt.SetValue('<user>') elif self._PyHocaGUI.session_profiles.get_broker_type() == 'ssh': self.brokerTxt.SetValue('ssh://<host>[:<port>]/usr/bin/x2gobroker') diff --git a/setup.py b/setup.py index afeb8c7..ad02cb8 100755 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ UNINSTALL_ICON = "icons\\pyhoca-gui.ico" LICENSE = 'AGPLv3+' AUTHOR = 'Mike Gabriel, Dick Kniep' PUBLISHER = 'X2Go Project' -URL = 'http://www.x2go.org' +URL = 'https://www.x2go.org' LIBRARY_ZIP = r"lib\shardlib.zip" if platform.system() == 'Windows': diff --git a/update-po.sh b/update-po.sh index c35479d..513f384 100755 --- a/update-po.sh +++ b/update-po.sh @@ -14,7 +14,7 @@ set -x # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/> +# along with this program. If not, see <https://www.gnu.org/licenses/> GETTEXT_DOMAIN="PyHoca-GUI" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git