diff -Nru leaktracer-2.4/debian/changelog leaktracer-2.4/debian/changelog
--- leaktracer-2.4/debian/changelog	2023-10-28 18:47:39.000000000 +0000
+++ leaktracer-2.4/debian/changelog	2023-10-09 16:11:18.000000000 +0000
@@ -1,3 +1,20 @@
+leaktracer (2.4-6.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop CFLAGS from test run, which results in FTBFS (Closes: #1053727).
+
+ -- Bastian Germann <bage@debian.org>  Mon, 09 Oct 2023 18:11:18 +0200
+
+leaktracer (2.4-6.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0 (Closes: #1043194).
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: Pass triplet-prefixed CXX as CC to make (Closes: #865741).
+
+ -- Bastian Germann <bage@debian.org>  Fri, 29 Sep 2023 12:17:22 +0200
+
 leaktracer (2.4-6.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru leaktracer-2.4/debian/patches/debian.patch leaktracer-2.4/debian/patches/debian.patch
--- leaktracer-2.4/debian/patches/debian.patch	1970-01-01 00:00:00.000000000 +0000
+++ leaktracer-2.4/debian/patches/debian.patch	2023-09-29 10:17:22.000000000 +0000
@@ -0,0 +1,43 @@
+--- leaktracer-2.4.orig/LeakCheck
++++ leaktracer-2.4/LeakCheck
+@@ -8,7 +8,7 @@ fi
+ # LeakCheck script resides; modify to your
+ # needs:
+ SHLIB=`dirname $0`/LeakTracer.so
+-if [ ! -x $SHLIB ] ; then
++if [ ! -r $SHLIB ] ; then
+     echo "$SHLIB not found"
+     exit 1
+ fi
+--- leaktracer-2.4.orig/Makefile
++++ leaktracer-2.4/Makefile
+@@ -7,7 +7,8 @@ SRC := LeakTracer.cc
+ THREAD=-DTHREAD_SAVE -D_REENTRANT -D_THREAD_SAFE -pthread 
+ 
+ # Common flags
+-C_FLAGS = -g -pipe -Wall -W $(THREAD)
++CFLAGS = -g -Wall -W
++C_FLAGS = $(CFLAGS) -pipe $(THREAD)
+ O_FLAGS = $(C_FLAGS)
+ 
+ # Object files
+@@ -22,6 +23,9 @@ all: $(OBJ) $(SHOBJ)
+ clean:	tidy 
+ 	rm -f $(OBJ) leak.out
+ 
++realclean: clean
++	rm -f test *.so
++
+ tidy:
+ 	rm -f *~ *orig *bak *rej
+ 
+--- leaktracer-2.4.orig/test.cc
++++ leaktracer-2.4/test.cc
+@@ -13,5 +13,6 @@ int main() {
+     foo();
+     foo();
+     delete z;
+-    delete z;   // delete value twice
++    // double free are now detected at runtime
++    //delete z;   // delete value twice
+ }
diff -Nru leaktracer-2.4/debian/patches/series leaktracer-2.4/debian/patches/series
--- leaktracer-2.4/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ leaktracer-2.4/debian/patches/series	2023-09-29 10:17:22.000000000 +0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru leaktracer-2.4/debian/rules leaktracer-2.4/debian/rules
--- leaktracer-2.4/debian/rules	2023-10-28 18:47:39.000000000 +0000
+++ leaktracer-2.4/debian/rules	2023-10-09 16:11:03.000000000 +0000
@@ -4,6 +4,11 @@
 # based on sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
+include /usr/share/dpkg/architecture.mk
+
+ifeq ($(origin CXX),default)
+  CXX := $(DEB_HOST_GNU_TYPE)-g++
+endif
 CFLAGS=-Wall -W -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS += -O0
@@ -21,8 +26,8 @@
 build-stamp: debian/LeakTracer.1
 	dh_testdir
 
-	$(MAKE) CFLAGS="${CFLAGS}"
-	[ $(NOCHECK) = 1 ] || $(MAKE) test
+	$(MAKE) CC="$(CXX)" CFLAGS="${CFLAGS}"
+	[ $(NOCHECK) = 1 ] || $(MAKE) test CC="$(CXX)"
 
 	touch build-stamp
 
diff -Nru leaktracer-2.4/debian/source/format leaktracer-2.4/debian/source/format
--- leaktracer-2.4/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ leaktracer-2.4/debian/source/format	2023-09-29 10:17:22.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru leaktracer-2.4/LeakCheck leaktracer-2.4/LeakCheck
--- leaktracer-2.4/LeakCheck	2023-10-28 18:47:39.000000000 +0000
+++ leaktracer-2.4/LeakCheck	2003-08-28 20:47:07.000000000 +0000
@@ -8,7 +8,7 @@
 # LeakCheck script resides; modify to your
 # needs:
 SHLIB=`dirname $0`/LeakTracer.so
-if [ ! -r $SHLIB ] ; then
+if [ ! -x $SHLIB ] ; then
     echo "$SHLIB not found"
     exit 1
 fi
diff -Nru leaktracer-2.4/Makefile leaktracer-2.4/Makefile
--- leaktracer-2.4/Makefile	2023-10-28 18:47:39.000000000 +0000
+++ leaktracer-2.4/Makefile	2003-08-28 20:34:01.000000000 +0000
@@ -7,8 +7,7 @@
 THREAD=-DTHREAD_SAVE -D_REENTRANT -D_THREAD_SAFE -pthread 
 
 # Common flags
-CFLAGS = -g -Wall -W
-C_FLAGS = $(CFLAGS) -pipe $(THREAD)
+C_FLAGS = -g -pipe -Wall -W $(THREAD)
 O_FLAGS = $(C_FLAGS)
 
 # Object files
@@ -23,9 +22,6 @@
 clean:	tidy 
 	rm -f $(OBJ) leak.out
 
-realclean: clean
-	rm -f test *.so
-
 tidy:
 	rm -f *~ *orig *bak *rej
 
diff -Nru leaktracer-2.4/test.cc leaktracer-2.4/test.cc
--- leaktracer-2.4/test.cc	2023-10-28 18:47:39.000000000 +0000
+++ leaktracer-2.4/test.cc	2003-08-28 20:38:28.000000000 +0000
@@ -13,6 +13,5 @@
     foo();
     foo();
     delete z;
-    // double free are now detected at runtime
-    //delete z;   // delete value twice
+    delete z;   // delete value twice
 }