Control: tags 1123115 + patch Control: tags 1123115 + pending Dear maintainer,
I've prepared an NMU for diceware (versioned as 1.0.1-1.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for diceware-1.0.1 diceware-1.0.1 changelog | 8 ++ patches/0001-Set-prog-in-ArgumentParser-explicitly.-Fixes-122.patch | 40 ++++++++++ patches/series | 1 3 files changed, 49 insertions(+) diff -Nru diceware-1.0.1/debian/changelog diceware-1.0.1/debian/changelog --- diceware-1.0.1/debian/changelog 2025-02-24 22:20:20.000000000 +0200 +++ diceware-1.0.1/debian/changelog 2026-01-14 23:15:39.000000000 +0200 @@ -1,3 +1,11 @@ +diceware (1.0.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with Python 3.14. + (Closes: #1123115) + + -- Adrian Bunk <[email protected]> Wed, 14 Jan 2026 23:15:39 +0200 + diceware (1.0.1-1) unstable; urgency=medium * Update upstream to version 1.0.1 (Closes: #1090096, #1083360) diff -Nru diceware-1.0.1/debian/patches/0001-Set-prog-in-ArgumentParser-explicitly.-Fixes-122.patch diceware-1.0.1/debian/patches/0001-Set-prog-in-ArgumentParser-explicitly.-Fixes-122.patch --- diceware-1.0.1/debian/patches/0001-Set-prog-in-ArgumentParser-explicitly.-Fixes-122.patch 1970-01-01 02:00:00.000000000 +0200 +++ diceware-1.0.1/debian/patches/0001-Set-prog-in-ArgumentParser-explicitly.-Fixes-122.patch 2026-01-14 23:14:34.000000000 +0200 @@ -0,0 +1,40 @@ +From 9aa2868cae278a25f18a08b5c8eff5240f7f8b37 Mon Sep 17 00:00:00 2001 +From: ulif <[email protected]> +Date: Mon, 12 Jan 2026 01:33:54 +0100 +Subject: Set prog in `ArgumentParser` explicitly. Fixes #122. + +Since Python3.14 the `ArgumentParser` computes a different programm name +when the process starting the script used a direct module call from the +commandline. + +This led to different help-messages in tests, depending on how the tests +have been invoked: as `pytest`, `python -m pytest` or `tox`. We now set +the program name given in help-output explicitly, which gives more +predictable results in tests (and is also less confusing while using). +--- + diceware/__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/diceware/__init__.py b/diceware/__init__.py +index 538d64c..b2a28a6 100644 +--- a/diceware/__init__.py ++++ b/diceware/__init__.py +@@ -16,6 +16,7 @@ + """diceware -- rememberable passphrases + """ + import argparse ++import os + import sys + import logging + from errno import ENOENT +@@ -98,6 +99,7 @@ def handle_options(args): + wordlist_names = get_wordlist_names() + defaults = get_config_dict() + parser = argparse.ArgumentParser( ++ prog=os.path.basename(sys.argv[0]), + description="Create a passphrase", + epilog="Use --show-wordlist-dirs to list directories where you can store custom wordlists." + ) +-- +2.47.3 + diff -Nru diceware-1.0.1/debian/patches/series diceware-1.0.1/debian/patches/series --- diceware-1.0.1/debian/patches/series 2025-02-24 22:20:20.000000000 +0200 +++ diceware-1.0.1/debian/patches/series 2026-01-14 23:15:37.000000000 +0200 @@ -1 +1,2 @@ 0001-avoid-fetching-data-from-external-website-in-docs.patch +0001-Set-prog-in-ArgumentParser-explicitly.-Fixes-122.patch
