Hello community,
here is the log from the commit of package xstdcmap for openSUSE:Factory checked in at 2013-02-28 07:15:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xstdcmap (Old)
and /work/SRC/openSUSE:Factory/.xstdcmap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xstdcmap", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xstdcmap/xstdcmap.changes 2012-05-08 12:08:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xstdcmap.new/xstdcmap.changes 2013-02-28 10:23:53.000000000 +0100
@@ -1,0 +2,17 @@
+Mon Feb 25 19:13:54 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 1.0.3:
+ + Constify some char * to fix gcc warnings.
+ + Combine usage message into single string.
+ + Add -version option.
+ + Replace sprintf with snprintf.
+ + -help should not fail if display cannot be opened.
+ + Mark Exit() & usage() with _X_NORETURN, cleanup previous
+ workarounds.
+ + config:
+ - Add missing AC_CONFIG_SRCDIR.
+ - Replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS.
+ - Move man pages into their own directory.
+ man: remove trailing spaces and tabs.
+
+-------------------------------------------------------------------
Old:
----
xstdcmap-1.0.2.tar.bz2
New:
----
xstdcmap-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xstdcmap.spec ++++++
--- /var/tmp/diff_new_pack.8l2nud/_old 2013-02-28 10:23:54.000000000 +0100
+++ /var/tmp/diff_new_pack.8l2nud/_new 2013-02-28 10:23:54.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xstdcmap
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xstdcmap
-Version: 1.0.2
+Version: 1.0.3
Release: 0
-License: MIT
Summary: Utility to define standard colormap properties
-Url: http://xorg.freedesktop.org/
+License: MIT
Group: System/X11/Utilities
+Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
BuildRequires: pkg-config
BuildRequires: pkgconfig(x11)
++++++ xstdcmap-1.0.2.tar.bz2 -> xstdcmap-1.0.3.tar.bz2 ++++++
++++ 10802 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/ChangeLog new/xstdcmap-1.0.3/ChangeLog
--- old/xstdcmap-1.0.2/ChangeLog 2010-09-27 03:17:55.000000000 +0200
+++ new/xstdcmap-1.0.3/ChangeLog 2013-02-11 01:15:44.000000000 +0100
@@ -1,3 +1,99 @@
+commit a1569179b99f6c8af86132030077439c1dbd52c2
+Author: Alan Coopersmith
+Date: Sun Feb 10 16:15:08 2013 -0800
+
+ xstdcmap 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit dcd3ef4f939077b032319508ea6f6107286dd39a
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:50:21 2013 -0800
+
+ Constify some char * to fix gcc warnings
+
+ Signed-off-by: Alan Coopersmith
+
+commit d8f572a262c37f79d3fabc855543404b774c96b1
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:46:49 2013 -0800
+
+ Combine usage message into single string
+
+ Signed-off-by: Alan Coopersmith
+
+commit 250cdac0bcc73e1dee9094ded8612f500370640c
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:38:19 2013 -0800
+
+ Add -version option
+
+ Signed-off-by: Alan Coopersmith
+
+commit c6f15b6d67f4c8df2af07848d6277593e24f6352
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:35:40 2013 -0800
+
+ Replace sprintf with snprintf
+
+ Signed-off-by: Alan Coopersmith
+
+commit 06186d82c57b2545db2d6b1a6665f23d1b6a3cfd
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:29:03 2013 -0800
+
+ -help should not fail if display cannot be opened
+
+ Signed-off-by: Alan Coopersmith
+
+commit 701d5f797a77ba3b3ff2d8c25b7951563d7e4363
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:25:45 2013 -0800
+
+ Mark Exit() & usage() with _X_NORETURN, cleanup previous workarounds
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4b994408d260eb90d8c65739bc3cd6d56037b10a
+Author: Alan Coopersmith
+Date: Sun Jan 13 12:16:41 2013 -0800
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 88f027eb5caafea16925b44e8da77e9837b4988e
+Author: Gaetan Nadon
+Date: Wed Jan 19 10:06:57 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon
+
+commit c2e66dced98d62bbfe013e54f2332b9950a268b9
+Author: Gaetan Nadon
+Date: Thu Jan 13 11:15:48 2011 -0500
+
+ man: remove trailing spaces and tabs
+
+ Using s/[ \t]*$//
+
+ Signed-off-by: Gaetan Nadon
+
+commit e6c2aa2cea7df267679414155434d7c1ee5f837d
+Author: Gaetan Nadon
+Date: Wed Jan 12 16:28:02 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ This silences an Autoconf warning
+
commit 180893b7d452d31e1a64671292315abef8b7590e
Author: Alan Coopersmith
Date: Sun Sep 26 18:16:14 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/Makefile.am new/xstdcmap-1.0.3/Makefile.am
--- old/xstdcmap-1.0.2/Makefile.am 2010-09-27 03:11:43.000000000 +0200
+++ new/xstdcmap-1.0.3/Makefile.am 2013-02-11 01:15:16.000000000 +0100
@@ -19,6 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xstdcmap
AM_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS)
@@ -27,24 +28,7 @@
xstdcmap_SOURCES = \
xstdcmap.c
-appman_PRE = \
- xstdcmap.man
-
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE)
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
.PHONY: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/configure.ac new/xstdcmap-1.0.3/configure.ac
--- old/xstdcmap-1.0.2/configure.ac 2010-09-27 03:15:51.000000000 +0200
+++ new/xstdcmap-1.0.3/configure.ac 2013-02-11 01:15:16.000000000 +0100
@@ -21,9 +21,14 @@
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xstdcmap], [1.0.2],
+AC_INIT([xstdcmap], [1.0.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xstdcmap])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -32,9 +37,11 @@
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XSTDCMAP, xmu x11)
+PKG_CHECK_MODULES(XSTDCMAP, [xmu x11 xproto >= 7.0.17])
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+ Makefile
+ man/Makefile])
+AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/man/Makefile.am new/xstdcmap-1.0.3/man/Makefile.am
--- old/xstdcmap-1.0.2/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/xstdcmap-1.0.3/man/Makefile.am 2013-02-11 01:15:16.000000000 +0100
@@ -0,0 +1,12 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = xstdcmap.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/man/xstdcmap.man new/xstdcmap-1.0.3/man/xstdcmap.man
--- old/xstdcmap-1.0.2/man/xstdcmap.man 1970-01-01 01:00:00.000000000 +0100
+++ new/xstdcmap-1.0.3/man/xstdcmap.man 2013-02-11 01:15:16.000000000 +0100
@@ -0,0 +1,116 @@
+.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $
+.\" Copyright 1989, 1994, 1998 The Open Group
+.\"
+.\" 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.
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of The Open Group shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from The Open Group.
+.\"
+.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $
+.\"
+.de EX \"Begin example
+.ne 5
+.if n .sp 1
+.if t .sp .5
+.nf
+.in +.5i
+..
+.de EE
+.fi
+.in -.5i
+.if n .sp 1
+.if t .sp .5
+..
+.TH XSTDCMAP 1 __xorgversion__
+.SH NAME
+xstdcmap - X standard colormap utility
+.SH SYNOPSIS
+.B xstdcmap
+[-all] [-best] [-blue] [-default] [-delete \fImap\fP] [-display \fIdisplay\fP]
+[-gray] [-green] [-help] [-red] [-verbose] [-version]
+.SH DESCRIPTION
+.PP
+The \fIxstdcmap\fP utility can be used to selectively define standard colormap
+properties. It is intended to be run from a user's X startup script to
+create standard colormap definitions in order to facilitate sharing of
+scarce colormap resources among clients. Where at all possible, colormaps
+are created with read-only allocations.
+.SH OPTIONS
+.PP
+The following options may be used with \fIxstdcmap\fP:
+.TP 8
+.B \-all
+This option indicates that all six standard colormap properties should be
+defined on each screen of the display. Not all screens will support
+visuals under which all six standard colormap properties are meaningful.
+\fIxstdcmap\fP will determine the best
+allocations and visuals for the colormap properties of a screen. Any
+previously existing standard colormap properties will be replaced.
+.TP 8
+.B \-best
+This option indicates that the RGB_BEST_MAP should be defined.
+.TP 8
+.B \-blue
+This option indicates that the RGB_BLUE_MAP should be defined.
+.TP 8
+.B \-default
+This option indicates that the RGB_DEFAULT_MAP should be defined.
+.TP 8
+.B \-delete \fImap\fP
+This option specifies that a specific standard colormap property, or
+all such properties, should be removed.
+\fImap\fP may be one of: default, best, red, green, blue, gray, or all.
+.TP 8
+.B \-display \fIdisplay\fP
+This option specifies the host and display to use; see \fIX(__miscmansuffix__)\fP.
+.TP 8
+.B \-gray
+This option indicates that the RGB_GRAY_MAP should be defined.
+.TP 8
+.B \-green
+This option indicates that the RGB_GREEN_MAP should be defined.
+.TP 8
+.B \-help
+This option indicates that a brief description of the command line arguments
+should be printed on the standard error. This will be done whenever an
+unhandled argument is given to
+.I xstdcmap.
+.TP 8
+.B \-red
+This option indicates that the RGB_RED_MAP should be defined.
+.TP 8
+.B \-verbose
+This option indicates that \fIxstdcmap\fP should
+print logging information as it parses its input and defines the
+standard colormap properties.
+.TP 8
+.B \-version
+This option indicates that \fIxstdcmap\fP should print its version and exit.
+.SH ENVIRONMENT
+.PP
+.TP 8
+.B DISPLAY
+to get default host and display number.
+.SH SEE ALSO
+X(__miscmansuffix__)
+.SH AUTHOR
+Donna Converse, MIT X Consortium
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/xstdcmap.c new/xstdcmap-1.0.3/xstdcmap.c
--- old/xstdcmap-1.0.2/xstdcmap.c 2009-10-16 23:40:24.000000000 +0200
+++ new/xstdcmap-1.0.3/xstdcmap.c 2013-02-11 01:15:16.000000000 +0100
@@ -28,6 +28,10 @@
*/
/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.8tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include
#include
#include
@@ -47,6 +51,7 @@
static Bool all = 0;
static Bool help = 0;
static Bool verbose = 0;
+static Bool version = 0;
static Display *dpy = NULL;
typedef struct
@@ -54,8 +59,8 @@
Bool create;
Bool delete;
Atom property;
- char *name;
- char *nickname;
+ const char *name;
+ const char *nickname;
} colormap_property;
static colormap_property propertyTable[]=
@@ -76,20 +81,18 @@
#define GREEN 4
#define BLUE 5
-static char *usage_message[]=
-{
-" -all make all standard colormaps for the display",
-" -best make the RGB_BEST_MAP",
-" -blue make the RGB_BLUE_MAP",
-" -default make the RGB_DEFAULT_MAP",
-" -delete name remove a standard colormap",
-" -display dpy X server to use",
-" -gray make the RGB_GRAY_MAP",
-" -green make the RGB_GREEN_MAP",
-" -red make the RGB_RED_MAP",
-" -verbose turn on logging",
-"",
-NULL };
+static const char *usage_message =
+ " -all make all standard colormaps for the display\n"
+ " -best make the RGB_BEST_MAP\n"
+ " -blue make the RGB_BLUE_MAP\n"
+ " -default make the RGB_DEFAULT_MAP\n"
+ " -delete name remove a standard colormap\n"
+ " -display dpy X server to use\n"
+ " -gray make the RGB_GRAY_MAP\n"
+ " -green make the RGB_GREEN_MAP\n"
+ " -red make the RGB_RED_MAP\n"
+ " -verbose turn on logging\n"
+ " -version print version info\n";
static XrmOptionDescRec optionTable[]=
{
@@ -104,6 +107,7 @@
{"-help", ".help", XrmoptionNoArg, (caddr_t) "on"},
{"-red", ".red", XrmoptionNoArg, (caddr_t) "on"},
{"-verbose", ".verbose", XrmoptionNoArg, (caddr_t) "on"},
+{"-version", ".version", XrmoptionNoArg, (caddr_t) "on"},
};
#define NOPTIONS (sizeof optionTable / sizeof optionTable[0])
@@ -126,23 +130,23 @@
if (--argc)
usage(1);
- (void) sprintf(option, "%s%s", program_name, ".all");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".all");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
all++;
- (void) sprintf(option, "%s%s", program_name, ".best");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".best");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
propertyTable[BEST].create++;
- (void) sprintf(option, "%s%s", program_name, ".blue");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".blue");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
propertyTable[BLUE].create++;
- (void) sprintf(option, "%s%s", program_name, ".default");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".default");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
propertyTable[DEFAULT].create++;
- (void) sprintf(option, "%s%s", program_name, ".delete");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".delete");
if (XrmGetResource(database, option, (char *) NULL, &type, &value)) {
register int i;
for (i=0; i < NPROPERTIES; i++) {
@@ -155,32 +159,36 @@
}
}
- (void) sprintf(option, "%s%s", program_name, ".display");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".display");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
display_name = value.addr;
- (void) sprintf(option, "%s%s", program_name, ".gray");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".gray");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
propertyTable[GRAY].create++;
- (void) sprintf(option, "%s%s", program_name, ".green");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".green");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
propertyTable[GREEN].create++;
- (void) sprintf(option, "%s%s", program_name, ".help");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".help");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
help++;
- (void) sprintf(option, "%s%s", program_name, ".red");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".red");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
propertyTable[RED].create++;
- (void) sprintf(option, "%s%s", program_name, ".verbose");
+ snprintf(option, sizeof(option), "%s%s", program_name, ".verbose");
if (XrmGetResource(database, option, (char *) NULL, &type, &value))
verbose++;
+
+ snprintf(option, sizeof(option), "%s%s", program_name, ".version");
+ if (XrmGetResource(database, option, (char *) NULL, &type, &value))
+ version++;
}
-static void
+static void _X_NORETURN
Exit(Status status)
{
if (dpy)
@@ -188,14 +196,11 @@
exit(status);
}
-static void
+static void _X_NORETURN
usage(Status status)
{
- register char **i;
(void) fprintf(stderr, "usage: %s [-options]\n\n", program_name);
- (void) fprintf(stderr, "where options include:\n");
- for (i = usage_message; *i != NULL; i++)
- (void) fprintf(stderr, "%s\n", *i);
+ (void) fprintf(stderr, "where options include:\n%s\n", usage_message);
Exit(status);
}
@@ -254,7 +259,7 @@
}
-static char *
+static const char *
visualStringFromClass(int class)
{
switch (class) {
@@ -339,20 +344,21 @@
parse(argc, argv);
+ if (help) {
+ usage(0);
+ }
+
+ if (version) {
+ printf("%s\n", PACKAGE_STRING);
+ exit(0);
+ }
+
if ((dpy = XOpenDisplay(display_name)) == NULL) {
(void) fprintf(stderr, "%s: cannot open display \"%s\".\n",
program_name, XDisplayName(display_name));
exit(1);
}
- if (help) {
- usage(0);
- Exit(0);
-
- /* Muffle gcc */
- return 0;
- }
-
if (all) {
if (verbose)
(void) fprintf(stderr,
@@ -370,6 +376,4 @@
"Not all new colormap definitions will be retained.\n");
}
Exit((status == 0) ? 1 : 0);
- /* Muffle compiler */
- return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-1.0.2/xstdcmap.man new/xstdcmap-1.0.3/xstdcmap.man
--- old/xstdcmap-1.0.2/xstdcmap.man 2009-10-16 23:40:24.000000000 +0200
+++ new/xstdcmap-1.0.3/xstdcmap.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,113 +0,0 @@
-.\" $Xorg: xstdcmap.man,v 1.4 2001/02/09 02:06:01 xorgcvs Exp $
-.\" Copyright 1989, 1994, 1998 The Open Group
-.\"
-.\" 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.
-.\"
-.\" The above copyright notice and this permission notice shall be included
-.\" in all copies or substantial portions of the Software.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\" Except as contained in this notice, the name of The Open Group shall
-.\" not be used in advertising or otherwise to promote the sale, use or
-.\" other dealings in this Software without prior written authorization
-.\" from The Open Group.
-.\"
-.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $
-.\"
-.de EX \"Begin example
-.ne 5
-.if n .sp 1
-.if t .sp .5
-.nf
-.in +.5i
-..
-.de EE
-.fi
-.in -.5i
-.if n .sp 1
-.if t .sp .5
-..
-.TH XSTDCMAP 1 __xorgversion__
-.SH NAME
-xstdcmap - X standard colormap utility
-.SH SYNOPSIS
-.B xstdcmap
-[-all] [-best] [-blue] [-default] [-delete \fImap\fP] [-display \fIdisplay\fP]
-[-gray] [-green] [-help] [-red] [-verbose]
-.SH DESCRIPTION
-.PP
-The \fIxstdcmap\fP utility can be used to selectively define standard colormap
-properties. It is intended to be run from a user's X startup script to
-create standard colormap definitions in order to facilitate sharing of
-scarce colormap resources among clients. Where at all possible, colormaps
-are created with read-only allocations.
-.SH OPTIONS
-.PP
-The following options may be used with \fIxstdcmap\fP:
-.TP 8
-.B \-all
-This option indicates that all six standard colormap properties should be
-defined on each screen of the display. Not all screens will support
-visuals under which all six standard colormap properties are meaningful.
-\fIxstdcmap\fP will determine the best
-allocations and visuals for the colormap properties of a screen. Any
-previously existing standard colormap properties will be replaced.
-.TP 8
-.B \-best
-This option indicates that the RGB_BEST_MAP should be defined.
-.TP 8
-.B \-blue
-This option indicates that the RGB_BLUE_MAP should be defined.
-.TP 8
-.B \-default
-This option indicates that the RGB_DEFAULT_MAP should be defined.
-.TP 8
-.B \-delete \fImap\fP
-This option specifies that a specific standard colormap property, or
-all such properties, should be removed.
-\fImap\fP may be one of: default, best, red, green, blue, gray, or all.
-.TP 8
-.B \-display \fIdisplay\fP
-This option specifies the host and display to use; see \fIX(__miscmansuffix__)\fP.
-.TP 8
-.B \-gray
-This option indicates that the RGB_GRAY_MAP should be defined.
-.TP 8
-.B \-green
-This option indicates that the RGB_GREEN_MAP should be defined.
-.TP 8
-.B \-help
-This option indicates that a brief description of the command line arguments
-should be printed on the standard error. This will be done whenever an
-unhandled argument is given to
-.I xstdcmap.
-.TP 8
-.B \-red
-This option indicates that the RGB_RED_MAP should be defined.
-.TP 8
-.B \-verbose
-This option indicates that \fIxstdcmap\fP should
-print logging information as it parses its input and defines the
-standard colormap properties.
-.SH ENVIRONMENT
-.PP
-.TP 8
-.B DISPLAY
-to get default host and display number.
-.SH SEE ALSO
-X(__miscmansuffix__)
-.SH AUTHOR
-Donna Converse, MIT X Consortium
-
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org