[Pkg-privacy-commits] [Git][pkg-privacy-team/onionshare][debian/sid] 3 commits: Set debian-branch in gbp.conf

[Hefee (@hefee)]

Hefee pushed to branch debian/sid at Privacy Maintainers / onionshare


Commits:
d36ec6fc by Sandro Knauß at 2024-07-19T23:11:05+02:00
Set debian-branch in gbp.conf

- - - - -
bd50f3bd by Sandro Knauß at 2024-07-19T23:40:57+02:00
Add patch to make onionshare to work with Python 3.12

Closes: 1074522

- - - - -
c9dc2b39 by Sandro Knauß at 2024-07-19T23:46:23+02:00
Release to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/gbp.conf
- + debian/patches/0007-Fix-to-work-with-Python-3.12.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+onionshare (2.6.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to make onionshare to work with Python 3.12 (Closes: 1074522)
+
+ -- Sandro Knauß <hefee at debian.org>  Fri, 19 Jul 2024 23:45:57 +0200
+
 onionshare (2.6.2-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/gbp.conf
=====================================
@@ -1,4 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/experimental
+debian-branch = debian/sid
 upstream-branch = master


=====================================
debian/patches/0007-Fix-to-work-with-Python-3.12.patch
=====================================
@@ -0,0 +1,39 @@
+From: =?utf-8?q?Sandro_Knau=C3=9F?= <hefee at debian.org>
+Date: Fri, 19 Jul 2024 23:30:18 +0200
+Subject: Fix to work with Python 3.12.
+
+LooseVersion does not exist anymore, but in our context
+packaging.version.Version is safe to use.
+
+Forwarded: https://github.com/onionshare/onionshare/pull/1907
+---
+ cli/onionshare_cli/onion.py          | 2 +-
+ desktop/onionshare/update_checker.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
+index 6e1dad7..95b5444 100644
+--- a/cli/onionshare_cli/onion.py
++++ b/cli/onionshare_cli/onion.py
+@@ -33,7 +33,7 @@ import tempfile
+ import time
+ import traceback
+ 
+-from distutils.version import LooseVersion as Version
++from packaging.version import Version
+ 
+ 
+ class TorErrorAutomatic(Exception):
+diff --git a/desktop/onionshare/update_checker.py b/desktop/onionshare/update_checker.py
+index a4654c6..b2b034a 100644
+--- a/desktop/onionshare/update_checker.py
++++ b/desktop/onionshare/update_checker.py
+@@ -22,7 +22,7 @@ from qtpy import QtCore
+ import datetime
+ import re
+ import socks
+-from distutils.version import LooseVersion as Version
++from packaging.version import Version
+ 
+ from onionshare_cli.settings import Settings
+ 


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@
 0004-Fix-methods-that-need-int-as-argument-and-not-float.patch
 0005-add-pytest.ini-to-make-sure-pytest-can-find-all-test.patch
 0006-Do-not-install-onionshare_cli-script.patch
+0007-Fix-to-work-with-Python-3.12.patch



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/onionshare/-/compare/28d5df0c66a3c8e61b68e2c7e8a534b30f1457d9...c9dc2b3971f2da81e72d8ded7ed0e7e1425e9aa4

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/onionshare/-/compare/28d5df0c66a3c8e61b68e2c7e8a534b30f1457d9...c9dc2b3971f2da81e72d8ded7ed0e7e1425e9aa4
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/20240719/dfc405f6/attachment-0001.htm>