Bug#1007292: simh: please consider upgrading to 3.0 source format

2024-06-01 Thread Bastian Germann

I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.diff -Nru simh-3.8.1/H316/h316_cpu.c simh-3.8.1/H316/h316_cpu.c
--- simh-3.8.1/H316/h316_cpu.c  2024-06-01 12:47:59.0 +
+++ simh-3.8.1/H316/h316_cpu.c  2008-11-22 01:12:32.0 +
@@ -614,13 +614,13 @@
 break;
 
 case 015: case 055: /* STX */
-if (reason = Ea (MB & ~IDX, &Y))/* eff addr */
+if (reason = Ea (MB, &Y))   /* eff addr */
 break;
 Write (Y, XR);  /* store XR */
 break;
 
 case 035: case 075: /* LDX */
-if (reason = Ea (MB & ~IDX, &Y))/* eff addr */
+if (reason = Ea (MB, &Y))   /* eff addr */
 break;
 XR = Read (Y);  /* load XR */
 break;
diff -Nru simh-3.8.1/HP2100/hp2100_ipl.c simh-3.8.1/HP2100/hp2100_ipl.c
--- simh-3.8.1/HP2100/hp2100_ipl.c  2024-06-01 12:47:59.0 +
+++ simh-3.8.1/HP2100/hp2100_ipl.c  2008-11-15 00:09:58.0 +
@@ -572,7 +572,7 @@
 for (i = 0; i < 30; i++) {  /* check for 30 sec */
 if (t = ipl_check_conn (uptr)) break;   /* established? */
 if ((i % 10) == 0)  /* status every 10 sec 
*/
-printf ("Waiting for connection\n");
+printf ("Waiting for connnection\n");
 sim_os_sleep (1);   /* sleep 1 sec */
 }
 if (t) printf ("Connection established\n");
