Control: tags 1076215 + patch
Control: tags 1076215 + pending
Dear maintainer,
I've prepared an NMU for dahdi-tools (versioned as 1:3.1.0-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru dahdi-tools-3.1.0/debian/changelog dahdi-tools-3.1.0/debian/changelog
--- dahdi-tools-3.1.0/debian/changelog 2020-11-21 18:08:22.000000000 +0100
+++ dahdi-tools-3.1.0/debian/changelog 2025-02-26 19:23:57.000000000 +0100
@@ -1,3 +1,10 @@
+dahdi-tools (1:3.1.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename sethdlc to dahdi-setdhlc (Closes: #1076215)
+
+ -- Chris Hofstaedtler <z...@debian.org> Wed, 26 Feb 2025 19:23:57 +0100
+
dahdi-tools (1:3.1.0-2) unstable; urgency=medium
* Disable generated docs due to #969072.
diff -Nru dahdi-tools-3.1.0/debian/patches/rename-sethdlc-to-dahdi-setdhlc.patch dahdi-tools-3.1.0/debian/patches/rename-sethdlc-to-dahdi-setdhlc.patch
--- dahdi-tools-3.1.0/debian/patches/rename-sethdlc-to-dahdi-setdhlc.patch 1970-01-01 01:00:00.000000000 +0100
+++ dahdi-tools-3.1.0/debian/patches/rename-sethdlc-to-dahdi-setdhlc.patch 2025-02-26 19:23:57.000000000 +0100
@@ -0,0 +1,62 @@
+From: Chris Hofstaedtler <z...@debian.org>
+Date: Wed, 26 Feb 2025 19:23:55 +0100
+X-Dgit-Generated: 1:3.1.0-2.1 3f6a1d601e921cd2fb2966a07a86eaf22aca2788
+Subject: Rename sethdlc to dahdi-setdhlc
+
+Closes: #1076215
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index 7ce9194..593140c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -53,8 +53,10 @@ dist_sbin_SCRIPTS = \
+ dahdi_span_types
+
+ if PBX_HDLC
+-sbin_PROGRAMS += sethdlc
++sbin_PROGRAMS += dahdi-sethdlc
+ noinst_PROGRAMS += hdlcstress hdlctest hdlcgen hdlcverify
++
++dahdi_sethdlc_SOURCES = sethdlc.c
+ endif
+
+ # Libtool versioning for libtonezone:
+diff --git a/ifup-hdlc b/ifup-hdlc
+index 6602c46..c99338e 100644
+--- a/ifup-hdlc
++++ b/ifup-hdlc
+@@ -17,7 +17,7 @@ if [ -z "${MODE}" ]; then
+ exit
+ fi
+
+-sethdlc ${DEVICE} mode ${MODE}
++dahdi-sethdlc ${DEVICE} mode ${MODE}
+ ifconfig ${DEVICE} ${IPADDR} pointopoint ${REMIP}
+ route add -net ${NETWORK} netmask ${NETMASK} ${DEVICE}
+
+diff --git a/sethdlc.c b/sethdlc.c
+index cc0517c..d1fc9cf 100644
+--- a/sethdlc.c
++++ b/sethdlc.c
+@@ -641,15 +641,15 @@ static void usage(void)
+ fprintf(stderr, "sethdlc version 1.15\n"
+ "Copyright (C) 2000 - 2003 Krzysztof Halasa <k...@pm.waw.pl>\n"
+ "\n"
+- "Usage: sethdlc INTERFACE [PHYSICAL] [clock CLOCK] [LOOPBACK] "
++ "Usage: dahdi-sethdlc INTERFACE [PHYSICAL] [clock CLOCK] [LOOPBACK] "
+ "[slotmap SLOTMAP]\n"
+- " sethdlc INTERFACE [PROTOCOL]\n"
+- " sethdlc INTERFACE create | delete"
++ " dahdi-sethdlc INTERFACE [PROTOCOL]\n"
++ " dahdi-sethdlc INTERFACE create | delete"
+ #ifdef IF_PROTO_FR_ETH_PVC
+ " [ether]"
+ #endif
+ " DLCI\n"
+- " sethdlc INTERFACE private...\n"
++ " dahdi-sethdlc INTERFACE private...\n"
+ "\n"
+ "PHYSICAL := v24 | v35 | x21 | e1 | t1\n"
+ "CLOCK := int [rate RATE] | ext | txint [rate RATE] | txfromrx\n"
diff -Nru dahdi-tools-3.1.0/debian/patches/series dahdi-tools-3.1.0/debian/patches/series
--- dahdi-tools-3.1.0/debian/patches/series 2020-08-19 22:34:44.000000000 +0200
+++ dahdi-tools-3.1.0/debian/patches/series 2025-02-26 19:23:57.000000000 +0100
@@ -6,3 +6,4 @@
typos.patch
dahdi-tools-3.1.0-fno-common.patch
fix_install_paths.patch
+rename-sethdlc-to-dahdi-setdhlc.patch
