--- 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 --- xcolors-1.5a.orig/debian/changelog +++ xcolors-1.5a/debian/changelog @@ -0,0 +1,112 @@ +xcolors (1.5a-8) unstable; urgency=low + + * Fix lintian errors/warnings + + -- Fredrik Hallenberg Tue, 30 Jul 2013 23:14:09 +0200 + +xcolors (1.5a-7) unstable; urgency=low + + * Removed useless dependencies, in particular on libxp (closes: #623666) + + -- Fredrik Hallenberg Fri, 22 Apr 2011 11:30:30 +0200 + +xcolors (1.5a-6) unstable; urgency=low + + * Build-depend on xutils-dev instead of xutils (closes: #485540) + + -- Fredrik Hallenberg Tue, 10 Jun 2008 22:20:50 +0200 + +xcolors (1.5a-5) unstable; urgency=low + + * Updated location of rgb.txt (closes: #423565) + + -- Fredrik Hallenberg Tue, 15 May 2007 18:03:36 +0200 + +xcolors (1.5a-4) unstable; urgency=low + + * Updated for new X build tools (closes: #370383) + + -- Fredrik Hallenberg Mon, 5 Jun 2006 10:25:02 +0200 + +xcolors (1.5a-3) unstable; urgency=low + + * Fixed build-depends (closes: #346799) + + -- Fredrik Hallenberg Sat, 14 Jan 2006 19:02:07 +0100 + +xcolors (1.5a-2) unstable; urgency=low + + * Added libxaw7 build dependency (closes: #113275) + + -- Fredrik Hallenberg Thu, 4 Oct 2001 21:43:20 +0200 + +xcolors (1.5a-1) unstable; urgency=low + + * Removed binary from orig archive (closes: #86381) + + -- Fredrik Hallenberg Sun, 25 Feb 2001 22:28:19 +0100 + +xcolors (1.5-8) unstable; urgency=low + + * Added xutils to build-depends (closes: #85373) + + -- Fredrik Hallenberg Fri, 9 Feb 2001 14:18:57 +0100 + +xcolors (1.5-7) unstable; urgency=low + + * Updated menu entry with hints (closes: #80072) + + -- Fredrik Hallenberg Wed, 20 Dec 2000 11:33:03 +0100 + +xcolors (1.5-6) unstable; urgency=low + + * Added menu entry (closes: #76970) + + -- Fredrik Hallenberg Mon, 20 Nov 2000 21:27:19 +0100 + +xcolors (1.5-5) unstable; urgency=low + + * Fixed build problems (fixes: bug #15264, #15506) + * Updated to standards version 2.4.0.0 + * New maintainer + + -- Fredrik Hallenberg Tue, 17 Mar 1998 00:30:30 +0100 + +xcolors (1.5-4.1) unstable; urgency=low + + * Non-maintainer release. + * Libc6 compile. + + -- Martin Mitchell Wed, 12 Nov 1997 04:18:23 +1100 + +xcolors (1.5-4) unstable; urgency=low + + * Fixed bug: manpage now compressed. + + -- Syrus Nemat-Nasser Wed, 25 Dec 1996 11:36:49 -0800 + +xcolors (1.5-3) unstable; urgency=low + + * Changed to new source packing scheme + * New Maintainer + + -- Syrus Nemat-Nasser Sun, 22 Dec 1996 21:01:10 -0800 + +Tue May 7 11:04:56 MET DST 1996 Michael Meskes + + xcolors (1.5-1): + + * Added Debian files + +Sun Jun 30 13:55:23 MET DST 1996 Michael Meskes + + xcolors (1.5-2): + + * Changed debian.rules for new naming scheme. + + * Changed extended description + + +Local variables: +mode: debian-changelog +End: --- xcolors-1.5a.orig/debian/compat +++ xcolors-1.5a/debian/compat @@ -0,0 +1 @@ +7 --- xcolors-1.5a.orig/debian/control +++ xcolors-1.5a/debian/control @@ -0,0 +1,13 @@ +Source: xcolors +Section: x11 +Priority: optional +Maintainer: Fredrik Hallenberg +Standards-Version: 3.9.4 +Build-Depends: debhelper (>=7), libxaw7-dev, libxt-dev, libx11-dev, xutils-dev + +Package: xcolors +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: display all X11 color names and colors + Reads the rgb.txt file that defines the color names the X server + knows and displays the colors found. --- xcolors-1.5a.orig/debian/copyright +++ xcolors-1.5a/debian/copyright @@ -0,0 +1,26 @@ +This is the Debian Linux prepackaged version of xcolors. + +This package was put together by Michael Meskes , +from sources obtained from: +sunsite.unc.edu:/pub/linux/X11/xutils/status/xcolor.tar.z + +Changes: + * added Debian Linux package maintenance system files + +The original code carries the following copyright: + + * Copyright (c) 1989,1991 by Stephen Gildea + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, provided + * that the above copyright notice appears in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. The authors make no representations about the + * suitability of this software for any purpose. It is provided "as is" + * without express or implied warranty. + * + * Author: Stephen Gildea + * Orignal program by Paul Vixie. + +Tue May 7 11:05:43 MET DST 1996 Michael Meskes + --- xcolors-1.5a.orig/debian/dirs +++ xcolors-1.5a/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- xcolors-1.5a.orig/debian/menu +++ xcolors-1.5a/debian/menu @@ -0,0 +1,6 @@ +?package(xcolors):\ + needs="X11" \ + section="Applications/Programming" \ + hints="Selectors,Color" \ + title="xcolors" \ + command="/usr/bin/xcolors" --- xcolors-1.5a.orig/debian/rules +++ xcolors-1.5a/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f +# Sample debian.rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified + +# There used to be `source' and `diff' targets in this file, and many +# packages also had `changes' and `dist' targets. These functions +# have been taken over by dpkg-source, dpkg-genchanges and +# dpkg-buildpackage in a package-independent way, and so these targets +# are obsolete. + + +CFLAGS = -g -O2 -DRGB_TXT="\\\"/etc/X11/rgb.txt\\\"" +LDFLAGS = -s +STRIP=strip +CC = gcc + +package=xcolors + +DPKG_EXPORT_BUILDFLAGS=1 +include /usr/share/dpkg/buildflags.mk + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: + $(checkdir) + xmkmf + make CC="$(CC)" CFLAGS="$(CFLAGS)" EXTRA_LDOPTIONS="$(LDFLAGS)" + touch build-stamp + +clean: + $(checkdir) + if test -f Makefile; then make clean; fi + rm -f build Makefile.bak Makefile + rm -rf *~ debian/xcolors debian/*~ debian/files* + dh_clean + +binary-indep: checkroot build + $(checkdir) +# There are no architecture-independent files to be uploaded +# generated by this package. If there were any they would be +# made here. + +binary-arch: checkroot build + $(checkdir) + -rm -rf debian/tmp + test -f build || make -f debian/rules build + make install install.man DESTDIR=debian/xcolors + mv debian/xcolors/usr/share/man/man1/xcolors.1x debian/xcolors/usr/share/man/man1/xcolors.1 + dh_installdocs + dh_installchangelogs + dh_installmenu + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +define checkdir + test -f $(package).c -a -f debian/rules +endef + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot --- xcolors-1.5a.orig/xcolors.c +++ xcolors-1.5a/xcolors.c @@ -28,7 +28,7 @@ #include /* 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 @@ 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 @@ .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