diff -Nru simh-3.8.1/debian/changelog simh-3.8.1/debian/changelog
--- simh-3.8.1/debian/changelog 2024-06-01 12:47:59.0 +
+++ simh-3.8.1/debian/changelog 2024-06-01 12:18:16.0 +
@@ -1,3 +1,11 @@
+simh (3.8.1-6.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Separate CFLAGS from CC (Closes: #946323)
+  * Convert to source format 3.0 (Closes: #1007292)
+
+ -- Bastian Germann   Sat, 01 Jun 2024 12:18:16 +
+
 simh (3.8.1-6.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru simh-3.8.1/debian/patches/debian.patch 
simh-3.8.1/debian/patches/debian.patch
--- simh-3.8.1/debian/patches/debian.patch  1970-01-01 00:00:00.0 
+
+++ simh-3.8.1/debian/patches/debian.patch  2024-06-01 12:18:16.0 
+
@@ -0,0 +1,803 @@
+--- simh-3.8.1.orig/makefile
 simh-3.8.1/makefile
+@@ -1,402 +1,398 @@
+-#
+-# CC Command
+-#
+-ifeq ($(WIN32),)
+-  #Unix Environments
+-  ifneq (,$(findstring solaris,$(OSTYPE)))
+-OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
+-  else
+-ifneq (,$(findstring darwin,$(OSTYPE)))
+-  OS_CCDEFS = -D_GNU_SOURCE
+-else
+-  OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
+-endif
+-  endif
+-  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
+-  ifeq ($(USE_NETWORK),)
+-  else
+-NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include 
/usr/local/lib/libpcap.a
+-  endif
+-else
+-  #Win32 Environments
+-  LDFLAGS = -lm -lwsock32 -lwinmm
+-  CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
+-  EXE = .exe
+-  ifeq ($(USE_NETWORK),)
+-  else
+-NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
+-  endif
+-endif
+-
+-#
+-# Common Libraries
+-#
+-BIN = BIN/
+-SIM = scp.c sim_console.c sim_fio.c sim_timer.c sim_sock.c \
+-  sim_tmxr.c sim_ether.c sim_tape.c
+-
+-
+-#
+-# Emulator source files and compile time options
+-#
+-PDP1D = PDP1
+-PDP1 = ${PDP1D}/pdp1_lp.c ${PDP1D}/pdp1_cpu.c ${PDP1D}/pdp1_stddev.c \
+-  ${PDP1D}/pdp1_sys.c ${PDP1D}/pdp1_dt.c ${PDP1D}/pdp1_drm.c \
+-  ${PDP1D}/pdp1_clk.c ${PDP1D}/pdp1_dcs.c
+-PDP1_OPT = -I ${PDP1D}
+-
+-
+-NOVAD = NOVA
+-NOVA = ${NOVAD}/nova_sys.c ${NOVAD}/nova_cpu.c ${NOVAD}/nova_dkp.c \
+-  ${NOVAD}/nova_dsk.c ${NOVAD}/nova_lp.c ${NOVAD}/nova_mta.c \
+-  ${NOVAD}/nova_plt.c ${NOVAD}/nova_pt.c ${NOVAD}/nova_clk.c \
+-  ${NOVAD}/nova_tt.c ${NOVAD}/nova_tt1.c ${NOVAD}/nova_qty.c
+-NOVA_OPT = -I ${NOVAD}
+-
+-
+-ECLIPSE = ${NOVAD}/eclipse_cpu.c ${NOVAD}/eclipse_tt.c ${NOVAD}/nova_sys.c \
+-  ${NOVAD}/nova_dkp.c ${NOVAD}/nova_dsk.c ${NOVAD}/nova_lp.c \
+-  ${NOVAD}/nova_mta.c ${NOVAD}/nova_plt.c ${NOVAD}/nova_pt.c \
+-  ${NOVAD}/nova_clk.c ${NOVAD}/nova_tt1.c ${NOVAD}/nova_qty.c
+-ECLIPSE_OPT = -I ${NOVAD} -DECLIPSE -DUSE_INT64 
+-
+-
+-PDP18BD = PDP18B
+-PDP18B = ${PDP18BD}/pdp18b_dt.c ${PDP18BD}/pdp18b_drm.c 
${PDP18BD}/pdp18b_cpu.c \
+-  ${PDP18BD}/pdp18b_lp.c ${PDP18BD}/pdp18b_mt.c ${PDP18BD}/pdp18b_rf.c \
+-  ${PDP18BD}/pdp18b_rp.c ${PDP18BD}/pdp18b_stddev.c 
${PDP18BD}/pdp18b_sys.c \
+-  ${PDP18BD}/pdp18b_rb.c ${PDP18BD}/pdp18b_tt1.c ${PDP18BD}/pdp18b_fpp.c
+-PDP4_OPT = -DPDP4 -I ${PDP18BD}
+-PDP7_OPT = -DPDP7 -I ${PDP18BD}
+-PDP9_OPT = -DPDP9 -I ${PDP18BD}
+-PDP15_OPT = -DPDP15 -I ${PDP18BD}
+-
+-
+-PDP11D = PDP11
+-PDP11 = ${PDP11D}/pdp11_fp.c ${PDP11D

Bug#1007292: simh: please consider upgrading to 3.0 source format

2022-03-15 Thread Lucas Nussbaum
Source: simh
Version: 3.8.1-6.1
Severity: wishlist
Tags: bookworm sid
Usertags: format1.0 format1.0-nkp-nv

Dear maintainer,

This package is among the few (1.9%) that still use source format 1.0 in
bookworm.  Please upgrade it to source format 3.0, as (1) this format has many
advantages, as documented in https://wiki.debian.org/Projects/DebSrc3.0 ; (2)
this contributes to standardization of packaging practices.

Please note that this is also a sign that the packaging of this software
could maybe benefit from a refresh. It might be a good opportunity to
look at other aspects as well.


This mass bug filing was discussed on debian-devel@:
https://lists.debian.org/debian-devel/2022/03/msg00074.html

Thanks

Lucas