diff --git a/debian/changelog b/debian/changelog index 1167716..6052c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ ptpython (3.0.30-1) sid; urgency=medium * Merging upstream version 3.0.30. * Updating year in upstream copyright for 2025. - * Refreshing platformdirs.patc. -- Daniel Baumann <daniel@debian.org> Wed, 16 Apr 2025 08:49:26 +0200 diff --git a/debian/patches/debian/0001-platformdirs.patch b/debian/patches/debian/0001-platformdirs.patch index 89775e2..1ba0eee 100644 --- a/debian/patches/debian/0001-platformdirs.patch +++ b/debian/patches/debian/0001-platformdirs.patch @@ -15,31 +15,19 @@ diff -Naurp ptpython.orig/README.rst ptpython/README.rst precise location for your platform. A ``PTPYTHON_CONFIG_HOME`` environment variable, if set, can also be used to explicitly override where configuration is looked for. -diff -Naurp ptpython.orig/pyproject.toml ptpython/pyproject.toml ---- ptpython.orig/pyproject.toml -+++ ptpython/pyproject.toml -@@ -18,7 +18,7 @@ classifiers = [ - ] - requires-python = ">=3.8" - dependencies = [ -- "appdirs", -+ "platformdirs", - "jedi>=0.16.0", - # Use prompt_toolkit 3.0.43, because of `OneStyleAndTextTuple` import. - "prompt_toolkit>=3.0.43,<3.1.0", -diff -Naurp ptpython.orig/src/ptpython/entry_points/run_ptpython.py ptpython/src/ptpython/entry_points/run_ptpython.py ---- ptpython.orig/src/ptpython/entry_points/run_ptpython.py -+++ ptpython/src/ptpython/entry_points/run_ptpython.py -@@ -34,7 +34,7 @@ from importlib import metadata +diff -Naurp ptpython.orig/ptpython/entry_points/run_ptpython.py ptpython/ptpython/entry_points/run_ptpython.py +--- ptpython.orig/ptpython/entry_points/run_ptpython.py ++++ ptpython/ptpython/entry_points/run_ptpython.py +@@ -33,7 +33,7 @@ import sys from textwrap import dedent - from typing import Protocol + from typing import IO -import appdirs +import platformdirs from prompt_toolkit.formatted_text import HTML from prompt_toolkit.shortcuts import print_formatted_text -@@ -106,9 +106,9 @@ def get_config_and_history_file(namespac +@@ -107,9 +107,9 @@ def get_config_and_history_file(namespac """ config_dir = os.environ.get( "PTPYTHON_CONFIG_HOME", @@ -51,3 +39,15 @@ diff -Naurp ptpython.orig/src/ptpython/entry_points/run_ptpython.py ptpython/src # Create directories. for d in (config_dir, data_dir): +diff -Naurp ptpython.orig/setup.py ptpython/setup.py +--- ptpython.orig/setup.py ++++ ptpython/setup.py +@@ -26,7 +26,7 @@ setup( + packages=find_packages("."), + package_data={"ptpython": ["py.typed"]}, + install_requires=[ +- "appdirs", ++ "platformdirs", + "importlib_metadata;python_version<'3.8'", + "jedi>=0.16.0", + # Use prompt_toolkit 3.0.43, because of `OneStyleAndTextTuple` import.