I am uploading a NMU to DELAYED/10 in order to fix this.
The debdiff is attached.
diff -Nru xcolors-1.5a/debian/changelog xcolors-1.5a/debian/changelog
--- xcolors-1.5a/debian/changelog 2023-09-29 12:03:58.000000000 +0200
+++ xcolors-1.5a/debian/changelog 2023-09-29 11:57:35.000000000 +0200
@@ -1,3 +1,10 @@
+xcolors (1.5a-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Convert to source format 3.0 (closes: #1007554)
+
+ -- Bastian Germann <[email protected]> Fri, 29 Sep 2023 11:57:35 +0200
+
xcolors (1.5a-8) unstable; urgency=low
* Fix lintian errors/warnings
diff -Nru xcolors-1.5a/debian/patches/debian.patch
xcolors-1.5a/debian/patches/debian.patch
--- xcolors-1.5a/debian/patches/debian.patch 1970-01-01 01:00:00.000000000
+0100
+++ xcolors-1.5a/debian/patches/debian.patch 2023-09-29 11:57:35.000000000
+0200
@@ -0,0 +1,78 @@
+--- xcolors-1.5a.orig/xcolors.c
++++ xcolors-1.5a/xcolors.c
+@@ -28,7 +28,7 @@
+ #include <math.h> /* for sqrt() */
+
+ #ifndef RGB_TXT
+-#define RGB_TXT "/usr/lib/X11/rgb.txt"
++#define RGB_TXT "/etc/X11/rgb.txt"
+ #endif
+
+ String fallback_resources[] = {
+@@ -285,29 +285,35 @@ colordemo(parent, startcolor, nearcolor,
+
+ prev_r = prev_g = prev_b = -1;
+ save_colorname[0] = '\0';
+- while (4 == fscanf(rgb, "%d %d %d %[^\n]\n", &r, &g, &b, colorname)) {
+- if (startcolor)
+- if (l_strcasecmp(colorname, startcolor))
+- continue; /* haven't reached starting point yet */
+- else
+- startcolor = (char *)NULL;
+- if (r != prev_r || g != prev_g || b != prev_b) {
+- if (nearcolor.flags) {
+- double ourdist =
+- sqrt((double)((nearcolor.red-r)*(nearcolor.red-r)
++ while (!feof(rgb)) {
++ char str[1024];
++
++ fgets(str, 1024L, rgb);
++ if (*str != '!') /* comment */ {
++ sscanf(str, "%d %d %d %[^\n]\n", &r, &g, &b, colorname);
++ if (startcolor)
++ if (l_strcasecmp(colorname, startcolor))
++ continue; /* haven't reached starting point yet */
++ else
++ startcolor = (char *)NULL;
++ if (r != prev_r || g != prev_g || b != prev_b) {
++ if (nearcolor.flags) {
++ double ourdist =
++ sqrt((double)((nearcolor.red-r)*(nearcolor.red-r)
+ + (nearcolor.green-g)*(nearcolor.green-g)
+ + (nearcolor.blue-b)*(nearcolor.blue-b)));
+- if (ourdist > ddist)
+- continue;
+- }
+- if (save_colorname[0] != '\0') /* skip first time through */
+- if (!do_color(parent, save_colorname))
+- return;
+- prev_r = r;
+- prev_g = g;
+- prev_b = b;
++ if (ourdist > ddist)
++ continue;
++ }
++ if (save_colorname[0] != '\0') /* skip first time through */
++ if (!do_color(parent, save_colorname))
++ return;
++ prev_r = r;
++ prev_g = g;
++ prev_b = b;
++ }
++ strcpy(save_colorname, colorname);
+ }
+- strcpy(save_colorname, colorname);
+ }
+ if (save_colorname[0] != '\0')
+ (void)do_color(parent, save_colorname);
+--- xcolors-1.5a.orig/xcolors.man
++++ xcolors-1.5a/xcolors.man
+@@ -95,7 +95,7 @@ Xcolors \fIxcolors\fP
+ .fi
+ .SH FILES
+ .TP
+-.I /usr/lib/X11/rgb.txt
++.I /etc/X11/rgb.txt
+ X color names and values.
+ .SH BUGS
+ Assumes that all names for the same color are consecutive in the
diff -Nru xcolors-1.5a/debian/patches/Imakefile.patch
xcolors-1.5a/debian/patches/Imakefile.patch
--- xcolors-1.5a/debian/patches/Imakefile.patch 1970-01-01 01:00:00.000000000
+0100
+++ xcolors-1.5a/debian/patches/Imakefile.patch 2023-09-29 11:57:35.000000000
+0200
@@ -0,0 +1,14 @@
+Description: Link dynamically with X11, Xaw, and Xt
+---
+--- xcolors-1.5a.orig/Imakefile
++++ xcolors-1.5a/Imakefile
+@@ -1,7 +1,7 @@
+ RGBDBFILE = DefaultRGBDatabase
+
+- DEPLIBS = XawClientDepLibs
+-LOCAL_LIBRARIES = XawClientLibs
++ DEPLIBS = -lX11 -lXaw -lXt
++LOCAL_LIBRARIES = -lX11 -lXaw -lXt
+ SRCS = xcolors.c
+ OBJS = xcolors.o
+ SYS_LIBRARIES = -lm
diff -Nru xcolors-1.5a/debian/patches/series xcolors-1.5a/debian/patches/series
--- xcolors-1.5a/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ xcolors-1.5a/debian/patches/series 2023-09-29 11:57:35.000000000 +0200
@@ -0,0 +1,2 @@
+debian.patch
+Imakefile.patch
diff -Nru xcolors-1.5a/debian/source/format xcolors-1.5a/debian/source/format
--- xcolors-1.5a/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ xcolors-1.5a/debian/source/format 2023-09-29 11:57:31.000000000 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru xcolors-1.5a/Imakefile xcolors-1.5a/Imakefile
--- xcolors-1.5a/Imakefile 2023-09-29 12:03:58.000000000 +0200
+++ xcolors-1.5a/Imakefile 1991-10-04 04:25:53.000000000 +0100
@@ -1,7 +1,7 @@
RGBDBFILE = DefaultRGBDatabase
- DEPLIBS = -lX11 -lXaw -lXt
-LOCAL_LIBRARIES = -lX11 -lXaw -lXt
+ DEPLIBS = XawClientDepLibs
+LOCAL_LIBRARIES = XawClientLibs
SRCS = xcolors.c
OBJS = xcolors.o
SYS_LIBRARIES = -lm
diff -Nru xcolors-1.5a/xcolors.c xcolors-1.5a/xcolors.c
--- xcolors-1.5a/xcolors.c 2023-09-29 12:03:58.000000000 +0200
+++ xcolors-1.5a/xcolors.c 1991-10-04 18:49:12.000000000 +0100
@@ -28,7 +28,7 @@
#include <math.h> /* for sqrt() */
#ifndef RGB_TXT
-#define RGB_TXT "/etc/X11/rgb.txt"
+#define RGB_TXT "/usr/lib/X11/rgb.txt"
#endif
String fallback_resources[] = {
@@ -285,35 +285,29 @@
prev_r = prev_g = prev_b = -1;
save_colorname[0] = '\0';
- while (!feof(rgb)) {
- char str[1024];
-
- fgets(str, 1024L, rgb);
- if (*str != '!') /* comment */ {
- sscanf(str, "%d %d %d %[^\n]\n", &r, &g, &b, colorname);
- if (startcolor)
- if (l_strcasecmp(colorname, startcolor))
- continue; /* haven't reached starting point yet */
- else
- startcolor = (char *)NULL;
- if (r != prev_r || g != prev_g || b != prev_b) {
- if (nearcolor.flags) {
- double ourdist =
- sqrt((double)((nearcolor.red-r)*(nearcolor.red-r)
+ while (4 == fscanf(rgb, "%d %d %d %[^\n]\n", &r, &g, &b, colorname)) {
+ if (startcolor)
+ if (l_strcasecmp(colorname, startcolor))
+ continue; /* haven't reached starting point yet */
+ else
+ startcolor = (char *)NULL;
+ if (r != prev_r || g != prev_g || b != prev_b) {
+ if (nearcolor.flags) {
+ double ourdist =
+ sqrt((double)((nearcolor.red-r)*(nearcolor.red-r)
+ (nearcolor.green-g)*(nearcolor.green-g)
+ (nearcolor.blue-b)*(nearcolor.blue-b)));
- if (ourdist > ddist)
- continue;
- }
- if (save_colorname[0] != '\0') /* skip first time through */
- if (!do_color(parent, save_colorname))
- return;
- prev_r = r;
- prev_g = g;
- prev_b = b;
- }
- strcpy(save_colorname, colorname);
+ if (ourdist > ddist)
+ continue;
+ }
+ if (save_colorname[0] != '\0') /* skip first time through */
+ if (!do_color(parent, save_colorname))
+ return;
+ prev_r = r;
+ prev_g = g;
+ prev_b = b;
}
+ strcpy(save_colorname, colorname);
}
if (save_colorname[0] != '\0')
(void)do_color(parent, save_colorname);
diff -Nru xcolors-1.5a/xcolors.man xcolors-1.5a/xcolors.man
--- xcolors-1.5a/xcolors.man 2023-09-29 12:03:58.000000000 +0200
+++ xcolors-1.5a/xcolors.man 1991-10-04 20:02:56.000000000 +0100
@@ -95,7 +95,7 @@
.fi
.SH FILES
.TP
-.I /etc/X11/rgb.txt
+.I /usr/lib/X11/rgb.txt
X color names and values.
.SH BUGS
Assumes that all names for the same color are consecutive in the
