[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

x11-utils: Changes to 'debian-unstable'



 appres/ChangeLog                                                      |   41 
 appres/INSTALL                                                        |  236 
 appres/Makefile.am                                                    |    4 
 appres/Makefile.in                                                    |  368 
 appres/README                                                         |   24 
 appres/aclocal.m4                                                     | 1865 ++-
 appres/appres.c                                                       |    4 
 appres/compile                                                        |  142 
 appres/config.guess                                                   |   85 
 appres/config.h.in                                                    |   30 
 appres/config.sub                                                     |  104 
 appres/configure                                                      | 4076 +++++---
 appres/configure.ac                                                   |   11 
 appres/depcomp                                                        |  172 
 appres/install-sh                                                     |  517 -
 appres/missing                                                        |  104 
 debian/changelog                                                      |   22 
 debian/patches/02_xev_flush_standard_output.diff                      |   20 
 debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff |   36 
 debian/patches/05_xprop_spy_exit_on_destroy.diff                      |   50 
 debian/patches/series                                                 |    1 
 editres/AUTHORS                                                       |    1 
 editres/ChangeLog                                                     |   74 
 editres/Editres-color.ad                                              |   91 
 editres/Editres.ad                                                    |  292 
 editres/INSTALL                                                       |  236 
 editres/Makefile.am                                                   |   28 
 editres/Makefile.in                                                   |  592 -
 editres/README                                                        |   25 
 editres/aclocal.m4                                                    | 1931 ++-
 editres/actions.c                                                     |   44 
 editres/app-defaults/Editres                                          |  292 
 editres/app-defaults/Editres-color                                    |   91 
 editres/comm.c                                                        |   58 
 editres/compile                                                       |  142 
 editres/config.guess                                                  |   85 
 editres/config.h.in                                                   |   30 
 editres/config.sub                                                    |  104 
 editres/configure                                                     | 4477 +++++----
 editres/configure.ac                                                  |   22 
 editres/depcomp                                                       |  172 
 editres/editres.c                                                     |   10 
 editres/editresP.h                                                    |   48 
 editres/geometry.c                                                    |   46 
 editres/handler.c                                                     |  107 
 editres/install-sh                                                    |  517 -
 editres/missing                                                       |  104 
 editres/setvalues.c                                                   |    7 
 editres/svpopup.c                                                     |   25 
 editres/utils.c                                                       |   98 
 editres/widgets.c                                                     |   62 
 editres/wtree.c                                                       |   59 
 luit/ChangeLog                                                        |   51 
 luit/Makefile.am                                                      |    7 
 luit/Makefile.in                                                      |  259 
 luit/README                                                           |   28 
 luit/aclocal.m4                                                       | 1733 ++-
 luit/charset.c                                                        |   16 
 luit/config.guess                                                     |   81 
 luit/config.h.in                                                      |   54 
 luit/config.sub                                                       |   96 
 luit/configure                                                        | 4209 ++++++--
 luit/configure.ac                                                     |   14 
 luit/depcomp                                                          |   87 
 luit/install-sh                                                       |    5 
 luit/iso2022.c                                                        |    4 
 luit/luit.c                                                           |   18 
 luit/missing                                                          |   49 
 luit/sys.c                                                            |   40 
 xdpyinfo/ChangeLog                                                    |  127 
 xdpyinfo/INSTALL                                                      |  302 
 xdpyinfo/Makefile.am                                                  |    7 
 xdpyinfo/Makefile.in                                                  |  263 
 xdpyinfo/README                                                       |   30 
 xdpyinfo/aclocal.m4                                                   | 1735 ++-
 xdpyinfo/config.guess                                                 |   55 
 xdpyinfo/config.h.in                                                  |   42 
 xdpyinfo/config.sub                                                   |   54 
 xdpyinfo/configure                                                    | 4837 ++++++----
 xdpyinfo/configure.ac                                                 |   55 
 xdpyinfo/depcomp                                                      |   87 
 xdpyinfo/install-sh                                                   |    5 
 xdpyinfo/missing                                                      |   49 
 xdpyinfo/xdpyinfo.c                                                   |  198 
 xdriinfo/ChangeLog                                                    |   36 
 xdriinfo/INSTALL                                                      |   16 
 xdriinfo/Makefile.am                                                  |    8 
 xdriinfo/Makefile.in                                                  |  359 
 xdriinfo/README                                                       |   29 
 xdriinfo/aclocal.m4                                                   | 1865 ++-
 xdriinfo/autogen.sh                                                   |   13 
 xdriinfo/config.guess                                                 |   85 
 xdriinfo/config.h.in                                                  |   30 
 xdriinfo/config.sub                                                   |  104 
 xdriinfo/configure                                                    | 4191 +++++---
 xdriinfo/configure.ac                                                 |   13 
 xdriinfo/depcomp                                                      |  172 
 xdriinfo/install-sh                                                   |  517 -
 xdriinfo/missing                                                      |  104 
 xdriinfo/xdriinfo.c                                                   |    4 
 xev/COPYING                                                           |   29 
 xev/ChangeLog                                                         |   64 
 xev/Makefile.am                                                       |    7 
 xev/Makefile.in                                                       |  278 
 xev/README                                                            |   31 
 xev/aclocal.m4                                                        | 1735 ++-
 xev/config.guess                                                      |   55 
 xev/config.h.in                                                       |   30 
 xev/config.sub                                                        |   54 
 xev/configure                                                         | 3965 +++++---
 xev/configure.ac                                                      |   12 
 xev/depcomp                                                           |   87 
 xev/install-sh                                                        |    5 
 xev/missing                                                           |   49 
 xev/xev.c                                                             |    1 
 xkill/COPYING                                                         |   27 
 xkill/ChangeLog                                                       |  252 
 xkill/INSTALL                                                         |  236 
 xkill/Makefile.am                                                     |   14 
 xkill/Makefile.in                                                     |  385 
 xkill/README                                                          |   27 
 xkill/aclocal.m4                                                      | 1865 ++-
 xkill/compile                                                         |  142 
 xkill/config.guess                                                    |   85 
 xkill/config.h.in                                                     |   30 
 xkill/config.sub                                                      |  104 
 xkill/configure                                                       | 4076 +++++---
 xkill/configure.ac                                                    |   12 
 xkill/depcomp                                                         |  172 
 xkill/install-sh                                                      |  517 -
 xkill/missing                                                         |  104 
 xkill/mkinstalldirs                                                   |  158 
 xkill/xkill.c                                                         |    9 
 xlsatoms/COPYING                                                      |   25 
 xlsatoms/ChangeLog                                                    |  217 
 xlsatoms/INSTALL                                                      |  236 
 xlsatoms/Makefile.am                                                  |   14 
 xlsatoms/Makefile.in                                                  |  385 
 xlsatoms/README                                                       |   25 
 xlsatoms/aclocal.m4                                                   | 1865 ++-
 xlsatoms/compile                                                      |  142 
 xlsatoms/config.guess                                                 |   85 
 xlsatoms/config.h.in                                                  |   30 
 xlsatoms/config.sub                                                   |  104 
 xlsatoms/configure                                                    | 4076 +++++---
 xlsatoms/configure.ac                                                 |   12 
 xlsatoms/depcomp                                                      |  172 
 xlsatoms/install-sh                                                   |  517 -
 xlsatoms/missing                                                      |  104 
 xlsatoms/mkinstalldirs                                                |  158 
 xlsatoms/xlsatoms.c                                                   |    2 
 xlsclients/COPYING                                                    |   25 
 xlsclients/ChangeLog                                                  |  223 
 xlsclients/INSTALL                                                    |  236 
 xlsclients/Makefile.am                                                |   14 
 xlsclients/Makefile.in                                                |  385 
 xlsclients/README                                                     |   26 
 xlsclients/aclocal.m4                                                 | 1865 ++-
 xlsclients/compile                                                    |  142 
 xlsclients/config.guess                                               |   85 
 xlsclients/config.h.in                                                |   30 
 xlsclients/config.sub                                                 |  104 
 xlsclients/configure                                                  | 4076 +++++---
 xlsclients/configure.ac                                               |   12 
 xlsclients/depcomp                                                    |  172 
 xlsclients/install-sh                                                 |  517 -
 xlsclients/missing                                                    |  104 
 xlsclients/mkinstalldirs                                              |  158 
 xlsclients/xlsclients.c                                               |    2 
 xprop/ChangeLog                                                       |   95 
 xprop/Makefile.am                                                     |    8 
 xprop/Makefile.in                                                     |  256 
 xprop/README                                                          |   25 
 xprop/aclocal.m4                                                      | 1735 ++-
 xprop/autogen.sh                                                      |   13 
 xprop/clientwin.c                                                     |    6 
 xprop/config.guess                                                    |   55 
 xprop/config.h.in                                                     |    3 
 xprop/config.sub                                                      |   54 
 xprop/configure                                                       | 3696 ++++---
 xprop/configure.ac                                                    |   15 
 xprop/depcomp                                                         |   87 
 xprop/dsimple.c                                                       |   15 
 xprop/dsimple.h                                                       |    1 
 xprop/install-sh                                                      |    5 
 xprop/missing                                                         |   49 
 xprop/xprop.c                                                         |  158 
 xprop/xprop.man                                                       |    6 
 xvinfo/COPYING                                                        |   30 
 xvinfo/ChangeLog                                                      |   44 
 xvinfo/INSTALL                                                        |  236 
 xvinfo/Makefile.am                                                    |    8 
 xvinfo/Makefile.in                                                    |  357 
 xvinfo/README                                                         |   26 
 xvinfo/aclocal.m4                                                     | 1865 ++-
 xvinfo/config.guess                                                   |   85 
 xvinfo/config.h.in                                                    |   30 
 xvinfo/config.sub                                                     |  104 
 xvinfo/configure                                                      | 4076 +++++---
 xvinfo/configure.ac                                                   |   12 
 xvinfo/depcomp                                                        |  172 
 xvinfo/install-sh                                                     |  517 -
 xvinfo/missing                                                        |  104 
 xvinfo/xvinfo.c                                                       |   93 
 xvinfo/xvinfo.man                                                     |    3 
 xwininfo/COPYING                                                      |   50 
 xwininfo/ChangeLog                                                    |  151 
 xwininfo/Makefile.am                                                  |    6 
 xwininfo/Makefile.in                                                  |  256 
 xwininfo/README                                                       |   26 
 xwininfo/aclocal.m4                                                   | 1736 ++-
 xwininfo/clientwin.c                                                  |    6 
 xwininfo/config.guess                                                 |  128 
 xwininfo/config.h.in                                                  |   30 
 xwininfo/config.sub                                                   |   76 
 xwininfo/configure                                                    | 2270 +++-
 xwininfo/configure.ac                                                 |   12 
 xwininfo/depcomp                                                      |   87 
 xwininfo/dsimple.c                                                    |    3 
 xwininfo/install-sh                                                   |    5 
 xwininfo/missing                                                      |   49 
 xwininfo/xwininfo.c                                                   |   23 
 xwininfo/xwininfo.man                                                 |    5 
 223 files changed, 56509 insertions(+), 33341 deletions(-)

New commits:
commit 2a87dc649f46f73ecbbcb3bdb7dcce34b827bd6e
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 21:20:30 2009 +0100

    Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 696e479..09b9010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-utils (7.4+2) UNRELEASED; urgency=low
+x11-utils (7.5+1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Update config.{guess,sub} for xmessage, adding avr32 support (closes:
@@ -21,7 +21,7 @@ x11-utils (7.4+2) UNRELEASED; urgency=low
   * xwininfo 1.0.5.
   * Refresh patches.
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:19:54 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:20:22 +0100
 
 x11-utils (7.4+1) unstable; urgency=low
 

commit e43422e254a7fdc87a19932c7f6f7e37b4640e88
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 21:20:17 2009 +0100

    Refresh patches

diff --git a/debian/changelog b/debian/changelog
index dc47fde..696e479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,10 +16,12 @@ x11-utils (7.4+2) UNRELEASED; urgency=low
   * xlsclients 1.0.2.
   * xprop 1.1.0.
     + Fix -spy to flush stdout, closes: #538714.
+    + Drop 05_xprop_spy_exit_on_destroy.diff, applied upstream.
   * xvinfo 1.1.0.
   * xwininfo 1.0.5.
+  * Refresh patches.
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:10:41 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:19:54 +0100
 
 x11-utils (7.4+1) unstable; urgency=low
 
diff --git a/debian/patches/02_xev_flush_standard_output.diff b/debian/patches/02_xev_flush_standard_output.diff
index 9c4c381..c25a153 100644
--- a/debian/patches/02_xev_flush_standard_output.diff
+++ b/debian/patches/02_xev_flush_standard_output.diff
@@ -6,13 +6,19 @@ unreachable code.
 This patch by Branden Robinson.  Thanks to Bill Currie for identifying the
 problem and the solution.  See Debian bug #238638.
 
---- x11-utils.orig/xev/xev.c
-+++ x11-utils/xev/xev.c
-@@ -1065,6 +1065,7 @@
- 	    printf ("Unknown event type %d\n", event.type);
- 	    break;
+---
+ xev/xev.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: x11-utils/xev/xev.c
+===================================================================
+--- x11-utils.orig/xev/xev.c	2009-12-06 21:08:55.000000000 +0100
++++ x11-utils/xev/xev.c	2009-12-06 21:15:34.000000000 +0100
+@@ -653,6 +653,7 @@
+ 	if ((geom_result & XValue) && (geom_result & YValue)) {
+ 	    hintp->flags += USPosition;
  	}
 +    fflush(stdout);
      }
- 
-     XCloseDisplay (dpy);
+     if (!(hintp->flags & USSize)) {
+ 	hintp->width = defwidth;
diff --git a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
index b931b98..8866c71 100644
--- a/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
+++ b/debian/patches/04_xlsfonts_do_not_spew_usage_on_connection_error.diff
@@ -10,10 +10,14 @@ The user should only be shown a usage messages when:
 
 Applied in X.Org git.
 
+---
+ xlsfonts/dsimple.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
 Index: x11-utils/xlsfonts/dsimple.c
 ===================================================================
---- x11-utils.orig/xlsfonts/dsimple.c
-+++ x11-utils/xlsfonts/dsimple.c
+--- x11-utils.orig/xlsfonts/dsimple.c	2009-12-06 20:43:14.000000000 +0100
++++ x11-utils/xlsfonts/dsimple.c	2009-12-06 21:17:10.000000000 +0100
 @@ -188,8 +188,7 @@
  	if (d == NULL) {
  	    fprintf (stderr, "%s:  unable to open display '%s'\n",
@@ -24,31 +28,3 @@ Index: x11-utils/xlsfonts/dsimple.c
  	}
  
  	return(d);
-Index: x11-utils/xprop/dsimple.c
-===================================================================
---- x11-utils.orig/xprop/dsimple.c
-+++ x11-utils/xprop/dsimple.c
-@@ -123,8 +123,7 @@
- 	if (d == NULL) {
- 	    fprintf (stderr, "%s:  unable to open display '%s'\n",
- 		     program_name, XDisplayName (display_name));
--	    usage ();
--	    /* doesn't return */
-+	    exit(1);
- 	}
- 
- 	return(d);
-Index: x11-utils/xwininfo/dsimple.c
-===================================================================
---- x11-utils.orig/xwininfo/dsimple.c
-+++ x11-utils/xwininfo/dsimple.c
-@@ -110,8 +110,7 @@
- 	if (d == NULL) {
- 	    fprintf (stderr, "%s:  unable to open display '%s'\n",
- 		     program_name, XDisplayName (display_name));
--	    usage ();
--	    /* doesn't return */
-+	    exit(1);
- 	}
- 
- 	return(d);
diff --git a/debian/patches/05_xprop_spy_exit_on_destroy.diff b/debian/patches/05_xprop_spy_exit_on_destroy.diff
deleted file mode 100644
index 69a2721..0000000
--- a/debian/patches/05_xprop_spy_exit_on_destroy.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-This patch by Ben Hutchings <ben@decadent.org.uk>.
-
-xprop -spy should exit cleanly when the target window is destroyed.
-The current behaviour is that it sometimes dies with a BadWindow error
-and sometimes hangs around after the target has been destroyed.
-
-We fix this by listening for destroy events but also catching
-BadWindow errors (and BadMatch, which may sometimes be received
-instead of BadWindow).  We print a new-line before exiting from the
-error handler, since we may have generated partial output for a
-property change.
-
---- x11-utils.orig/xprop/xprop.c
-+++ x11-utils/xprop/xprop.c
-@@ -1596,6 +1596,19 @@
- 
- static int spy = 0;
- 
-+static int (*old_error_handler)(Display *dpy, XErrorEvent *ev);
-+
-+static int spy_error_handler(Display *dpy, XErrorEvent *ev)
-+{
-+    if (ev->error_code == BadWindow || ev->error_code == BadMatch) {
-+	/* Window was destroyed */
-+	puts("");
-+	exit(0);
-+    }
-+
-+    return old_error_handler(dpy, ev);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1738,9 +1750,14 @@
- 	XEvent event;
- 	const char *format, *dformat;
- 	
--	XSelectInput(dpy, target_win, PropertyChangeMask);
-+	XSelectInput(dpy, target_win, PropertyChangeMask | StructureNotifyMask);
-+	old_error_handler = XSetErrorHandler(spy_error_handler);
- 	for (;;) {
- 	    XNextEvent(dpy, &event);
-+	    if (event.type == DestroyNotify)
-+		break;
-+	    if (event.type != PropertyNotify)
-+		continue;
- 	    format = dformat = NULL;
- 	    if (props) {
- 		int i;
diff --git a/debian/patches/series b/debian/patches/series
index 8f2d3a6..22e70f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02_xev_flush_standard_output.diff
 04_xlsfonts_do_not_spew_usage_on_connection_error.diff
-05_xprop_spy_exit_on_destroy.diff

commit 5ba8ea6bb812b2db625a65ec3f4490681ab23f51
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 21:15:24 2009 +0100

    Add bug closers

diff --git a/debian/changelog b/debian/changelog
index 5b0624b..dc47fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,10 +15,11 @@ x11-utils (7.4+2) UNRELEASED; urgency=low
   * xlsatoms 1.0.2.
   * xlsclients 1.0.2.
   * xprop 1.1.0.
+    + Fix -spy to flush stdout, closes: #538714.
   * xvinfo 1.1.0.
   * xwininfo 1.0.5.
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:07:47 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:10:41 +0100
 
 x11-utils (7.4+1) unstable; urgency=low
 

commit d3771e42fa339733c48f603eb0e05a2d40d8ba44
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 21:08:02 2009 +0100

    xwininfo 1.0.5

diff --git a/debian/changelog b/debian/changelog
index 7aca62c..5b0624b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ x11-utils (7.4+2) UNRELEASED; urgency=low
   * xlsclients 1.0.2.
   * xprop 1.1.0.
   * xvinfo 1.1.0.
+  * xwininfo 1.0.5.
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:06:57 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 21:07:47 +0100
 
 x11-utils (7.4+1) unstable; urgency=low
 
diff --git a/xwininfo/COPYING b/xwininfo/COPYING
index 7f33cbf..e5c45f6 100644
--- a/xwininfo/COPYING
+++ b/xwininfo/COPYING
@@ -1,12 +1,46 @@
-This is a stub file.  This package has not yet had its complete licensing
-information compiled.  Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright 1987, 1993, 1998  The Open Group
+Copyright 1999 Sun Microsystems, Inc.
 
-Please submit updated COPYING files to the Xorg bugzilla:
+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.
 
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
 
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+Copyright 2007 Kim woelders
+
+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 the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission.  The copyright holders make no representations
+about the suitability of this software for any purpose.  It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS 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.
diff --git a/xwininfo/ChangeLog b/xwininfo/ChangeLog
index 13e7a3c..2c55c14 100644
--- a/xwininfo/ChangeLog
+++ b/xwininfo/ChangeLog
@@ -1,12 +1,81 @@
+commit 1569f4d692443bf0658dbe12902f995693b13dcf
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 12 16:08:57 2009 -0700
+
+    xwininfo 1.0.5
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 28b34ed17506540a793a85e03c01a7b4d9aa3588
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 12 16:06:55 2009 -0700
+
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit b6837aadf7a2c30fb8c2c811d45c48047e0769e8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 12 15:58:09 2009 -0700
+
+    Fill in COPYING file
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 98ac096e2edae243ce2119fb70112c3c6b2bb688
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Oct 1 14:54:32 2009 -0700
+
+    Add README with pointers to mailing lists, bugzilla, & git
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 347ba641db84c66cd332f398423e87a882580575
+Author: Yann Droneaud <ydroneaud@mandriva.com>
+Date:   Fri Mar 27 16:41:00 2009 +0100
+
+    Update manpage for visual id
+    
+    Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit ee03cf70e9e92d0e9adebaddc6b065de496cc561
+Author: Yann Droneaud <ydroneaud@mandriva.com>
+Date:   Fri Mar 27 16:35:14 2009 +0100
+
+    Report visual id along visual class for -stat switch
+    
+    Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit a42690b24d828ec4cfae1bf40cac08f07c6202af
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Thu Jan 15 14:27:14 2009 -0200
+
+    Ansification and compile warning fixes.
+    
+      This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+    make distcheck and most gcc 4.3 and sparse warnings.
+
+commit 67a74f540cdbb7ded7aa44c751f5f0c8833c688f
+Author: Branden Robinson <branden@debian.org>
+Date:   Fri Feb 11 02:14:27 2005 -0500
+
+    Do not spew usage on connection error
+    
+    General philosophy:
+    
+    The user should only be shown a usage message when:
+      * it is asked for with a --help option or the like.
+      * the command line is syntactically invalid.
+
 commit b8115ee0e43c6c03025cad72219481e3fdb119d4
 Author: James Cloos <cloos@jhcloos.com>
-Date:   Sun Jun 29 10:49:10 2008 -0400
+Date:   Sun Jun 29 10:49:33 2008 -0400
 
     xwininfo 1.0.4
 
 commit c229611bcb7ee94bea5c075f5e15447e14c0f6ce
 Author: Kim Woelders <kim@woelders.dk>
-Date:   Sun Jun 22 01:11:50 2008 -0400
+Date:   Sun Jun 22 01:12:13 2008 -0400
 
     Fix window selection by pointer.
     
@@ -16,37 +85,37 @@ Date:   Sun Jun 22 01:11:50 2008 -0400
 
 commit b7e88cd9d28a3d3e467b769f3efe87f7c2f4c0a5
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Aug 27 14:20:12 2007 -0700
+Date:   Mon Aug 27 14:20:35 2007 -0700
 
     Version bump: 1.0.3
 
 commit 56f0b5dfb1486e262eb514fac44c73cea4bb4471
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Aug 27 14:19:39 2007 -0700
+Date:   Mon Aug 27 14:20:02 2007 -0700
 
     Replace static ChangeLog with dist-hook to generate from git log
 
 commit c8d205c30547ca526404a0b257c3cc5d40970be6
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Tue Aug 7 15:49:50 2007 -0700
+Date:   Tue Aug 7 15:50:13 2007 -0700
 
     Add static & const qualifiers to xwininfo.c
 
 commit 77d50c0bf824f847bd9ede30c21618845258de76
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Tue Aug 7 15:38:00 2007 -0700
+Date:   Tue Aug 7 15:38:23 2007 -0700
 
     Replace sprintf's with snprintf & strlcat
 
 commit 118bd50a9bbc10cab7846fb6ac1a0d25ba4c3422
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Aug 6 19:51:50 2007 -0700
+Date:   Mon Aug 6 19:52:13 2007 -0700
 
     dsimple.c: ANSIfy function declarations
 
 commit e093e4be56bb2be385a972962cf89f234e987ab4
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Aug 6 19:44:01 2007 -0700
+Date:   Mon Aug 6 19:44:24 2007 -0700
 
     Purge unused code from dsimple.c
     
@@ -56,7 +125,7 @@ Date:   Mon Aug 6 19:44:01 2007 -0700
 
 commit 59bbe12a40fdb3d39429d0d0ce809ad28116e7ed
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Mon Aug 6 19:18:34 2007 -0700
+Date:   Mon Aug 6 19:18:57 2007 -0700
 
     Rename xwininfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
     
@@ -64,19 +133,19 @@ Date:   Mon Aug 6 19:18:34 2007 -0700
 
 commit 5a251886c0f158f4c8a342b6fbdeebf3dbd1c0fd
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu May 24 18:19:48 2007 -0700
+Date:   Thu May 24 18:20:11 2007 -0700
 
     Man page formatting: make -geometry bold like other options
 
 commit 07459b14b36f15cfdfc6384019aaf020c7920cd4
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu May 24 18:17:05 2007 -0700
+Date:   Thu May 24 18:17:28 2007 -0700
 
     renamed: .cvsignore -> .gitignore
 
 commit 24fc2a569df9eaa776bcdddbb26bf4ea97b69d13
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date:   Thu May 24 18:16:30 2007 -0700
+Date:   Thu May 24 18:16:53 2007 -0700
 
     X.Org bug #10616: Add all the X info commands to See Also in man page
     
@@ -86,75 +155,75 @@ Date:   Thu May 24 18:16:30 2007 -0700
 
 commit 412a3232373131634072df0d0b4843abf360def4
 Author: Adam Jackson <ajax@nwnk.net>
-Date:   Sun Apr 2 01:19:30 2006 +0000
+Date:   Sun Apr 2 01:19:53 2006 +0000
 
     Bump to 1.0.2.
 
 commit 8d62050702532be39688d468663466199492510b
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Fri Mar 10 02:36:55 2006 +0000
+Date:   Fri Mar 10 02:37:18 2006 +0000
 
     Clear two tiny memory leaks. (Coverity ids #900 & 901)
 
 commit 609828be5a05bc71fffaf8fc129a0cae8082fd57
 Author: Kevin E Martin <kem@kem.org>
-Date:   Wed Dec 21 02:29:33 2005 +0000
+Date:   Wed Dec 21 02:29:55 2005 +0000
 
     Update package version for X11R7 release.
 
 commit a4169ffa7eb6eb9a28fd64a0686a813da975736c
 Author: Adam Jackson <ajax@nwnk.net>
-Date:   Mon Dec 19 16:22:26 2005 +0000
+Date:   Mon Dec 19 16:22:48 2005 +0000
 
     Stub COPYING files
 
 commit b9403df95678e568a326fe3f37bf29285a6a211e
 Author: Kevin E Martin <kem@kem.org>
-Date:   Thu Dec 15 00:23:50 2005 +0000
+Date:   Thu Dec 15 00:24:12 2005 +0000
 
     Update package version number for final X11R7 release candidate.
 
 commit 6f9523999cc4eb34accfe0bcc2c7a74bae9259ef
 Author: Kevin E Martin <kem@kem.org>
-Date:   Tue Dec 6 22:48:05 2005 +0000
+Date:   Tue Dec 6 22:48:27 2005 +0000
 
     Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 
 commit 28c0455ea50bdf37f1d9d53c6756beebed429f0e
 Author: Kevin E Martin <kem@kem.org>
-Date:   Sat Dec 3 05:49:07 2005 +0000
+Date:   Sat Dec 3 05:49:29 2005 +0000
 
     Update package version number for X11R7 RC3 release.
 
 commit 988471c67e10a5ca309b90146b37a6037f5b2efc
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Mon Nov 28 22:01:26 2005 +0000
+Date:   Mon Nov 28 22:01:48 2005 +0000
 
     Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
         update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
 
 commit 4496e95380b2f0ad7e9bdca02ec192dbb6d5e2e5
 Author: Eric Anholt <anholt@freebsd.org>
-Date:   Mon Nov 21 10:34:47 2005 +0000
+Date:   Mon Nov 21 10:35:09 2005 +0000
 
     Another pass at .cvsignores for apps.
 
 commit 296d8e6ab8a86e5653529d0497ca5751d89f23b5
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Mon Nov 21 03:13:55 2005 +0000
+Date:   Mon Nov 21 03:14:17 2005 +0000
 
     Change dependency from xmu to xmuu since the full xmu (with all its baggage
         like Xt) is not needed here.
 
 commit 27898506332f1a4e698cbd65aecc47fdbc6d0a7b
 Author: Eric Anholt <anholt@freebsd.org>
-Date:   Sun Nov 20 22:08:34 2005 +0000
+Date:   Sun Nov 20 22:08:56 2005 +0000
 
     Add/improve .cvsignore files for apps.
 
 commit ee7bf4989434ba5f30451c3f07e4a6e01e6532d4
 Author: Kevin E Martin <kem@kem.org>
-Date:   Sat Nov 19 07:15:16 2005 +0000
+Date:   Sat Nov 19 07:15:38 2005 +0000
 
     Update pkgconfig files to separate library build-time dependencies from
         application build-time dependencies, and update package deps to work
@@ -162,33 +231,33 @@ Date:   Sat Nov 19 07:15:16 2005 +0000
 
 commit 4e58b0e12d46503c5f75ead9a859694aafd5b9b7
 Author: Kevin E Martin <kem@kem.org>
-Date:   Wed Oct 19 02:47:36 2005 +0000
+Date:   Wed Oct 19 02:47:58 2005 +0000
 
     Update package version number for RC1 release.
 
 commit fc097904a8d7ded9a60df35fd58b9f5b5e226e17
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Mon Oct 17 23:56:03 2005 +0000
+Date:   Mon Oct 17 23:56:25 2005 +0000
 
     Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
         work better with BSD make
 
 commit 22feb546d5bf499ec0bc726c60a6c46f2e2cbd1c
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Fri Oct 14 00:25:26 2005 +0000
+Date:   Fri Oct 14 00:25:48 2005 +0000
 
     Use sed to fill in variables in man page
 
 commit 9b1a4cbaf609bb102adec047934ad4c1b05f01ab
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
-Date:   Mon Aug 1 20:25:11 2005 +0000
+Date:   Mon Aug 1 20:25:33 2005 +0000
 
     Install man pages to section 1 instead of section m (Patch from Donnie
         Berkholz)
 
 commit 70ed22f5e63d5759a0b7c6574a92d124c0777562
 Author: Kevin E Martin <kem@kem.org>
-Date:   Fri Jul 29 21:22:17 2005 +0000
+Date:   Fri Jul 29 21:22:39 2005 +0000
 
     Various changes preparing packages for RC0:
     - Verify and update package version numbers as needed
@@ -202,20 +271,20 @@ Date:   Fri Jul 29 21:22:17 2005 +0000
 
 commit 270145dc0f3ad5c7ad7d6086da19c0a25ea853a9
 Author: Adam Jackson <ajax@nwnk.net>
-Date:   Wed Jul 20 19:31:43 2005 +0000
+Date:   Wed Jul 20 19:32:05 2005 +0000
 
     Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
         configure cache, you cache it, and the cached value is probably wrong.
 
 commit 97aa768841e147fde3cf16ba9a4c852358085d27
 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
-Date:   Fri Jul 8 21:00:24 2005 +0000
+Date:   Fri Jul 8 21:00:46 2005 +0000
 
     Build system for xwininfo
 
 commit 5cd08344c43c739c9a6837f1a60ae7c42e5afabe
 Author: Roland Mainz <roland.mainz@nrubsig.org>
-Date:   Wed Oct 6 19:29:37 2004 +0000
+Date:   Wed Oct 6 19:29:59 2004 +0000
 
     Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1518 - Add filter
         support to "xlsfonts" that it can filter builtin-, glyph- and/or other
@@ -224,54 +293,54 @@ Date:   Wed Oct 6 19:29:37 2004 +0000
 
 commit ac7cc196b722ee4653326aee459f40ad16a260c1
 Author: Egbert Eich <eich@suse.de>
-Date:   Fri Apr 23 19:54:47 2004 +0000
+Date:   Fri Apr 23 19:55:09 2004 +0000
 
     Merging XORG-CURRENT into trunk
 
 commit 43e099d499d4dbabb32ca0410175e0e1b814cd94
 Author: Egbert Eich <eich@suse.de>
-Date:   Sun Mar 14 08:35:32 2004 +0000
+Date:   Sun Mar 14 08:35:54 2004 +0000
 
     Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 
 commit cd710399eb415673c180f65080d685ee8d149361
 Author: Egbert Eich <eich@suse.de>
-Date:   Wed Mar 3 12:12:58 2004 +0000
+Date:   Wed Mar 3 12:13:20 2004 +0000
 
     Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 
 commit 436a7ecb4b764394abcdd06fd99d6232c633cad1
 Author: Egbert Eich <eich@suse.de>
-Date:   Thu Feb 26 13:36:10 2004 +0000
+Date:   Thu Feb 26 13:36:32 2004 +0000
 
     readding XFree86's cvs IDs
 
 commit 6dfbd3f819f10e4d04653df2074526860007968e
 Author: Egbert Eich <eich@suse.de>
-Date:   Thu Feb 26 09:23:56 2004 +0000
+Date:   Thu Feb 26 09:24:18 2004 +0000
 
     Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 
 commit a2fa980ce0e98c2bbc503d1d9fe51ab539b7ea46
 Author: Egbert Eich <eich@suse.de>
-Date:   Thu Jan 29 08:08:59 2004 +0000
+Date:   Thu Jan 29 08:09:21 2004 +0000
 
     Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
 
 commit 429530ba6f7699436d6f789a17550ec1a691c675
 Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Tue Nov 25 19:29:01 2003 +0000
+Date:   Tue Nov 25 19:29:23 2003 +0000
 
     XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
 
 commit be0f398fee08e03ab73ec0d580df688cc989fbaa
 Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Fri Nov 14 16:49:02 2003 +0000
+Date:   Fri Nov 14 16:49:24 2003 +0000
 
     XFree86 4.3.0.1
 
 commit 5e5a590668dc3ebe7e2cb568aad4c9c14021f2a2
 Author: Kaleb Keithley <kaleb@freedesktop.org>
-Date:   Fri Nov 14 15:54:33 2003 +0000
+Date:   Fri Nov 14 15:54:55 2003 +0000
 
     R6.6 is the Xorg base-line
diff --git a/xwininfo/Makefile.am b/xwininfo/Makefile.am
index 854f489..d412813 100644
--- a/xwininfo/Makefile.am
+++ b/xwininfo/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xwininfo
 
-AM_CFLAGS = $(XWININFO_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XWININFO_CFLAGS)
 xwininfo_LDADD = $(XWININFO_LIBS)
 
 xwininfo_SOURCES =	\
@@ -46,7 +46,7 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
 
@@ -72,4 +72,4 @@ MAN_SUBSTS = \
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/xwininfo/Makefile.in b/xwininfo/Makefile.in
index ebea2c4..a312177 100644
--- a/xwininfo/Makefile.in
+++ b/xwininfo/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -38,8 +39,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -69,8 +71,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_xwininfo_OBJECTS = clientwin.$(OBJEXT) dsimple.$(OBJEXT) \
 	xwininfo.$(OBJEXT)
@@ -80,10 +82,23 @@ xwininfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(xwininfo_SOURCES)
 DIST_SOURCES = $(xwininfo_SOURCES)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -91,8 +106,22 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \


Reply to: