I am uploading the announced NMU to DELAYED/10 with additional changes attached.
diff -Nru phnxdeco-0.33/debian/changelog phnxdeco-0.33/debian/changelog
--- phnxdeco-0.33/debian/changelog 2024-06-09 15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/changelog 2024-06-09 15:05:53.000000000 +0000
@@ -1,3 +1,17 @@
+phnxdeco (0.33-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Convert to source format 3.0 (Closes: #1007542).
+ * Drop FreeBSD patch.
+
+ [ Arthur Marble ]
+ * Fix FTBFS with clang: "wrong main declaration" (Closes: #748630).
+
+ [ Nilesh Patra ]
+ * Replace hardcoded gcc with $(CC) (Closes: #989391).
+
+ -- Bastian Germann <[email protected]> Sun, 09 Jun 2024 15:05:53 +0000
+
phnxdeco (0.33-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru phnxdeco-0.33/debian/control phnxdeco-0.33/debian/control
--- phnxdeco-0.33/debian/control 2024-06-09 15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/control 2024-06-09 15:05:53.000000000 +0000
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Uwe Hermann <[email protected]>
-Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends: cdbs, debhelper (>= 7)
Standards-Version: 3.7.3
Homepage: http://www.kaos.ru/biosgfx/
diff -Nru phnxdeco-0.33/debian/patches/10_makefile.patch
phnxdeco-0.33/debian/patches/10_makefile.patch
--- phnxdeco-0.33/debian/patches/10_makefile.patch 2024-06-09
15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/patches/10_makefile.patch 2024-06-09
15:05:53.000000000 +0000
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2006-09-02 02:15:58.000000000 +0200
-+++ src/Makefile 2006-09-02 02:16:15.000000000 +0200
+--- a/src/Makefile 2006-09-02 02:15:58.000000000 +0200
++++ b/src/Makefile 2006-09-02 02:16:15.000000000 +0200
@@ -5,7 +5,9 @@
MAKE = make
diff -Nru phnxdeco-0.33/debian/patches/15_honor_nostrip.patch
phnxdeco-0.33/debian/patches/15_honor_nostrip.patch
--- phnxdeco-0.33/debian/patches/15_honor_nostrip.patch 2024-06-09
15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/patches/15_honor_nostrip.patch 2024-06-09
15:05:53.000000000 +0000
@@ -1,5 +1,5 @@
---- src/Makefile.orig 2008-02-09 23:48:41.000000000 +0100
-+++ src/Makefile 2008-02-09 23:48:55.000000000 +0100
+--- a/src/Makefile 2008-02-09 23:48:41.000000000 +0100
++++ b/src/Makefile 2008-02-09 23:48:55.000000000 +0100
@@ -9,11 +9,11 @@
phnxdeco: phnxfunc kernel
diff -Nru phnxdeco-0.33/debian/patches/20_clang_ftbfs.patch
phnxdeco-0.33/debian/patches/20_clang_ftbfs.patch
--- phnxdeco-0.33/debian/patches/20_clang_ftbfs.patch 1970-01-01
00:00:00.000000000 +0000
+++ phnxdeco-0.33/debian/patches/20_clang_ftbfs.patch 2024-06-09
15:05:09.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/src/phnxdeco.c
++++ b/src/phnxdeco.c
+@@ -34,7 +34,7 @@
+ #include "./phnxver.h"
+ #include "./phnxhelp.h"
+
+-int main(byte argc, byte *argv[])
++int main(int argc, char *argv[])
+ {
+ FILE *ptx;
+ byte *Buf;
diff -Nru phnxdeco-0.33/debian/patches/20_kfreebsd.patch
phnxdeco-0.33/debian/patches/20_kfreebsd.patch
--- phnxdeco-0.33/debian/patches/20_kfreebsd.patch 2024-06-09
15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/patches/20_kfreebsd.patch 1970-01-01
00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- phnxdeco-0.33/src/phnxdeco.c 2007-03-16 13:34:44.804656000 +0100
-+++ phnxdeco-0.33/src/phnxdeco.c 2007-03-16 13:35:01.000000000 +0100
-@@ -21,7 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
-
--#if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
-+#if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__GLIBC__)
- #include <memory.h>
- #define __LINUX_NOW__
- #else
diff -Nru phnxdeco-0.33/debian/patches/30_bugfix.patch
phnxdeco-0.33/debian/patches/30_bugfix.patch
--- phnxdeco-0.33/debian/patches/30_bugfix.patch 2024-06-09
15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/patches/30_bugfix.patch 2024-06-09
15:05:53.000000000 +0000
@@ -1,5 +1,5 @@
---- src/phnxhelp.h.orig 2007-04-08 02:44:48.000000000 +0200
-+++ src/phnxhelp.h 2007-04-08 02:45:04.000000000 +0200
+--- a/src/phnxhelp.h 2007-04-08 02:44:48.000000000 +0200
++++ b/src/phnxhelp.h 2007-04-08 02:45:04.000000000 +0200
@@ -48,7 +48,7 @@
if( StrCmp(argv[x], "-xs" ) == 0 ) retcode = 0x20;
diff -Nru phnxdeco-0.33/debian/patches/40_cross.patch
phnxdeco-0.33/debian/patches/40_cross.patch
--- phnxdeco-0.33/debian/patches/40_cross.patch 1970-01-01 00:00:00.000000000
+0000
+++ phnxdeco-0.33/debian/patches/40_cross.patch 2024-06-09 15:05:53.000000000
+0000
@@ -0,0 +1,24 @@
+--- a/src/Makefile 2021-06-02 19:32:33.394649634 +0530
++++ b/src/Makefile 2021-06-02 19:33:24.941634732 +0530
+@@ -9,17 +9,17 @@
+
+ phnxdeco: phnxfunc kernel
+ DEMO=""
+- gcc -DDEBUG $(DEMO) phnxdeco.c phnxfunc.o kernel.o -fpack-struct -o
phnxdeco
++ $(CC) -DDEBUG $(DEMO) phnxdeco.c phnxfunc.o kernel.o -fpack-struct -o
phnxdeco
+
+ phnxdeco-demo:
+ DEMO=1
+- gcc -DDEBUG=$(DEMO) phnxdeco.c phnxfunc.o kernel.o -fpack-struct -o
phnxdeco-demo
++ $(CC) -DDEBUG=$(DEMO) phnxdeco.c phnxfunc.o kernel.o -fpack-struct -o
phnxdeco-demo
+
+ phnxfunc:
+- gcc phnxfunc.c -c -o phnxfunc.o -fpack-struct
++ $(CC) phnxfunc.c -c -o phnxfunc.o -fpack-struct
+
+ kernel:
+- gcc kernel.c -c -o kernel.o -fpack-struct
++ $(CC) kernel.c -c -o kernel.o -fpack-struct
+
+ clean:
+ rm -f *.o
diff -Nru phnxdeco-0.33/debian/patches/series
phnxdeco-0.33/debian/patches/series
--- phnxdeco-0.33/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ phnxdeco-0.33/debian/patches/series 2024-06-09 15:05:53.000000000 +0000
@@ -0,0 +1,5 @@
+10_makefile.patch
+15_honor_nostrip.patch
+20_clang_ftbfs.patch
+30_bugfix.patch
+40_cross.patch
diff -Nru phnxdeco-0.33/debian/rules phnxdeco-0.33/debian/rules
--- phnxdeco-0.33/debian/rules 2024-06-09 15:23:54.000000000 +0000
+++ phnxdeco-0.33/debian/rules 2024-06-09 14:59:19.000000000 +0000
@@ -4,7 +4,6 @@
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_BUILDDIR := src
DEB_MAKE_MAKEFILE := Makefile
diff -Nru phnxdeco-0.33/debian/source/format phnxdeco-0.33/debian/source/format
--- phnxdeco-0.33/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ phnxdeco-0.33/debian/source/format 2024-06-09 15:00:00.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
