Updates following latest upstream release

debian/changelog

@@ -1,9 +1,9 @@
-qtsoundmodem (0.0.0.73~rc1-1) UNRELEASED; urgency=medium
+qtsoundmodem (0.0.0.74~rc2-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 
   * Upstream import
-  * Patches refreshed
+  * Patches refreshed 
 
- -- Dave Hibberd <hibby@debian.org>  Tue, 29 Oct 2024 22:45:40 +0000
+ -- Dave Hibberd <hibby@debian.org>  Sat, 28 Dec 2024 13:03:15 +0000
 
 qtsoundmodem (0.0.0.72.1-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
 

debian/control

@@ -1,10 +1,10 @@
 Source: qtsoundmodem
 Section: hamradio
 Priority: optional
-Maintainer: Dave Hibberd <d@vehibberd.com>,
-Standards-Version: 4.6.2.0
-Vcs-Browser: 
-Vcs-Git: 
+Maintainer: Dave Hibberd <hibby@debian.org>
+Standards-Version: 4.7.0
+Vcs-Browser: https://git.hibbian.org/Hibbian/qtsoundmodem
+Vcs-Git: https://git.hibbian.org/Hibbian/qtsoundmodem.git
 Homepage: https://www.cantab.net/users/john.wiseman/Documents/QtSoundModem.html
 Build-Depends: debhelper-compat (= 13)
 Build-Depends-Arch: qtbase5-dev, qt5-qmake, libqt5serialport5-dev, libfftw3-dev, libpulse-dev, libasound2-dev, extra-xdg-menus

debian/patches/build-fix.patch

@@ -1,95 +0,0 @@
---- a/tcpCode.cpp
-+++ b/tcpCode.cpp
-@@ -775,7 +775,7 @@
- 
- 	QByteArray datas = HAMLIBsock->readAll();
- 
--	qDebug(datas.data());
-+	qDebug("SetPTT Error: %s", datas.data());
- 
- }
- 
---- a/ax25.c
-+++ b/ax25.c
-@@ -1757,8 +1757,8 @@
- }
- 
- 
--
--get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
-+// Hibby - as this returns nothing, assign it type void.
-+void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi)
- {
- 	Byte * digiptr = digi;
- 
---- a/sm_main.c
-+++ b/sm_main.c
-@@ -796,7 +796,8 @@
- 
- void runModems()
- {
--	int snd_ch, res;
-+	int snd_ch;
-+	void *res;
- 	pthread_t thread[4] = { 0,0,0,0 };
- 
- 	for (snd_ch = 0; snd_ch < 4; snd_ch++)
---- a/il2p.c
-+++ b/il2p.c
-@@ -394,6 +394,8 @@
- 
- typedef enum cmdres_e { cr_00 = 2, cr_cmd = 1, cr_res = 0, cr_11 = 3 } cmdres_t;
- 
-+// G8BPQ update for set_addrs
-+int set_addrs(packet_t pp, char addrs[AX25_MAX_ADDRS][AX25_MAX_ADDR_LEN], int num_addr, cmdres_t cr);
- 
- extern packet_t ax25_new(void);
- 
---- a/ax25_l2.c
-+++ b/ax25_l2.c
-@@ -374,7 +374,9 @@
- void delete_I_FRM_port(TAX25Port * AX25Sess)
- {
- 	string * frame;
--	string path = { 0 }; 
-+	 //Hibby - Attempting to solve this incompatible type error, see notes
-+
-+	Byte path[80];
- 	string data= { 0 };
- 
- 	Byte pid, nr, ns, f_type, f_id, rpt, cr, pf;
-@@ -385,8 +387,9 @@
- 	{
- 		optimize = TRUE;
- 		frame = Strings(&AX25Sess->frame_buf, i);
--
--		decode_frame(frame->Data, frame->Length, &path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
-+		// Hibby - this alignes decode_frame with other uses in this
-+		// file
-+		decode_frame(frame->Data, frame->Length, path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr);
- 
- 		if (f_id == I_I)
- 		{
---- a/SMMain.c
-+++ b/SMMain.c
-@@ -223,8 +223,8 @@
- 	if (using48000)
- 	{
- 		// Need to upsample to 48K. Try just duplicating sample
--
--		uint32_t * ptr = &DMABuffer[2 * Number];
-+		// Hibby - explicitly cast short int to uint32_t
-+		uint32_t * ptr = (uint32_t *)&DMABuffer[2 * Number];
- 
- 		*(&ptr[1]) = *(ptr);
- 		*(&ptr[2]) = *(ptr);
-@@ -388,7 +388,8 @@
- #endif
- 
- extern int blnBusyStatus;
--BusyDet = 5;
-+// Hibby - detail explicitly as int
-+int BusyDet = 5;
- 
- #define PLOTWATERFALL
- 

debian/patches/series

@@ -1,3 +1,2 @@
 fix-bookworm-build.patch
 libpulse.patch
-build-fix.patch

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export QT_SELECT=5
-export DEB_BUILD_MAINT_OPTIONS=hardening=-all qa=-bug-implicit-func
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-format
 
 %:
 	dh $@