diff -Nru epoptes-21.02/debian/changelog epoptes-22.01/debian/changelog --- epoptes-21.02/debian/changelog 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/debian/changelog 2022-01-22 07:51:50.000000000 +0000 @@ -1,8 +1,23 @@ -epoptes (21.02-1+202201131659~ubuntu21.04.1) hirsute; urgency=low +epoptes (22.01-1~ubuntu21.04.1) hirsute; urgency=low * Auto build. - -- Alkis Georgopoulos Thu, 13 Jan 2022 17:01:00 +0000 + -- Alkis Georgopoulos Sat, 22 Jan 2022 07:51:50 +0000 + +epoptes (22.01-1) unstable; urgency=medium + + * Update help menu URLs (#150) + * Avoid reconnections with realvnc (#149) + * Broadcast only the first monitor (#144) + * Update VNC viewer support (#140) + * Revert 61df1f to allow setting SERVER and WOL (#148) + * Apply setup.py patch from AUR for Arch Linux (#141) + * Update debian/watch according to uscan manpage + * Rename master branch to main (#133) + * Import translations from launchpad + * Add epoptes.desktop.in to POTFILES.in (#131) + + -- Alkis Georgopoulos Sat, 22 Jan 2022 09:20:17 +0200 epoptes (21.02-1) unstable; urgency=medium diff -Nru epoptes-21.02/debian/git-build-recipe.manifest epoptes-22.01/debian/git-build-recipe.manifest --- epoptes-21.02/debian/git-build-recipe.manifest 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/debian/git-build-recipe.manifest 2022-01-22 07:51:50.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debversion}+202201131659 -lp:epoptes git-commit:63fc468681b7283f9f3c075f31faf624629dc775 +# git-build-recipe format 0.4 deb-version {debversion} +lp:epoptes git-commit:cac36412242d1f3fa9227e92db478befb09bbe5f diff -Nru epoptes-21.02/epoptes/ui/gui.py epoptes-22.01/epoptes/ui/gui.py --- epoptes-21.02/epoptes/ui/gui.py 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/epoptes/ui/gui.py 2022-01-22 07:51:50.000000000 +0000 @@ -1,13 +1,11 @@ #!/usr/bin/python3 # This file is part of Epoptes, https://epoptes.org -# Copyright 2010-2020 the Epoptes team, see AUTHORS. +# Copyright 2010-2022 the Epoptes team, see AUTHORS. # SPDX-License-Identifier: GPL-3.0-or-later """ Epoptes GUI class. """ from distutils.version import LooseVersion -import getpass -import locale import os import pipes import random @@ -469,11 +467,11 @@ def on_imi_help_report_bug_activate(self, _widget): """Handle imi_help_report_bug.activate event.""" - self.open_url("https://bugs.launchpad.net/epoptes") + self.open_url("https://github.com/epoptes/epoptes/issues") def on_imi_help_ask_question_activate(self, _widget): """Handle imi_help_ask_question.activate event.""" - self.open_url("https://answers.launchpad.net/epoptes") + self.open_url("https://github.com/epoptes/epoptes/discussions") def on_imi_help_translate_application_activate(self, _widget): """Handle imi_help_translate_application.activate event.""" @@ -481,11 +479,7 @@ def on_imi_help_live_chat_irc_activate(self, _widget): """Handle imi_help_live_chat_irc.activate event.""" - host = socket.gethostname() - user = getpass.getuser() - lang = locale.getlocale()[0] - self.open_url("http://ts.sch.gr/repo/irc?user=%s&host=%s&lang=%s" % - (user, host, lang)) + self.open_url("https://ltsp.org/advanced/chat-room") @staticmethod def on_imi_help_remote_support_activate(_widget): diff -Nru epoptes-21.02/po/de.po epoptes-22.01/po/de.po --- epoptes-21.02/po/de.po 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/po/de.po 2022-01-22 07:51:50.000000000 +0000 @@ -8,18 +8,18 @@ "Project-Id-Version: epoptes\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2021-02-04 18:35+0200\n" -"PO-Revision-Date: 2021-01-21 13:43+0000\n" +"PO-Revision-Date: 2021-02-07 18:47+0000\n" "Last-Translator: fred \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-02-05 04:43+0000\n" +"X-Launchpad-Export-Date: 2021-02-08 04:46+0000\n" "X-Generator: Launchpad (build 3d7abcb776ec05aa0a89112accc21bf8b41dfc24)\n" #: ../data/epoptes.desktop.in.h:1 msgid "Epoptes computer lab administration tool" -msgstr "Admin-Werkzeug für Epoptes-basiertes PC-Labor" +msgstr "Verwaltungsprogramm für Computerräume" #: ../epoptes-client/lock_screen.py:92 ../epoptes/ui/gui.py:400 msgid "The screen is locked by a system administrator." diff -Nru epoptes-21.02/po/es.po epoptes-22.01/po/es.po --- epoptes-21.02/po/es.po 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/po/es.po 2022-01-22 07:51:50.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: epoptes\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2021-02-04 18:35+0200\n" -"PO-Revision-Date: 2019-04-20 16:04+0000\n" +"PO-Revision-Date: 2021-04-27 20:58+0000\n" "Last-Translator: Pompilos \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-02-05 04:43+0000\n" -"X-Generator: Launchpad (build 3d7abcb776ec05aa0a89112accc21bf8b41dfc24)\n" +"X-Launchpad-Export-Date: 2021-04-28 07:13+0000\n" +"X-Generator: Launchpad (build f9f562f07f129de414c16be22a405ff0964e0018)\n" #: ../data/epoptes.desktop.in.h:1 msgid "Epoptes computer lab administration tool" @@ -27,7 +27,7 @@ #: ../epoptes-client/message.py:53 msgid "Usage: {} text [title] [markup] [icon_name]" -msgstr "" +msgstr "Uso: {} texto [título] [marca] [nombre_icono]" #: ../epoptes-client/remote_assistance.py:90 #: ../epoptes-client/remote_assistance.py:122 @@ -96,7 +96,7 @@ #: ../epoptes-client/thumbshot.py:48 msgid "Usage: {} width height" -msgstr "" +msgstr "Uso: {} ancho alto" #: ../epoptes/common/config.py:191 msgid "Message from administrator" @@ -162,7 +162,7 @@ #: ../epoptes/ui/gtk/about.ui.h:1 msgid "Copyright © 2010+ The Epoptes Team" -msgstr "" +msgstr "Copyright © 2010+ El equipo Epoptes" #: ../epoptes/ui/gtk/about.ui.h:2 msgid "A computer lab management and monitoring tool." @@ -599,11 +599,11 @@ #: ../epoptes/ui/gui.py:128 msgid "Failed to read the groups file:" -msgstr "" +msgstr "No se ha podido leer el archivo de grupos:" #: ../epoptes/ui/gui.py:130 msgid "You may need to restore your groups from a backup!" -msgstr "" +msgstr "¡Tal vez debas restaurar los grupos desde una copia de seguridad!" #: ../epoptes/ui/gui.py:237 msgid "Are you sure you want to log off all the users?" diff -Nru epoptes-21.02/po/pt_BR.po epoptes-22.01/po/pt_BR.po --- epoptes-21.02/po/pt_BR.po 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/po/pt_BR.po 2022-01-22 07:51:50.000000000 +0000 @@ -8,42 +8,42 @@ "Project-Id-Version: epoptes\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2021-02-04 18:35+0200\n" -"PO-Revision-Date: 2019-05-30 20:34+0000\n" +"PO-Revision-Date: 2021-10-28 14:35+0000\n" "Last-Translator: Leo \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2021-02-05 04:43+0000\n" -"X-Generator: Launchpad (build 3d7abcb776ec05aa0a89112accc21bf8b41dfc24)\n" +"X-Launchpad-Export-Date: 2021-10-29 07:14+0000\n" +"X-Generator: Launchpad (build 0d8de2bfee2024772b3040d4d19f42f47395ac0d)\n" #: ../data/epoptes.desktop.in.h:1 msgid "Epoptes computer lab administration tool" -msgstr "Ferramenta de administração de laboratórios de informática Epoptes" +msgstr "EPOPTES Ferramenta de Administração de Laboratório de Informática" #: ../epoptes-client/lock_screen.py:92 ../epoptes/ui/gui.py:400 msgid "The screen is locked by a system administrator." -msgstr "A tela está bloqueada por um administrador do sistema." +msgstr "Bloqueado pelo Administrador do Laboratório" #: ../epoptes-client/message.py:53 msgid "Usage: {} text [title] [markup] [icon_name]" -msgstr "" +msgstr "Uso: {} texto [titulo] [marcação] [nome_icone]" #: ../epoptes-client/remote_assistance.py:90 #: ../epoptes-client/remote_assistance.py:122 #: ../epoptes-client/remote_assistance.ui.h:9 msgid "Not connected" -msgstr "Não conectado" +msgstr "Náo está Conectado" #: ../epoptes-client/remote_assistance.py:114 #, python-format msgid "Connecting to %s..." -msgstr "Conectando com %s..." +msgstr "Conectando à %s..." #: ../epoptes-client/remote_assistance.py:119 #, python-format msgid "Connected to %s" -msgstr "Conectado a %s" +msgstr "Conectado à %s" #: ../epoptes-client/remote_assistance.py:126 #, python-format diff -Nru epoptes-21.02/po/README.md epoptes-22.01/po/README.md --- epoptes-21.02/po/README.md 2022-01-13 17:01:00.000000000 +0000 +++ epoptes-22.01/po/README.md 2022-01-22 07:51:50.000000000 +0000 @@ -1,29 +1,41 @@ # Internationalization notes -When new translatable files are added in the source code, POTFILES.in should be regenerated, using the following command: +When new translatable files are added in the source code, POTFILES.in should be +regenerated, using the following commands: ```shell - # Be outside the po directory - test -f "po/POTFILES.in" || exit 1 - ( - echo '[encoding: UTF-8]' - find * -name '*.py' -o -name '*.ui' -o -name '[a-z.]*.in'| sort | sed 's|.*.ui$|\[type: gettext/glade\]&|' - ) >po/POTFILES.in +# Be outside the po directory +test -f "po/POTFILES.in" || exit 1 +{ + echo '[encoding: UTF-8]' + find * -name '*.py' -o -name '*.ui' -o -name '[a-z.]*.in'| sort | sed 's|.*.ui$|\[type: gettext/glade\]&|' +} >po/POTFILES.in ``` -This is because when the package is being built, `setup.py build` and specifically /usr/lib/python3/dist-packages/DistUtilsExtra/command/build_i18n.py calls `intltool-update -p -g epoptes`, which, when POTFILES.in isn't provided, generates an unsorted file list, which results in .pot and .po files with very large .diffs. +This is because when the package is being built, `setup.py build` (specifically +/usr/lib/python3/dist-packages/DistUtilsExtra/command/build_i18n.py) calls +`intltool-update -p -g epoptes`, which, when POTFILES.in isn't provided, +generates an unsorted file list, which results in .pot and .po files with very +large .diffs. + +[Debian suggests](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792687#30) +that .pot and .po file preparation is an upstream and not a packaging task and +they shouldn't be regenerated as part of the build process. We can do the +upstream part but we currently cannot avoid the .pot regeneration, which might +affect reproducible builds. -Note that [Debian recommends](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792687#30) that .pot and .po file preparation is an upstream and not a packaging task and they shouldn't be regenerated as part of the build process. We can do the upstream part but we currently cannot avoid the .pot regeneration, which might affect reproducible builds. - -So when new strings are added in the source code, we should regenerate the .pot file using one of the following commands: +So when new strings are added in the source code, we should regenerate the .pot +file using one of the following commands: ```shell - # Be inside the po directory - test -f "POTFILES.in" || exit 1 - intltool-update -p -g epoptes +# Be inside the po directory +test -f "POTFILES.in" || exit 1 +intltool-update -p -g epoptes ``` -Note that we shouldn't regenerate or merge the .po files as they're handled by https://translations.launchpad.net/epoptes. We should only download them from launchpad periodically. The following commands may be used for that: +Note that we shouldn't regenerate or merge the .po files as they're handled by +. We should only download them from +launchpad periodically. The following commands may be used for that: ```shell bzr branch lp:~epoptes/epoptes/exported-translations