diff -Nru meshtastic-2.5.0/debian/changelog meshtastic-2.5.0/debian/changelog --- meshtastic-2.5.0/debian/changelog 2024-09-19 08:59:58.000000000 +0100 +++ meshtastic-2.5.0/debian/changelog 2024-10-19 17:19:34.000000000 +0100 @@ -1,3 +1,12 @@ +meshtastic (2.5.0-2) UNRELEASED; urgency=medium + + * Team upload + * Added print_color.patch to remove references to unpackaged libarary + * Added python3-dotmap to d/control + - Closes: #1083123 + + -- Dave Hibberd Sat, 19 Oct 2024 17:19:34 +0100 + meshtastic (2.5.0-1) unstable; urgency=medium * New upstream version. diff -Nru meshtastic-2.5.0/debian/control meshtastic-2.5.0/debian/control --- meshtastic-2.5.0/debian/control 2024-07-10 21:40:46.000000000 +0100 +++ meshtastic-2.5.0/debian/control 2024-10-19 17:19:34.000000000 +0100 @@ -12,6 +12,7 @@ python3-poetry, python3-bleak, python3-protobuf, + python3-dotmap, #Testsuite: autopkgtest-pkg-python Standards-Version: 4.7.0 Homepage: https://github.com/meshtastic/Meshtastic-python diff -Nru meshtastic-2.5.0/debian/patches/print_color.patch meshtastic-2.5.0/debian/patches/print_color.patch --- meshtastic-2.5.0/debian/patches/print_color.patch 1970-01-01 01:00:00.000000000 +0100 +++ meshtastic-2.5.0/debian/patches/print_color.patch 2024-10-19 17:19:24.000000000 +0100 @@ -0,0 +1,36 @@ +Description: Remove print_color as it's not packaged in Debian +Author: Chris Talbot +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1083123 +Reviewed-by: Dave Hibberd +Last-Update: 2024-10-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/meshtastic/mesh_interface.py ++++ b/meshtastic/mesh_interface.py +@@ -13,7 +13,6 @@ + from typing import Any, Callable, Dict, List, Optional, Union + + import google.protobuf.json_format +-import print_color # type: ignore[import-untyped] + from pubsub import pub # type: ignore[import-untyped] + from tabulate import tabulate + +@@ -152,17 +151,7 @@ + def _printLogLine(line, interface): + """Print a line of log output.""" + if interface.debugOut == sys.stdout: +- # this isn't quite correct (could cause false positives), but currently our formatting differs between different log representations +- if "DEBUG" in line: +- print_color.print(line, color="cyan", end=None) +- elif "INFO" in line: +- print_color.print(line, color="white", end=None) +- elif "WARN" in line: +- print_color.print(line, color="yellow", end=None) +- elif "ERR" in line: +- print_color.print(line, color="red", end=None) +- else: +- print_color.print(line, end=None) ++ interface.debugOut.write(line + "\n") + else: + interface.debugOut.write(line + "\n") + diff -Nru meshtastic-2.5.0/debian/patches/series meshtastic-2.5.0/debian/patches/series --- meshtastic-2.5.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ meshtastic-2.5.0/debian/patches/series 2024-10-19 17:14:05.000000000 +0100 @@ -0,0 +1 @@ +print_color.patch