I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.
diff -Nru gkrellmoon-0.6/Makefile gkrellmoon-0.6/Makefile
--- gkrellmoon-0.6/Makefile     2024-06-13 21:03:04.000000000 +0000
+++ gkrellmoon-0.6/Makefile     2002-12-11 03:36:06.000000000 +0000
@@ -4,7 +4,7 @@
 INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
 
 
-FLAGS = -O2 -g -Wall -fPIC $(GTK_INCLUDE)
+FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
 LIBS = $(GTK_LIB)
 LFLAGS = -shared
 
@@ -23,4 +23,4 @@
 # %.o: %.c
 
 install: gkrellmoon.so
-       install -c -m 644 gkrellmoon.so $(INSTALLDIR)
+       install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
diff -Nru gkrellmoon-0.6/debian/changelog gkrellmoon-0.6/debian/changelog
--- gkrellmoon-0.6/debian/changelog     2024-06-13 21:03:04.000000000 +0000
+++ gkrellmoon-0.6/debian/changelog     2024-06-13 20:47:57.000000000 +0000
@@ -1,3 +1,16 @@
+gkrellmoon (0.6-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0. (Closes: #1007433)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #901126)
+    + Let dh_auto_build pass cross tools to make.
+    + Do not stuff flags into CC.
+    + Make pkg-config substitutable.
+
+ -- Bastian Germann <b...@debian.org>  Thu, 13 Jun 2024 20:47:57 +0000
+
 gkrellmoon (0.6-7) unstable; urgency=medium
 
   * debian/rules: Add build-{arch,indep}. (Closes: #999159)
diff -Nru gkrellmoon-0.6/debian/patches/makefile.patch 
gkrellmoon-0.6/debian/patches/makefile.patch
--- gkrellmoon-0.6/debian/patches/makefile.patch        1970-01-01 
00:00:00.000000000 +0000
+++ gkrellmoon-0.6/debian/patches/makefile.patch        2024-06-13 
20:47:57.000000000 +0000
@@ -0,0 +1,17 @@
+--- gkrellmoon-0.6.orig/Makefile
++++ gkrellmoon-0.6/Makefile
+@@ -4,7 +4,7 @@ GTK_LIB = `pkg-config gtk+-2.0 --libs`
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -O2 -g -Wall -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+@@ -23,4 +23,4 @@ gkrellmoon.o: gkrellmoon.c moon_60.xpm
+ # %.o: %.c
+ 
+ install: gkrellmoon.so
+-      install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
++      install -c -m 644 gkrellmoon.so $(INSTALLDIR)
diff -Nru gkrellmoon-0.6/debian/patches/pkg-config-substitutable.patch 
gkrellmoon-0.6/debian/patches/pkg-config-substitutable.patch
--- gkrellmoon-0.6/debian/patches/pkg-config-substitutable.patch        
1970-01-01 00:00:00.000000000 +0000
+++ gkrellmoon-0.6/debian/patches/pkg-config-substitutable.patch        
2024-06-13 20:47:57.000000000 +0000
@@ -0,0 +1,33 @@
+Author: Helmut Grohne <hel...@subdivi.de>
+Date: Sat, 09 Jun 2018 06:48:10 +0200
+Description: Make pkg-config substitutable
+---
+diff -u gkrellmoon-0.6/Makefile gkrellmoon-0.6/Makefile
+--- gkrellmoon-0.6/Makefile
++++ gkrellmoon-0.6/Makefile
+@@ -1,5 +1,6 @@
+-GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
+-GTK_LIB = `pkg-config gtk+-2.0 --libs`
++PKG_CONFIG ?= pkg-config
++GTK_INCLUDE = `$(PKG_CONFIG) gtk+-2.0 --cflags`
++GTK_LIB = `$(PKG_CONFIG) gtk+-2.0 --libs`
+ 
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 
+@@ -8,12 +9,14 @@
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = gcc
++%.o:%.c
++      $(CC) $(CFLAGS) $(FLAGS) -c $< -o $@
+ 
+ OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
+ 
+ gkrellmoon.so: $(OBJS)
+-      $(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
++      $(CC) $(CFLAGS) $(FLAGS) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+       rm -f *.o core *.so* *.bak *~
diff -Nru gkrellmoon-0.6/debian/patches/series 
gkrellmoon-0.6/debian/patches/series
--- gkrellmoon-0.6/debian/patches/series        1970-01-01 00:00:00.000000000 
+0000
+++ gkrellmoon-0.6/debian/patches/series        2024-06-13 20:47:57.000000000 
+0000
@@ -0,0 +1,3 @@
+makefile.patch
+pkg-config-substitutable.patch
+typo.patch
diff -Nru gkrellmoon-0.6/debian/patches/typo.patch 
gkrellmoon-0.6/debian/patches/typo.patch
--- gkrellmoon-0.6/debian/patches/typo.patch    1970-01-01 00:00:00.000000000 
+0000
+++ gkrellmoon-0.6/debian/patches/typo.patch    2024-06-13 20:47:57.000000000 
+0000
@@ -0,0 +1,11 @@
+--- gkrellmoon-0.6.orig/gkrellmoon.c
++++ gkrellmoon-0.6/gkrellmoon.c
+@@ -280,7 +280,7 @@ update_tooltip(MoonData *moon)
+       moon->day += 1;
+       calc_riseset_time(moon, "Today", mboxes);
+       moon->day += 1;
+-      calc_riseset_time(moon, "Tomorrrow", mboxes);
++      calc_riseset_time(moon, "Tomorrow", mboxes);
+       moon->day -= 1;
+     }
+ 
diff -Nru gkrellmoon-0.6/debian/rules gkrellmoon-0.6/debian/rules
--- gkrellmoon-0.6/debian/rules 2024-06-13 21:03:04.000000000 +0000
+++ gkrellmoon-0.6/debian/rules 2024-06-13 20:47:57.000000000 +0000
@@ -19,10 +19,7 @@
 
 build:
        dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-
+       dh_auto_build
 
 clean:
        dh_testdir
diff -Nru gkrellmoon-0.6/debian/source/format 
gkrellmoon-0.6/debian/source/format
--- gkrellmoon-0.6/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ gkrellmoon-0.6/debian/source/format 2024-06-13 20:47:57.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru gkrellmoon-0.6/gkrellmoon.c gkrellmoon-0.6/gkrellmoon.c
--- gkrellmoon-0.6/gkrellmoon.c 2024-06-13 21:03:04.000000000 +0000
+++ gkrellmoon-0.6/gkrellmoon.c 2002-12-11 03:36:06.000000000 +0000
@@ -280,7 +280,7 @@
        moon->day += 1;
        calc_riseset_time(moon, "Today", mboxes);
        moon->day += 1;
-       calc_riseset_time(moon, "Tomorrow", mboxes);
+       calc_riseset_time(moon, "Tomorrrow", mboxes);
        moon->day -= 1;
     }
 

Reply via email to