xxkb (1.11.1-3) unstable; urgency=medium
.
* QA upload.
* Add 0004-fix-ftbfs-on-gcc-14.patch to fix the ftbfs issue.
(Closes: #1075694)
* Set std-ver to 4.7.0.
* Add Rules-Requires-Root on d/control.
* Add doc-base for xxkb.
* debian/rules: clean up Makefile explicitly.
* debian/rules: update CDEBUGFLAGS to fix hardening issue.
Oops, I forget the debdiff about this, sorry for that.
diff -Nru xxkb-1.11.1/debian/changelog xxkb-1.11.1/debian/changelog
--- xxkb-1.11.1/debian/changelog 2022-11-21 00:04:37.000000000 +0800
+++ xxkb-1.11.1/debian/changelog 2024-11-04 23:12:36.000000000 +0800
@@ -1,3 +1,16 @@
+xxkb (1.11.1-3) unstable; urgency=medium
+
+ * QA upload.
+ * Add 0004-fix-ftbfs-on-gcc-14.patch to fix the ftbfs issue.
+ (Closes: #1075694)
+ * Set std-ver to 4.7.0.
+ * Add Rules-Requires-Root on d/control.
+ * Add doc-base for xxkb.
+ * debian/rules: clean up Makefile explicitly.
+ * debian/rules: update CDEBUGFLAGS to fix hardening issue.
+
+ -- Bo YU <tsu.yubo@gmail.com> Mon, 04 Nov 2024 23:12:36 +0800
+
xxkb (1.11.1-2) unstable; urgency=medium
* QA upload.
diff -Nru xxkb-1.11.1/debian/clean xxkb-1.11.1/debian/clean
--- xxkb-1.11.1/debian/clean 1970-01-01 07:30:00.000000000 +0730
+++ xxkb-1.11.1/debian/clean 2024-11-04 23:12:36.000000000 +0800
@@ -0,0 +1 @@
+Makefile
diff -Nru xxkb-1.11.1/debian/control xxkb-1.11.1/debian/control
--- xxkb-1.11.1/debian/control 2022-11-21 00:04:37.000000000 +0800
+++ xxkb-1.11.1/debian/control 2024-11-04 23:12:36.000000000 +0800
@@ -9,10 +9,11 @@
libxt-dev,
xutils-dev,
Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
Homepage: http://sourceforge.net/projects/xxkb/
Vcs-Git: https://salsa.debian.org/debian/xxkb.git
Vcs-Browser: https://salsa.debian.org/debian/xxkb
+Rules-Requires-Root: no
Package: xxkb
Architecture: any
diff -Nru xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch
--- xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch 1970-01-01 07:30:00.000000000 +0730
+++ xxkb-1.11.1/debian/patches/0004-fix-ftbfs-on-gcc-14.patch 2024-11-04 23:12:36.000000000 +0800
@@ -0,0 +1,17 @@
+Description: fix ftbfs on gcc-14
+Author: Bo YU <tsu.yubo@gmail.com>
+Bug: https://bugs.debian.org/1075694
+Last-Update: 2024-11-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/resource.c
++++ b/resource.c
+@@ -622,7 +622,7 @@
+ if (filename)
+ stat = XrmCombineFileDatabase(filename, &db, True);
+ else
+- stat = NULL;
++ stat = 0;
+ if (stat == 0 && db == NULL) {
+ /* failed */
+ warnx("Unable to find configuration data");
diff -Nru xxkb-1.11.1/debian/patches/series xxkb-1.11.1/debian/patches/series
--- xxkb-1.11.1/debian/patches/series 2022-11-21 00:04:37.000000000 +0800
+++ xxkb-1.11.1/debian/patches/series 2024-11-04 23:12:36.000000000 +0800
@@ -1,3 +1,4 @@
0001-debian-patch.patch
0002-Fix-manpage-semantics.patch
0003-Imakefile-enable-debug-flag.patch
+0004-fix-ftbfs-on-gcc-14.patch
diff -Nru xxkb-1.11.1/debian/rules xxkb-1.11.1/debian/rules
--- xxkb-1.11.1/debian/rules 2022-11-21 00:04:37.000000000 +0800
+++ xxkb-1.11.1/debian/rules 2024-11-04 23:12:36.000000000 +0800
@@ -3,11 +3,19 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export CFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)
+export LDFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)
+
%:
dh $@
-execute_before_dh_auto_build:
+execute_after_dh_auto_clean:
+ dh_auto_clean
+ rm -f Makefile
+
+override_dh_auto_build:
xmkmf
+ $(MAKE) CDEBUGFLAGS="$(CFLAGS) $(LDFLAGS) $(CDEBUGFLAGS)"
override_dh_auto_install:
$(MAKE) install install.man DESTDIR=$(CURDIR)/debian/tmp/
diff -Nru xxkb-1.11.1/debian/watch xxkb-1.11.1/debian/watch
--- xxkb-1.11.1/debian/watch 2022-11-21 00:04:37.000000000 +0800
+++ xxkb-1.11.1/debian/watch 2024-11-04 23:12:36.000000000 +0800
@@ -1,2 +1,2 @@
-version=3
+version=4
http://sf.net/xxkb/xxkb-(\d+(?:\.\d+)+)-src\.tar\.gz
diff -Nru xxkb-1.11.1/debian/xxkb.doc-base xxkb-1.11.1/debian/xxkb.doc-base
--- xxkb-1.11.1/debian/xxkb.doc-base 1970-01-01 07:30:00.000000000 +0730
+++ xxkb-1.11.1/debian/xxkb.doc-base 2024-11-04 23:12:36.000000000 +0800
@@ -0,0 +1,10 @@
+Document: xxkb
+Title: Debian xxkb Manual
+Author: Ivan Pascal
+Abstract: This manual describes what xxkb is
+ and how to use it.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/xxkb/3gr.html
+Files: /usr/share/doc/xxkb/3gr.html
Attachment:
signature.asc
Description: PGP signature