Hello community, here is the log from the commit of package xwd for openSUSE:Factory checked in at 2018-04-19 15:28:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xwd (Old) and /work/SRC/openSUSE:Factory/.xwd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xwd" Thu Apr 19 15:28:20 2018 rev:7 rq:593754 version:1.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/xwd/xwd.changes 2013-08-19 10:51:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xwd.new/xwd.changes 2018-04-19 15:28:21.545827076 +0200 @@ -1,0 +2,10 @@ +Thu Apr 5 10:30:35 UTC 2018 - [email protected] + +- Update to version 1.0.7 + * autogen.sh changes + * configure: Drop AM_MAINTAINER_MODE + * Print which option was in error along with usage message + * Add -version option to print program version + * Fix a vs an typo in the man page. + +------------------------------------------------------------------- Old: ---- xwd-1.0.6.tar.bz2 New: ---- xwd-1.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xwd.spec ++++++ --- /var/tmp/diff_new_pack.5keVBl/_old 2018-04-19 15:28:22.165801748 +0200 +++ /var/tmp/diff_new_pack.5keVBl/_new 2018-04-19 15:28:22.169801585 +0200 @@ -1,7 +1,7 @@ # # spec file for package xwd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xwd -Version: 1.0.6 +Version: 1.0.7 Release: 0 Summary: Utility to dump an image of an X window License: MIT ++++++ xwd-1.0.6.tar.bz2 -> xwd-1.0.7.tar.bz2 ++++++ ++++ 11938 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/xwd-1.0.6/ChangeLog new/xwd-1.0.7/ChangeLog --- old/xwd-1.0.6/ChangeLog 2013-08-09 06:16:12.000000000 +0200 +++ new/xwd-1.0.7/ChangeLog 2018-03-10 05:39:32.000000000 +0100 @@ -1,3 +1,86 @@ +commit e325d626acca54aa2b845aa0c0fb328659bd1b80 +Author: Alan Coopersmith <[email protected]> +Date: Fri Mar 9 20:37:36 2018 -0800 + + xwd 1.0.7 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit a0c52a3b6e9e2c3dc3378014ad2a3ea2d13d71bc +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 14:00:21 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit fdf611e573574e6848ed60df04bca08800f53d93 +Author: Emil Velikov <[email protected]> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit eda611de20761755b12c0c261a485f20abfe4cd5 +Author: Peter Hutterer <[email protected]> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + +commit 9dca35dc742461f787c89bc32086bb3f2dcff68f +Author: James Cloos <[email protected]> +Date: Sun Nov 23 13:11:57 2014 -0500 + + Fix a vs an typo in the man page. + + Reported-by: Jens Schweikhardt <[email protected]> + Signed-off-by: James Cloos <[email protected]> + +commit 6f6b4928f0b7de02cb67e5151199976b6c01a8be +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 3 23:48:55 2014 -0700 + + Add -version option to print program version + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 5ee8bcb7134d049abf50a34fcfd7a9d5e99ba323 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 3 23:46:14 2014 -0700 + + Print which option was in error along with usage message + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 00d3b27549902d2d2156888d7fcbabbf01e87c90 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 3 23:37:31 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 74e40e6c76efae504e5016f86238ca52cce03507 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 3 23:37:31 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith <[email protected]> + commit b71cda30549b7259e337bd05d499c5921ed34f19 Author: Alan Coopersmith <[email protected]> Date: Thu Aug 8 21:12:15 2013 -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/xwd-1.0.6/INSTALL new/xwd-1.0.7/INSTALL --- old/xwd-1.0.6/INSTALL 2013-08-09 06:16:12.000000000 +0200 +++ new/xwd-1.0.7/INSTALL 2018-03-10 05:39:32.000000000 +0100 @@ -1,11 +1,13 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -159,10 +222,15 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -174,6 +242,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +267,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -277,7 +356,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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/xwd-1.0.6/compile new/xwd-1.0.7/compile --- old/xwd-1.0.6/compile 2013-08-09 06:12:30.000000000 +0200 +++ new/xwd-1.0.7/compile 2018-03-10 05:39:27.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify 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/xwd-1.0.6/configure.ac new/xwd-1.0.7/configure.ac --- old/xwd-1.0.6/configure.ac 2013-08-09 06:12:24.000000000 +0200 +++ new/xwd-1.0.7/configure.ac 2018-03-10 05:39:23.000000000 +0100 @@ -23,14 +23,13 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xwd], [1.0.6], +AC_INIT([xwd], [1.0.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xwd]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -49,7 +48,7 @@ fi # Checks for pkg-config packages -PKG_CHECK_MODULES(XWD, [x11 xproto >= 7.0.17 ${XKBMODULE}]) +PKG_CHECK_MODULES(XWD, [x11 xproto >= 7.0.25 ${XKBMODULE}]) AC_CONFIG_FILES([ Makefile 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/xwd-1.0.6/dsimple.c new/xwd-1.0.7/dsimple.c --- old/xwd-1.0.6/dsimple.c 2013-08-09 06:12:24.000000000 +0200 +++ new/xwd-1.0.7/dsimple.c 2018-03-10 05:39:23.000000000 +0100 @@ -76,7 +76,7 @@ char *arg = argv[i]; if (!strcmp (arg, "-display") || !strcmp (arg, "-d")) { - if (++i >= argc) usage (); + if (++i >= argc) usage ("-display requires an argument"); displayname = argv[i]; *pargc -= 2; @@ -180,7 +180,7 @@ nargv = argv+1; argc = ARGC; #define OPTION argv[0] #define NXTOPTP ++argv, --argc>0 -#define NXTOPT if (++argv, --argc==0) usage() +#define NXTOPT(arg) if (++argv, --argc==0) usage(arg " requires an argument") #define COPYOPT nargv++[0]=OPTION, nargc++ while (NXTOPTP) { @@ -195,7 +195,7 @@ continue; } if (!strcmp(OPTION, "-name")) { - NXTOPT; + NXTOPT("-name"); w = Window_With_Name(dpy, RootWindow(dpy, screen), OPTION); if (!w) @@ -203,7 +203,7 @@ continue; } if (!strcmp(OPTION, "-id")) { - NXTOPT; + NXTOPT("-id"); w=0; sscanf(OPTION, "0x%lx", &w); if (!w) 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/xwd-1.0.6/dsimple.h new/xwd-1.0.7/dsimple.h --- old/xwd-1.0.6/dsimple.h 2013-08-09 06:12:24.000000000 +0200 +++ new/xwd-1.0.7/dsimple.h 2018-03-10 05:39:23.000000000 +0100 @@ -61,7 +61,7 @@ void Setup_Display_And_Screen(int *, char **); void Close_Display(void); Window Select_Window_Args(int *, char **); -void usage(void) _X_NORETURN; +void usage(const char *errmsg) _X_NORETURN _X_COLD; #define X_USAGE "[host:display]" /* X arguments handled by Get_Display_Name */ @@ -76,5 +76,5 @@ Window Select_Window(Display *, int); Window Window_With_Name(Display *, Window, const char *); -void Fatal_Error(const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); +void Fatal_Error(const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2) _X_COLD; void outl(const char *, ...) _X_ATTRIBUTE_PRINTF(1, 2); 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/xwd-1.0.6/man/xwd.man new/xwd-1.0.7/man/xwd.man --- old/xwd-1.0.6/man/xwd.man 2013-08-09 06:12:24.000000000 +0200 +++ new/xwd-1.0.7/man/xwd.man 2018-03-10 05:39:23.000000000 +0100 @@ -29,7 +29,7 @@ .B "xwd" [-debug] [-help] [-nobdrs] [-out \fIfile\fP] [-xy] [-frame] [-add \fIvalue\fP] [-root | -id \fIid\fP | -name \fIname\fP ] [-icmap] [-screen] [-silent] -[-display \fIdisplay\fP] +[-display \fIdisplay\fP] [-version] .SH DESCRIPTION .PP .I Xwd @@ -70,7 +70,7 @@ .PP .TP 8 .B "-add \fIvalue\fP" -This option specifies an signed value to be added to every pixel. +This option specifies a signed value to be added to every pixel. .PP .TP 8 .B "-frame" @@ -112,6 +112,12 @@ .B "-silent" Operate silently, i.e. don't ring any bells before and after dumping the window. +.PP +.TP 8 +.B "-version" +This option indicates that +.I xwd +should print its version information and exit. .SH ENVIRONMENT .PP .TP 8 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/xwd-1.0.6/missing new/xwd-1.0.7/missing --- old/xwd-1.0.6/missing 2013-08-09 06:12:30.000000000 +0200 +++ new/xwd-1.0.7/missing 2018-03-10 05:39:27.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) 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/xwd-1.0.6/xwd.c new/xwd-1.0.7/xwd.c --- old/xwd-1.0.6/xwd.c 2013-08-09 06:12:24.000000000 +0200 +++ new/xwd-1.0.7/xwd.c 2018-03-10 05:39:23.000000000 +0100 @@ -163,9 +163,9 @@ continue; } if (!strcmp(argv[i], "-help")) - usage(); + usage(NULL); if (!strcmp(argv[i], "-out")) { - if (++i >= argc) usage(); + if (++i >= argc) usage("-out requires an argument"); if (!(out_file = fopen(argv[i], "wb"))) Fatal_Error("Can't open output file as specified."); standard_out = False; @@ -184,7 +184,7 @@ continue; } if (!strcmp(argv[i], "-add")) { - if (++i >= argc) usage(); + if (++i >= argc) usage("-add requires an argument"); add_pixel_value = parse_long (argv[i]); continue; } @@ -196,7 +196,13 @@ silent = True; continue; } - usage(); + if (!strcmp(argv[i], "-version")) { + puts(PACKAGE_STRING); + exit(0); + } + fprintf (stderr, "%s: unrecognized argument '%s'\n", + program_name, argv[i]); + usage(NULL); } #ifdef WIN32 if (standard_out) @@ -518,12 +524,15 @@ * Report the syntax for calling xwd. */ void -usage(void) +usage(const char *errmsg) { + if (errmsg != NULL) + fprintf (stderr, "%s: %s\n", program_name, errmsg); + fprintf (stderr, "usage: %s [-display host:dpy] [-debug] [-help] %s [-nobdrs] [-out <file>]", program_name, "[{-root|-id <id>|-name <name>}]"); - fprintf (stderr, " [-xy] [-add value] [-frame]\n"); + fprintf (stderr, " [-xy] [-add value] [-frame] [-version]\n"); exit(1); }
