I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.
diff -Nru gkrellm-reminder-2.0.0/debian/changelog 
gkrellm-reminder-2.0.0/debian/changelog
--- gkrellm-reminder-2.0.0/debian/changelog     2024-06-13 20:39:52.000000000 
+0000
+++ gkrellm-reminder-2.0.0/debian/changelog     2024-06-13 20:28:52.000000000 
+0000
@@ -1,3 +1,16 @@
+gkrellm-reminder (2.0.0-3.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0. (Closes: #1007535)
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: (Closes: #958356)
+    + Let dh_auto_build pass cross tools to make.
+    + Make pkg-config substitutable.
+    + Defer stripping to dh_strip.
+
+ -- Bastian Germann <b...@debian.org>  Thu, 13 Jun 2024 20:28:52 +0000
+
 gkrellm-reminder (2.0.0-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru gkrellm-reminder-2.0.0/debian/control 
gkrellm-reminder-2.0.0/debian/control
--- gkrellm-reminder-2.0.0/debian/control       2024-06-13 20:39:52.000000000 
+0000
+++ gkrellm-reminder-2.0.0/debian/control       2024-06-13 20:28:41.000000000 
+0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Joerg Jaspert <jo...@debian.org>
 Uploaders: Ricardo Mones <mo...@debian.org>
-Build-Depends: debhelper (>> 5), libgtk2.0-dev, gkrellm
+Build-Depends: debhelper (>= 7), libgtk2.0-dev, gkrellm
 Standards-Version: 3.8.2
 
 Package: gkrellm-reminder
diff -Nru gkrellm-reminder-2.0.0/debian/patches/pkg-config-substitutable.patch 
gkrellm-reminder-2.0.0/debian/patches/pkg-config-substitutable.patch
--- gkrellm-reminder-2.0.0/debian/patches/pkg-config-substitutable.patch        
1970-01-01 00:00:00.000000000 +0000
+++ gkrellm-reminder-2.0.0/debian/patches/pkg-config-substitutable.patch        
2024-06-13 20:28:52.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Make pkg-config substitutable
+Author: Helmut Grohne <hel...@subdivi.de>
+Date: Mon, 20 Apr 2020 21:11:28 +0200
+---
+--- gkrellm-reminder-2.0.0.orig/Makefile
++++ gkrellm-reminder-2.0.0/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`
+ 
+ CFLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) -I/usr/pkg/include
+ 
diff -Nru gkrellm-reminder-2.0.0/debian/patches/reminder.patch 
gkrellm-reminder-2.0.0/debian/patches/reminder.patch
--- gkrellm-reminder-2.0.0/debian/patches/reminder.patch        1970-01-01 
00:00:00.000000000 +0000
+++ gkrellm-reminder-2.0.0/debian/patches/reminder.patch        2024-06-13 
20:28:52.000000000 +0000
@@ -0,0 +1,19 @@
+--- gkrellm-reminder-2.0.0.orig/reminder.c
++++ gkrellm-reminder-2.0.0/reminder.c
+@@ -1102,13 +1102,13 @@ reminder_get_days_string( struct event_s
+       int day = current->days & 31;
+       int month = current->days >> 16;
+ 
+-      if( day % 10 == 1 )
++      if( day % 10 == 1 && day != 11)
+       //pos = sprintf( string, "%dst", day );
+         string = g_strdup_printf("%dst", day );
+-      else if( day % 10 == 2 )
++      else if( day % 10 == 2 && day != 12)
+       //pos = sprintf( string, "%dnd", day );
+         string = g_strdup_printf("%dnd", day );
+-      else if( day % 10 == 3 )
++      else if( day % 10 == 3 && day != 13)
+       //pos = sprintf( string, "%drd", day );
+         string = g_strdup_printf("%drd", day );
+       else
diff -Nru gkrellm-reminder-2.0.0/debian/patches/series 
gkrellm-reminder-2.0.0/debian/patches/series
--- gkrellm-reminder-2.0.0/debian/patches/series        1970-01-01 
00:00:00.000000000 +0000
+++ gkrellm-reminder-2.0.0/debian/patches/series        2024-06-13 
20:28:52.000000000 +0000
@@ -0,0 +1,2 @@
+reminder.patch
+pkg-config-substitutable.patch
diff -Nru gkrellm-reminder-2.0.0/debian/rules 
gkrellm-reminder-2.0.0/debian/rules
--- gkrellm-reminder-2.0.0/debian/rules 2024-06-13 20:39:52.000000000 +0000
+++ gkrellm-reminder-2.0.0/debian/rules 2024-06-13 20:28:52.000000000 +0000
@@ -2,7 +2,7 @@
 
 build: 
        dh_testdir
-       $(MAKE)
+       dh_auto_build
 
 clean:
        dh_testdir
@@ -16,7 +16,7 @@
        dh_clean -k
        dh_installdirs
        install -d debian/gkrellm-reminder/usr/lib/gkrellm2/plugins
-       install -c -s -m 755 reminder.so \
+       install -c -m 755 reminder.so \
                debian/gkrellm-reminder/usr/lib/gkrellm2/plugins
 
 
diff -Nru gkrellm-reminder-2.0.0/debian/source/format 
gkrellm-reminder-2.0.0/debian/source/format
--- gkrellm-reminder-2.0.0/debian/source/format 1970-01-01 00:00:00.000000000 
+0000
+++ gkrellm-reminder-2.0.0/debian/source/format 2024-06-13 20:28:52.000000000 
+0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru gkrellm-reminder-2.0.0/reminder.c gkrellm-reminder-2.0.0/reminder.c
--- gkrellm-reminder-2.0.0/reminder.c   2024-06-13 20:39:52.000000000 +0000
+++ gkrellm-reminder-2.0.0/reminder.c   2002-12-04 05:29:31.000000000 +0000
@@ -1102,13 +1102,13 @@
       int day = current->days & 31;
       int month = current->days >> 16;
 
-      if( day % 10 == 1 && day != 11)
+      if( day % 10 == 1 )
        //pos = sprintf( string, "%dst", day );
         string = g_strdup_printf("%dst", day );
-      else if( day % 10 == 2 && day != 12)
+      else if( day % 10 == 2 )
        //pos = sprintf( string, "%dnd", day );
         string = g_strdup_printf("%dnd", day );
-      else if( day % 10 == 3 && day != 13)
+      else if( day % 10 == 3 )
        //pos = sprintf( string, "%drd", day );
         string = g_strdup_printf("%drd", day );
       else

Reply via email to