diff -Nru xkeycaps-2.47/debian/changelog xkeycaps-2.47/debian/changelog
--- xkeycaps-2.47/debian/changelog	2017-12-26 18:48:20.000000000 +0000
+++ xkeycaps-2.47/debian/changelog	2019-06-24 09:56:50.000000000 +0000
@@ -1,3 +1,22 @@
+xkeycaps (2.47-7) unstable; urgency=medium
+
+  * Imakefile: teach ComplexProgramTarget about LDFLAGS. Spotted by blhc.
+
+ -- Christoph Berg <myon@debian.org>  Mon, 24 Jun 2019 11:56:50 +0200
+
+xkeycaps (2.47-6) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/changelog: Remove trailing whitespaces
+
+  [ Nguyen Hoang Tung ]
+  * Use dh_auto_build to fix FTCBFS. (Closes: #930845)
+
+  [ Christoph Berg ]
+  * Add debian/gitlab-ci.yml.
+
+ -- Christoph Berg <myon@debian.org>  Mon, 24 Jun 2019 09:49:31 +0200
+
 xkeycaps (2.47-5) unstable; urgency=medium
 
   * Prevent segfault in commands.c when more than 8 keysyms per key are
@@ -124,7 +143,7 @@
 
 xkeycaps (2.46-5) unstable; urgency=low
 
-  * [Imakefile] Do HP-UX specific stuff on HPPA in general, but only if not 
+  * [Imakefile] Do HP-UX specific stuff on HPPA in general, but only if not
     on Linux. (Closes: #105075)
   * Added build dependencies.
   * Marked the app-defaults file as a conffile.
diff -Nru xkeycaps-2.47/debian/gitlab-ci.yml xkeycaps-2.47/debian/gitlab-ci.yml
--- xkeycaps-2.47/debian/gitlab-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ xkeycaps-2.47/debian/gitlab-ci.yml	2019-06-24 08:49:57.000000000 +0000
@@ -0,0 +1,6 @@
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+  RELEASE: 'unstable'
diff -Nru xkeycaps-2.47/debian/patches/ldflags xkeycaps-2.47/debian/patches/ldflags
--- xkeycaps-2.47/debian/patches/ldflags	1970-01-01 00:00:00.000000000 +0000
+++ xkeycaps-2.47/debian/patches/ldflags	2019-06-24 09:03:13.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/Imakefile
++++ b/Imakefile
+@@ -356,6 +356,8 @@ LOCAL_LIBRARIES = $(XAWLIB) $(XTOOLLIB)
+ /**/#      COMPRESS = gzip --verbose --best
+ /**/#  COMPRESS_EXT = gz
+ 
++# teach ComplexProgramTarget about LDFLAGS
++LDOPTIONS += $(LDFLAGS)
+ ComplexProgramTarget(xkeycaps)
+ 
+ all-kbds.o:  kbddef.h $(KBDIR)/all-kbds.h $(ALL_KBDS)
diff -Nru xkeycaps-2.47/debian/patches/series xkeycaps-2.47/debian/patches/series
--- xkeycaps-2.47/debian/patches/series	2017-12-26 18:48:20.000000000 +0000
+++ xkeycaps-2.47/debian/patches/series	2019-06-24 09:02:15.000000000 +0000
@@ -1,2 +1,3 @@
+ldflags
 man.patch
 max8
diff -Nru xkeycaps-2.47/debian/rules xkeycaps-2.47/debian/rules
--- xkeycaps-2.47/debian/rules	2017-12-26 18:48:20.000000000 +0000
+++ xkeycaps-2.47/debian/rules	2019-06-24 08:49:57.000000000 +0000
@@ -5,7 +5,7 @@
 
 override_dh_auto_build:
 	xmkmf
-	$(MAKE) CDEBUGFLAGS="$(CFLAGS)"
+	dh_auto_build -- CDEBUGFLAGS="$(CFLAGS)"
 
 override_dh_auto_install:
 	dh_auto_install