--- xcolorsel-1.1a.orig/xcolorsel.man +++ xcolorsel-1.1a/xcolorsel.man @@ -418,7 +418,7 @@ .SH INTERNALS Most of the functionality of Xcolorsel is defined in an RgbText Widget. This is a child of a TextWidget linking an RgbSrc and RgbSink Widget together, which -are childs of AsciiSrc and AsciiSink, resp. Feel free to use these +are children of AsciiSrc and AsciiSink, resp. Feel free to use these Widgets in your own programs. Most of Xcolorsel's resources are resources of these Widgets. Interested programmers should be able to find all needed information about the programming interface of these Widgets in the corresponding @@ -567,7 +567,7 @@ Maybe I should have announced xcolorsel louder when it still was called xpalette. This way the long existing segmentation fault problem would have been found earlier. Many people searching for a bug on several -machines are obviously more succesful than a single one. +machines are obviously more successful than a single one. .LP Thus once again the power of the Internet community was shown. .SH COPYRIGHTS --- xcolorsel-1.1a.orig/RgbText.c +++ xcolorsel-1.1a/RgbText.c @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include "RgbTextP.h" #include "RgbSinkP.h" #include "RgbSrc.h" @@ -146,7 +146,7 @@ { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns), XtRString, (XtPointer) "30" }, { XtNfile, XtCFile, XtRString, sizeof(String), offset(file), - XtRString, (XtPointer) "/usr/lib/X11/rgb.txt" }, + XtRString, (XtPointer) "/etc/X11/rgb.txt" }, { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), XtRString, (XtPointer) "3" }, { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), --- xcolorsel-1.1a.orig/RgbSinkP.h +++ xcolorsel-1.1a/RgbSinkP.h @@ -85,7 +85,7 @@ #include "RgbSink.h" #include "config.h" /* include superclass private header file */ -#include +#include /* This is closely related to and uses parts of: */ #include "RgbTextP.h" --- xcolorsel-1.1a.orig/RgbSrc.h +++ xcolorsel-1.1a/RgbSrc.h @@ -84,7 +84,7 @@ /*The Parent:*/ #include "RgbText.h" /* The superclass: */ -#include +#include /**************************************************************** * --- xcolorsel-1.1a.orig/RgbText.h +++ xcolorsel-1.1a/RgbText.h @@ -133,7 +133,7 @@ #ifndef _RgbText_h #define _RgbText_h -#include +#include #define XtNmaxRows "maxRows" #define XtNrows "rows" --- xcolorsel-1.1a.orig/RgbSrc.c +++ xcolorsel-1.1a/RgbSrc.c @@ -81,8 +81,14 @@ #include #include +#include #include "RgbSrcP.h" +/* workaround for Xaw 7.x */ +#if (defined(XawVersion) && (XawVersion <= 7000002L)) +typedef XawTextPosition (*_XawTextPositionFunc)(); +#endif + /* No resources */ /* No actions */ --- xcolorsel-1.1a.orig/defhelp.h +++ xcolorsel-1.1a/defhelp.h @@ -95,12 +95,12 @@ "CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n" "\n" "When you see this default message, Xcolorsel could not load its helpfile.\n" -"Set the helpfile Resource of Xcolorsel to the absolut filename of the\n" +"Set the helpfile Resource of Xcolorsel to the absolute filename of the\n" "helpfile.\n" "You can also use the -helpfile >name< command line parameter to do this or\n" "put Xcolorsel.help in the current directory.\n" "\n" -"To skip searching for an explicit file you may set the absolut filename to\n" +"To skip searching for an explicit file you may set the absolute filename to\n" "the empty string.\n" "\n" "But before looking in the current directory, Xcolorsel searches its helpfile\n" @@ -113,5 +113,5 @@ " /usr/lib/X11/help/Xcolorsel:/usr/lib/X11/help/Xcolorsel.help:\\\n" " /usr/lib/X11/Xcolorsel.help\n" "\n" -"The actual absolut setting where to find the help file is:\n" +"The actual absolute setting where to find the help file is:\n" " %s\n"; --- xcolorsel-1.1a.orig/RgbTextP.h +++ xcolorsel-1.1a/RgbTextP.h @@ -78,7 +78,7 @@ #include "RgbText.h" #include "config.h" -#include +#include #include typedef struct _colordef { unsigned short red, green, blue; /*Theoretic RGB*/ --- xcolorsel-1.1a.orig/Xcolorsel.ad +++ xcolorsel-1.1a/Xcolorsel.ad @@ -1,4 +1,6 @@ ! Standard layout: +Xcolorsel.width: 420 + *.text.scrollHorizontal: WhenNeeded *.text.scrollVertical: WhenNeeded *.text.displayCaret: False --- xcolorsel-1.1a.orig/xcolorsel.c +++ xcolorsel-1.1a/xcolorsel.c @@ -60,16 +60,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "config.h" #include "RgbText.h" @@ -253,7 +253,7 @@ String translations="WM_PROTOCOLS: wm_protocols()"; -void main(int argc,char *argv[]) +int main(int argc,char *argv[]) { size_t i; register char *(*ptr); @@ -478,6 +478,8 @@ XtSetValues(myshell, args, 1); XtAppMainLoop(mycontext); + +return 0; } void usage(int argc,char *argv[]) --- xcolorsel-1.1a.orig/Imakefile +++ xcolorsel-1.1a/Imakefile @@ -82,9 +82,9 @@ DependTarget() appdef-c.h: Xcolorsel-color.ad - app2head Xcolorsel-color.ad > appdef-c.h + ./app2head Xcolorsel-color.ad > appdef-c.h appdef.h: Xcolorsel.ad - app2head Xcolorsel.ad > appdef.h + ./app2head Xcolorsel.ad > appdef.h purge: $(RM) xcolorsel *.o appdef.h appdef-c.h Xcolorsel.help *.tar.Z Makefile Makefile.bak makefile *.tar *.tar.gz Xcolorsel.help: xcolorsel.man --- xcolorsel-1.1a.orig/Xcolorsel-color.ad +++ xcolorsel-1.1a/Xcolorsel-color.ad @@ -13,57 +13,57 @@ ! If this is the case you may also want to include the following ! (by removing the leading !) -!*.message.borderWidth:0 +*.message.borderWidth:0 ! and to exclude (by inserting ! as the first character) the next lines: -*.message.borderWidth:2 -*.Scrollbar.background: Chocolate2 -*.Scrollbar.foreground: Chocolate4 +!*.message.borderWidth:2 +!*.Scrollbar.background: Chocolate2 +!*.Scrollbar.foreground: Chocolate4 ! Other (generic) color settings: -*.borderColor: LightSalmon4 +!*.borderColor: LightSalmon4 *.pointerColor: Black *.pointerColorBackground: White -*.Background: SandyBrown -*.Foreground: Salmon4 +!*.Background: SandyBrown +!*.Foreground: Salmon4 *.text.borderWidth: 2 *.displayMenu.borderWidth: 2 -*.Command.background: Chocolate1 -*.Command.foreground: Chocolate4 +!*.Command.background: Chocolate1 +!*.Command.foreground: Chocolate4 -*.Toggle.background: Chocolate2 -*.Toggle.foreground: Chocolate4 +!*.Toggle.background: Chocolate2 +!*.Toggle.foreground: Chocolate4 *.quit.background: OrangeRed2 -*.quit.foreground: OrangeRed4 +!*.quit.foreground: OrangeRed4 *.close.background: OrangeRed2 -*.close.foreground: OrangeRed4 +!*.close.foreground: OrangeRed4 *.about.background: OliveDrab2 -*.about.foreground: OliveDrab4 +!*.about.foreground: OliveDrab4 *.defaults.background: OliveDrab2 -*.defaults.foreground: OliveDrab4 +!*.defaults.foreground: OliveDrab4 *.grab.background: Gold1 -*.grab.foreground: Gold4 +!*.grab.foreground: Gold4 *.display.background: Gold1 -*.display.foreground: Gold4 +!*.display.foreground: Gold4 *.fileinfo.background: Gold2 -*.fileinfo.foreground: Gold4 +!*.fileinfo.foreground: Gold4 *.reverse.background: Gold2 -*.reverse.foreground: Gold4 +!*.reverse.foreground: Gold4 ! Include standard settings: --- xcolorsel-1.1a.orig/RgbSink.h +++ xcolorsel-1.1a/RgbSink.h @@ -85,7 +85,7 @@ /*The Parent:*/ #include "RgbText.h" /* The superclass: */ -#include +#include /**************************************************************** * --- xcolorsel-1.1a.orig/RgbSink.c +++ xcolorsel-1.1a/RgbSink.c @@ -81,6 +81,7 @@ #include #include +#include #include "RgbSinkP.h" /* Find current Xrelease number */ @@ -98,6 +99,12 @@ #endif /* LIB_X11R5 */ #endif /* LIB_X11R6 */ +/* workaround for Xaw 7.x */ +#if XawVersion >= 7000002L +typedef int (*_XawSinkIntFunc)(); +typedef void (*_XawSinkVoidFunc)(); +#endif + /* No resources */ /* No actions */ --- xcolorsel-1.1a.orig/RgbSrcP.h +++ xcolorsel-1.1a/RgbSrcP.h @@ -85,7 +85,7 @@ #include "config.h" /* include superclass private header file */ -#include +#include /* This is closely related to and uses parts of: */ #include "RgbTextP.h" --- xcolorsel-1.1a.orig/debian/menu +++ xcolorsel-1.1a/debian/menu @@ -0,0 +1,2 @@ +?package(xcolorsel):needs="x11" section="Applications/System/Administration" title="Xcolorsel" \ + command="/usr/bin/xcolorsel" --- xcolorsel-1.1a.orig/debian/copyright +++ xcolorsel-1.1a/debian/copyright @@ -0,0 +1,50 @@ +This is the GNU/Linux prepackaged version of xcolorsel. + +This package was put together by Larry Daffner +from sources obtained from: + ftp://ftp.x.org/R5contrib/xcolorsel-1.1a-src.tar.gz + + +/*********************************************************************************/ +/* This file is part of Xcolorsel, a multipurpose viewer for X11 rgb.txt files. */ +/* Copyright (C) 1993, 1994 Michael Weller */ +/* */ +/* This program is free software; you can redistribute it and/or modify it under */ +/* the terms of the GNU General Public License as published be the Free Software */ +/* Foundation; either version 2 of the License, or (at your opinion) any later */ +/* version. */ +/* */ +/* This program is distributed in the hope that it will be useful, but WITHOUT */ +/* ANY WARRANTY; without even the implied warranty of MERCHANBILITY or FITNESS */ +/* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more */ +/* details. */ +[...] +/* */ +/* Part of the files are derived from the Template Widget of the Athena Widgets */ +/* as published by the Massachusetts Institute of Technology. Actually these */ +/* files do not contain any code by the M.I.T but only variable declarations. */ +/* Nevertheless these parts of these files are still distributed under the terms */ +/* of the M.I.T copyright which are here repeated: */ +/* */ +/* Copyright Massachusetts Institute of Technology 1987, 1988 */ +/* */ +/* Permission to use, copy, modify, distribute, and sell this software and its */ +/* documentation for any purpose is hereby granted without fee, provided that */ +/* the above copyright notice appear in all copies and that both that */ +/* copyright notice and this permission notice appear in supporting */ +/* documentation, and that the name of M.I.T. not be used in advertising or */ +/* publicity pertaining to distribution of the software without specific, */ +/* written prior permission. M.I.T. makes no representations about the */ +/* suitability of this software for any purpose. It is provided "as is" */ +/* without express or implied warranty. */ +/* */ +/* M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL */ +/* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T. */ +/* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES */ +/* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION */ +/* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN */ +/* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*********************************************************************************/ + +On GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- xcolorsel-1.1a.orig/debian/changelog +++ xcolorsel-1.1a/debian/changelog @@ -0,0 +1,175 @@ +xcolorsel (1.1a-18) unstable; urgency=low + + * QA upload. + * Change maintainer to QA group. + * Convert packaging from handwritten to debhelper + * Use dpkg-buildflags + * Change menu section to Applications/System/Administration + + -- Frank Lichtenheld Tue, 04 Dec 2012 23:46:57 +0100 + +xcolorsel (1.1a-17) unstable; urgency=low + + * Correct xutils build-dep to xutils-dev (Closes: #485541) + + -- Decklin Foster Mon, 16 Jun 2008 22:17:17 -0400 + +xcolorsel (1.1a-16) unstable; urgency=low + + * Replace hardcoded reference to /usr/lib/X11/rgb.txt with /etc/X11/rgb.txt. + + -- Decklin Foster Sat, 15 Apr 2006 18:18:19 -0400 + +xcolorsel (1.1a-15) unstable; urgency=low + + * The "Party like it's 2002" release + * Do not attempt to clean up in /usr/doc if that directory is actually a + symlink to /usr/share/doc. (Closes: #356075) + + -- Decklin Foster Thu, 9 Mar 2006 12:02:12 -0500 + +xcolorsel (1.1a-14) unstable; urgency=low + + * Remove /usr/doc/xcolorsel in postinst in case an older version did not + clean it up. (Closes: #355341) + + -- Decklin Foster Mon, 6 Mar 2006 17:52:43 -0500 + +xcolorsel (1.1a-13) unstable; urgency=low + + * Rebuild against libxaw7, and change build-deps to prevent building against + libxaw6 or libxaw8. (Closes: #321668) + + -- Decklin Foster Tue, 10 Jan 2006 14:21:23 -0500 + +xcolorsel (1.1a-12) unstable; urgency=low + + * Build against X.org (libx11-dev and libxt-dev, instead of XFree86's + xlibs-dev). (Closes: #346800) + * Bump Standards-Version to 3.6.2. + * Rebuild now that xaw3d is fixed. The above changes are from before I + opened this bug. (Closes: #321668) + * Install to /usr/bin, /usr/share/man, etc, instead of /usr/X11R6. + * Fix section in man page. + * Install menu file to /usr/share/menu. + + -- Decklin Foster Mon, 9 Jan 2006 20:43:57 -0500 + +xcolorsel (1.1a-11) unstable; urgency=low + + * New maintainer (Closes: #160303) + * Rebuild with new xaw3dg (Closes: #136891) + - Well, that was stupidly easy. Thanks, xaw3d people! + * Remove all traces of obsolete xaw-wappers support + * Comply with policy 3.6.0 + - Do not set /usr/doc link + - Respect DEB_BUILD_OPTIONS + + -- Decklin Foster Sun, 24 Aug 2003 10:38:27 -0400 + +xcolorsel (1.1a-10) unstable; urgency=low + + * build explicitly with Xaw3d and depend on it. Add it to Build-Depends too. + * This conveniently (closes: #128236). + * Remove hacks from 1.1a-8.1 as Xaw3d apes the older Xaw. + * Change source maintainer to myself (closes: #82446). + + -- Ian Zimmerman Fri, 15 Feb 2002 08:10:40 -0800 + +xcolorsel (1.1a-9) unstable; urgency=low + + * QA upload. + * Don't assume that hppa is HP-UX (closes: #105072). + * Clean debian/substvars. + + -- Colin Watson Wed, 25 Jul 2001 14:11:18 +0100 + +xcolorsel (1.1a-8.2) unstable; urgency=low + + * NMU + * Package is orphaned, setting the maintainer to the Debian QA Group + + -- Carlos Laviola Fri, 13 Apr 2001 01:14:34 -0300 + +xcolorsel (1.1a-8.1) unstable; urgency=low + + * NMU + * RgbSrc.c, RgbSink.c: some quick hacks to get around the fact that the + author of this X client did what you're never supposed to do; relied + upon internal interfaces of a library he depended upon. So, of course, + xcolorsel wouldn't build now that Xaw has revved. + * /usr/doc -> /usr/share/doc + * strip installed binary + * comment out xaw-wrappers stuff, now that we are built against Xaw7 + * lintian 1.20.9 clean + * debian/control: + - added Build-Depends + - bumped Standards-Version to 3.5.2 + * debian/copyright: + - correct path to GPL license text + * debian/rules: + - add -isp to dpkg-gencontrol + + -- Branden Robinson Fri, 16 Mar 2001 21:31:36 -0500 + +xcolorsel (1.1a-8) unstable; urgency=low + + * debian/menu: New file: adds menu support + * debian/xaw-wrappers: New file: support for new xaw-wrappers (#37106) + * debian/postinst: Changes for new xaw-wrappers support + * debian/postrm: Changes for new xaw-wrappers support + * debian/prerm: New file needed for new xaw-wrappers support + * debian/rules: Changes for menu and xaw-wrappers support + * debian/rules: Remove use of {foo,bar} bashism + * xcolorsel.c: Return zero from main + + -- Mark Baker Mon, 5 Jul 1999 23:53:52 +0100 + +xcolorsel (1.1a-7) unstable; urgency=low + + * Rewritten description into English instead of bad-English (#18976) + + -- Mark Baker Sat, 07 Mar 1998 16:18:36 +0000 + +xcolorsel (1.1a-6) unstable; urgency=low + + * Fixed permissions + * Updated standards version to 2.4.0.0 + + -- Mark Baker Tue, 09 Sep 1997 22:18:55 +0100 + +xcolorsel (1.1a-5) unstable; urgency=low + + * Compiled against xlib6g... + * ... and in the process lose bogus dependency on elf-x11r6 (#12649) + + -- Mark Baker Tue, 09 Sep 1997 22:18:55 +0100 + +xcolorsel (1.1a-4) unstable; urgency=low + + * Changed maintainer field in control file, as I forgot to do last time + + -- Mark Baker Sun, 13 Jul 1997 22:03:10 +0100 + +xcolorsel (1.1a-3) unstable; urgency=low + + * New maintainer + * Compiled against libc6 + * Changed the colour scheme so you can read the buttons + + -- Mark Baker Fri, 20 Jun 1997 17:47:37 +0100 + +xcolorsel (1.1a-2) unstable; urgency=low + + * Call install-fvwm2menu if available + + -- Larry Daffner Thu, 17 Oct 1996 00:27:46 -0500 + +xcolorsel (1.1a-1) unstable; urgency=low + + * New package + + -- Larry Daffner Wed, 2 Oct 1996 14:08:04 -0500 + + + --- xcolorsel-1.1a.orig/debian/docs +++ xcolorsel-1.1a/debian/docs @@ -0,0 +1,2 @@ +00-ANNOUNCE +00-README --- xcolorsel-1.1a.orig/debian/control +++ xcolorsel-1.1a/debian/control @@ -0,0 +1,17 @@ +Source: xcolorsel +Section: x11 +Priority: optional +Maintainer: Debian QA Group +Build-Depends: debhelper (>= 9), + libx11-dev, libxt-dev, xaw3dg-dev, libxaw7-dev, xutils-dev +Standards-Version: 3.6.2 + +Package: xcolorsel +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: display colors and names in X + xcolorsel is an X utility that displays the contents of the X color list + file (/etc/X11/rgb.txt) together with tiles showing how the color looks on + your screen. You can cut the color names/definitions in various formats + (suitable for resource files or C source) so they can be pasted directly + into source codes or resources. --- xcolorsel-1.1a.orig/debian/compat +++ xcolorsel-1.1a/debian/compat @@ -0,0 +1 @@ +9 --- xcolorsel-1.1a.orig/debian/rules +++ xcolorsel-1.1a/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +CFLAGS = -Wall +CFLAGS += $(shell dpkg-buildflags --get CFLAGS) +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) + +%: + dh $@ + +override_dh_auto_configure: + xmkmf -a -DHasSELinux=0 + +override_dh_auto_build: + $(MAKE) XAWLIB=-lXaw3d CDEBUGFLAGS='$(CFLAGS)' LOCAL_LDFLAGS='$(LDFLAGS)' + +override_dh_auto_clean: + [ ! -f Makefile ] || $(MAKE) cleandir + [ ! -f Makefile ] || $(MAKE) purge + +override_dh_auto_install: + $(MAKE) DESTDIR=debian/xcolorsel BINDIR='$(DESTDIR)/usr/bin' LIBDIR='$(DESTDIR)/usr/lib' install + $(MAKE) DESTDIR=debian/xcolorsel MANPATH='$(DESTDIR)/usr/share/man' PROJECTMANSUFFIX='' install.man + +override_dh_installchangelogs: + dh_installchangelogs 01-CHANGELOG