[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 3 commits: d/patches: Remove unneeded patches
Roger Shimizu (@rosh)
rosh at debian.org
Mon Jan 16 07:32:39 GMT 2023
Roger Shimizu pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher
Commits:
3e16d52e by Roger Shimizu at 2023-01-15T22:59:26-08:00
d/patches: Remove unneeded patches
- - - - -
09dc3606 by Roger Shimizu at 2023-01-15T23:02:06-08:00
d/patches: Update po/02 patch to remove more deprecated "modem sound"
- - - - -
102a13a5 by Roger Shimizu at 2023-01-15T23:04:10-08:00
d/patches: Refresh patches
- - - - -
9 changed files:
- debian/changelog
- debian/patches/03-Remove-use-of-deprecated-platform.dist-fixes-446.patch → debian/patches/01-Remove-use-of-deprecated-platform.dist-fixes-446.patch
- − debian/patches/01-show-gui-only-if-tbb-not-installed.patch
- debian/patches/06-Update-apparmor-profile.patch → debian/patches/02-Update-apparmor-profile.patch
- debian/patches/09-Remove-extra-override-for-X11-sockets.patch → debian/patches/03-Remove-extra-override-for-X11-sockets.patch
- − debian/patches/05-fix-failure-in-detect-installed-torbrowser.patch
- − debian/patches/12-Fix-strict-parameters-for-gui.move.patch
- debian/patches/po/02-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+torbrowser-launcher (0.3.6-2) UNRELEASED; urgency=medium
+
+ * debian/patches:
+ - Remove unneeded patches.
+ - Update po/02 patch to remove more deprecated "modem sound".
+ - Refresh patches.
+
+ -- Roger Shimizu <rosh at debian.org> Sun, 15 Jan 2023 22:58:14 -0800
+
torbrowser-launcher (0.3.6-1) unstable; urgency=medium
[ Debian Janitor ]
=====================================
debian/patches/03-Remove-use-of-deprecated-platform.dist-fixes-446.patch → debian/patches/01-Remove-use-of-deprecated-platform.dist-fixes-446.patch
=====================================
@@ -11,7 +11,7 @@ is no longer necessary, so just remove the use altogether.
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/setup.py b/setup.py
-index 4e06e60..0b71b8e 100644
+index 8d8fa7d..0b259aa 100644
--- a/setup.py
+++ b/setup.py
@@ -74,24 +74,22 @@ for root, dirs, files in os.walk(SHARE):
=====================================
debian/patches/01-show-gui-only-if-tbb-not-installed.patch deleted
=====================================
@@ -1,33 +0,0 @@
-From: troubadoour <trobador at riseup.net>
-Date: Tue, 27 Mar 2018 18:19:26 -0400
-Subject: show gui only if tbb not installed
-Origin: https://github.com/troubadoour/torbrowser-launcher/commit/1402015487db5559847492ca294ac6c895245dca
-
-Added since [419e5f7] to fix the extra dialog issue
----
- torbrowser_launcher/__init__.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
-index 115fd4f..5d56e48 100644
---- a/torbrowser_launcher/__init__.py
-+++ b/torbrowser_launcher/__init__.py
-@@ -37,6 +37,8 @@ from .common import Common, SHARE
- from .settings import Settings
- from .launcher import Launcher
-
-+# Allow ctrl-c to work
-+signal.signal(signal.SIGINT, signal.SIG_DFL)
-
- class Application(QtWidgets.QApplication):
- """
-@@ -82,6 +84,9 @@ def main():
- if settings:
- # Settings mode
- gui = Settings(common, app)
-+ gui.show()
-+ sys.exit(app.exec_())
-+
- else:
- # Launcher mode
- gui = Launcher(common, app, url_list)
=====================================
debian/patches/06-Update-apparmor-profile.patch → debian/patches/02-Update-apparmor-profile.patch
=====================================
@@ -8,10 +8,10 @@ Subject: Update apparmor profile
2 files changed, 2 insertions(+)
diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 6882f9d..e682d07 100644
+index 85a0d82..fa754b0 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
-@@ -93,6 +93,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -99,6 +99,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
/usr/share/gnome/applications/ r,
/usr/share/gnome/applications/kde4/ r,
/usr/share/poppler/cMap/ r,
=====================================
debian/patches/09-Remove-extra-override-for-X11-sockets.patch → debian/patches/03-Remove-extra-override-for-X11-sockets.patch
=====================================
=====================================
debian/patches/05-fix-failure-in-detect-installed-torbrowser.patch deleted
=====================================
@@ -1,47 +0,0 @@
-From: Marcelo Soares Mota <motasmarcelo at gmail.com>
-Date: Sat, 20 Feb 2021 21:14:12 -0300
-Subject: fix failure in detect installed torbrowser
-
-I believe i found an issue with the launcher (somehow related with #842021)
-
-It happens that though the launcher works it doesn't detect torbrowser
-as installed. It causes two issues:
- - The 'Settings' window points status as Not Installed;
- - The 'Browser launcher' keeps running the routines to download and
-verify the 'first installation'.
-
-I realized that reload the settings after rebuilding paths makes the
-launcher works as expected.
-
-Plus, load_settings() is not checking changes at 'installed' directive
-to rewrite the settings file ('settings.json').
-
-Closes: #983198
----
- torbrowser_launcher/common.py | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
-index 6623c0c..fe4607c 100644
---- a/torbrowser_launcher/common.py
-+++ b/torbrowser_launcher/common.py
-@@ -65,6 +65,7 @@ class Common(object):
- self.load_mirrors()
- self.load_settings()
- self.build_paths()
-+ self.load_settings()
- self.mkdir(self.paths["download_dir"])
- self.mkdir(self.paths["tbb"]["dir"])
- self.init_gnupg()
-@@ -335,7 +336,10 @@ class Common(object):
- resave = False
-
- # detect installed
-- settings["installed"] = os.path.isfile(self.paths["tbb"]["start"])
-+ installed = os.path.isfile(self.paths["tbb"]["start"])
-+ if settings["installed"] != installed:
-+ settings["installed"] = installed
-+ resave = True
-
- # make sure settings file is up-to-date
- for setting in default_settings:
=====================================
debian/patches/12-Fix-strict-parameters-for-gui.move.patch deleted
=====================================
@@ -1,24 +0,0 @@
-From: Erik Johnson <github at ekriirke.net>
-Date: Sat, 4 Sep 2021 00:34:50 +0200
-Subject: Fix strict parameters for gui.move
-
-(cherry picked from commit bcd65bdd45cb45efd568ed911b009665b061ac9e)
----
- torbrowser_launcher/__init__.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/torbrowser_launcher/__init__.py b/torbrowser_launcher/__init__.py
-index 5d56e48..88448e0 100644
---- a/torbrowser_launcher/__init__.py
-+++ b/torbrowser_launcher/__init__.py
-@@ -95,8 +95,8 @@ def main():
- desktop = app.desktop()
- window_size = gui.size()
- gui.move(
-- (desktop.width() - window_size.width()) // 2,
-- (desktop.height() - window_size.height()) // 2,
-+ int((desktop.width() - window_size.width()) // 2),
-+ int((desktop.height() - window_size.height()) // 2),
- )
- gui.show()
-
=====================================
debian/patches/po/02-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
=====================================
@@ -9,9 +9,11 @@ Origin: https://bugs.debian.org/913151
po/fr.po | 8 --------
po/hu.po | 7 -------
po/nl.po | 3 ---
+ po/pt_BR.po | 8 --------
po/ru.po | 7 -------
+ po/sv.po | 8 --------
share/metainfo/torbrowser.appdata.xml | 1 -
- 7 files changed, 34 deletions(-)
+ 9 files changed, 50 deletions(-)
diff --git a/README.md b/README.md
index 3e5a4ad..4f42a08 100644
@@ -111,6 +113,31 @@ index 2f89e3a..ddca8b9 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Voor deze optie moet python-pygame geïnstalleerd zijn"
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index f81f21b..9b60394 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -288,11 +288,6 @@ msgstr "Salvar && Sair"
+ #~ "Você pode estar sob ataque, ou pode haver apenas um problema de rede. "
+ #~ "Clique em Iniciar para tentar baixar novamente."
+
+-#~ msgid ""
+-#~ "The python-pygame package is missing, the modem sound is unavailable."
+-#~ msgstr ""
+-#~ "O pacote python-pygame está faltando, o som do modem não está disponível."
+-
+ #~ msgid ""
+ #~ "This option is only available when using a system wide Tor installation."
+ #~ msgstr ""
+@@ -301,8 +296,5 @@ msgstr "Salvar && Sair"
+ #~ msgid "This option requires the python-txsocksx package."
+ #~ msgstr "Esta opção precisa do pacote python-txsocksx"
+
+-#~ msgid "Play modem sound, because Tor is slow :]"
+-#~ msgstr "Reproduzir som do modem, porque o Tor é lento :]"
+-
+ #~ msgid "This option requires python-pygame to be installed"
+ #~ msgstr "Esta opção precisa do pacote python-pygame"
diff --git a/po/ru.po b/po/ru.po
index e4d5dc3..a9d0a37 100644
--- a/po/ru.po
@@ -135,8 +162,33 @@ index e4d5dc3..a9d0a37 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Эта опция требует установленный python-pygame"
+diff --git a/po/sv.po b/po/sv.po
+index 385e2be..672da78 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -285,11 +285,6 @@ msgstr "Spara && avsluta"
+ #~ "Du kan vara under attack, eller det kan bara vara ett nätverksproblem. "
+ #~ "Klicka på Start för försöka hämta igen."
+
+-#~ msgid ""
+-#~ "The python-pygame package is missing, the modem sound is unavailable."
+-#~ msgstr ""
+-#~ "Python-pygame-paketet saknas, modemljudet är otillgängligt."
+-
+ #~ msgid ""
+ #~ "This option is only available when using a system wide Tor installation."
+ #~ msgstr ""
+@@ -299,8 +294,5 @@ msgstr "Spara && avsluta"
+ #~ msgid "This option requires the python-txsocksx package."
+ #~ msgstr "Det här alternativet kräver python-txsocksx-paketet."
+
+-#~ msgid "Play modem sound, because Tor is slow :]"
+-#~ msgstr "Spela modemljud, eftersom Tor är långsamt :]"
+-
+ #~ msgid "This option requires python-pygame to be installed"
+ #~ msgstr "Det här alternativet kräver att python-pygame installeras"
diff --git a/share/metainfo/torbrowser.appdata.xml b/share/metainfo/torbrowser.appdata.xml
-index 0fb3250..ea868b2 100644
+index fe0ab9e..efdaf2d 100644
--- a/share/metainfo/torbrowser.appdata.xml
+++ b/share/metainfo/torbrowser.appdata.xml
@@ -16,7 +16,6 @@
=====================================
debian/patches/series
=====================================
@@ -1,9 +1,6 @@
po/01-Update-Hungarian-translation.patch
po/02-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
po/03-Add-Chinese-Traditional-translation.patch
-01-show-gui-only-if-tbb-not-installed.patch
-03-Remove-use-of-deprecated-platform.dist-fixes-446.patch
-05-fix-failure-in-detect-installed-torbrowser.patch
-06-Update-apparmor-profile.patch
-09-Remove-extra-override-for-X11-sockets.patch
-12-Fix-strict-parameters-for-gui.move.patch
+01-Remove-use-of-deprecated-platform.dist-fixes-446.patch
+02-Update-apparmor-profile.patch
+03-Remove-extra-override-for-X11-sockets.patch
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/e05b000b589452a10883577bd5dbf3b0576f89d7...102a13a5477914498324ba0a24e3a63f10b59f18
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/e05b000b589452a10883577bd5dbf3b0576f89d7...102a13a5477914498324ba0a24e3a63f10b59f18
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20230116/65031971/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list