Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please consider unblocking package xkeycaps. The new version properly
cross-builds, and also passes LDFLAGS to the final linker command
(previously, "-Wl,-z,relro" was missing).
I tested the package manually since there's no automated testsuite.
unblock xkeycaps/2.47-7
diff --git a/debian/changelog b/debian/changelog
index 28182fd..e6b0d09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+xkeycaps (2.47-7) unstable; urgency=medium
+
+ * Imakefile: teach ComplexProgramTarget about LDFLAGS. Spotted by blhc.
+
+ -- Christoph Berg <m...@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 <m...@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.1) unstable; urgency=low
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 --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
new file mode 100644
index 0000000..ac7bc44
--- /dev/null
+++ b/debian/gitlab-ci.yml
@@ -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 --git a/debian/patches/ldflags b/debian/patches/ldflags
new file mode 100644
index 0000000..f5f623d
--- /dev/null
+++ b/debian/patches/ldflags
@@ -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 --git a/debian/patches/series b/debian/patches/series
index ae55bab..436989d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+ldflags
man.patch
max8
diff --git a/debian/rules b/debian/rules
index 3ca9ceb..71a9664 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/dpkg/buildflags.mk
override_dh_auto_build:
xmkmf
- $(MAKE) CDEBUGFLAGS="$(CFLAGS)"
+ dh_auto_build -- CDEBUGFLAGS="$(CFLAGS)"
override_dh_auto_install:
dh_auto_install
Thanks,
Christoph
