x11-utils: Changes to 'debian-unstable'
appres/aclocal.m4 | 22
appres/config.guess | 32
appres/config.h.in | 9
appres/config.sub | 28
appres/configure | 23
debian/changelog | 27
debian/control | 16
debian/copyright | 6
debian/patches/03_xvinfo_manpage_typo.diff | 13
debian/patches/series | 1
debian/rules | 1
debian/x11-utils.menu | 25
editres/aclocal.m4 | 22
editres/config.guess | 32
editres/config.h.in | 9
editres/config.sub | 28
editres/configure | 23
listres/aclocal.m4 | 22
listres/config.guess | 32
listres/config.h.in | 9
listres/config.sub | 28
listres/configure | 23
luit/INSTALL | 236 +
luit/aclocal.m4 | 107
luit/compile | 147 -
luit/config.guess | 685 ++--
luit/config.h.in | 9
luit/config.sub | 240 +
luit/configure | 334 --
luit/depcomp | 103
luit/install-sh | 477 +--
luit/missing | 142
luit/mkinstalldirs | 89
viewres/aclocal.m4 | 22
viewres/config.guess | 32
viewres/config.h.in | 9
viewres/config.sub | 28
viewres/configure | 23
xdpyinfo/aclocal.m4 | 22
xdpyinfo/config.guess | 32
xdpyinfo/config.h.in | 9
xdpyinfo/config.sub | 28
xdpyinfo/configure | 23
xdriinfo/ChangeLog | 161 -
xdriinfo/Makefile.am | 10
xdriinfo/Makefile.in | 36
xdriinfo/aclocal.m4 | 24
xdriinfo/compile | 142
xdriinfo/config.guess | 32
xdriinfo/config.h.in | 9
xdriinfo/config.sub | 28
xdriinfo/configure | 47
xdriinfo/configure.ac | 2
xdriinfo/mkinstalldirs | 158 -
xdriinfo/xdriinfo.man | 7
xev/aclocal.m4 | 22
xev/config.guess | 32
xev/config.h.in | 9
xev/config.sub | 28
xev/configure | 23
xfd/aclocal.m4 | 22
xfd/config.guess | 32
xfd/config.h.in | 9
xfd/config.sub | 28
xfd/configure | 23
xfontsel/aclocal.m4 | 22
xfontsel/config.guess | 32
xfontsel/config.h.in | 9
xfontsel/config.sub | 28
xfontsel/configure | 23
xkill/aclocal.m4 | 22
xkill/config.guess | 32
xkill/config.h.in | 9
xkill/config.sub | 28
xkill/configure | 23
xlsatoms/aclocal.m4 | 22
xlsatoms/config.guess | 32
xlsatoms/config.h.in | 9
xlsatoms/config.sub | 28
xlsatoms/configure | 23
xlsclients/aclocal.m4 | 22
xlsclients/config.guess | 32
xlsclients/config.h.in | 9
xlsclients/config.sub | 28
xlsclients/configure | 23
xlsfonts/aclocal.m4 | 22
xlsfonts/config.guess | 32
xlsfonts/config.h.in | 9
xlsfonts/config.sub | 28
xlsfonts/configure | 23
xmessage/ChangeLog | 235 +
xmessage/Makefile.am | 10
xmessage/Makefile.in | 32
xmessage/aclocal.m4 | 1084 +++----
xmessage/config.guess | 63
xmessage/config.h.in | 9
xmessage/config.sub | 87
xmessage/configure | 4190 +++++++++++++----------------
xmessage/configure.ac | 2
xmessage/mkinstalldirs | 158 -
xmessage/xmessage.c | 57
xprop/ChangeLog | 284 +
xprop/INSTALL | 236 -
xprop/Makefile.am | 20
xprop/Makefile.in | 171 -
xprop/aclocal.m4 | 1412 ++++-----
xprop/autogen.sh | 13
xprop/compile | 142
xprop/config.h.in | 45
xprop/config.sub | 14
xprop/configure | 1168 +++++++-
xprop/configure.ac | 9
xprop/depcomp | 64
xprop/dsimple.c | 303 --
xprop/dsimple.h | 23
xprop/install-sh | 348 +-
xprop/missing | 61
xprop/xprop.c | 71
xprop/xprop.man | 3
xvinfo/ChangeLog | 215 +
xvinfo/Makefile.am | 12
xvinfo/Makefile.in | 38
xvinfo/aclocal.m4 | 24
xvinfo/compile | 142
xvinfo/config.guess | 32
xvinfo/config.h.in | 9
xvinfo/config.sub | 28
xvinfo/configure | 47
xvinfo/configure.ac | 2
xvinfo/mkinstalldirs | 158 -
xvinfo/xvinfo.c | 7
xvinfo/xvinfo.man | 5
xwininfo/ChangeLog | 271 +
xwininfo/Makefile.am | 12
xwininfo/Makefile.in | 55
xwininfo/aclocal.m4 | 24
xwininfo/config.guess | 34
xwininfo/config.h.in | 12
xwininfo/config.sub | 36
xwininfo/configure | 143
xwininfo/configure.ac | 4
xwininfo/dsimple.c | 333 --
xwininfo/dsimple.h | 21
xwininfo/xwininfo.c | 255 -
xwininfo/xwininfo.man | 9
145 files changed, 9569 insertions(+), 7355 deletions(-)
New commits:
commit 084be14341d4443947b32b2886e38812e4392232
Author: Brice Goglin <bgoglin@debian.org>
Date: Fri Sep 14 23:39:13 2007 +0200
Prepare changelog for upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 5c2d507..c291293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-utils (7.2+1) UNRELEASED; urgency=low
+x11-utils (7.3+1) unstable; urgency=low
[ Julien Cristau ]
* xmessage 1.0.2.
@@ -13,6 +13,7 @@ x11-utils (7.2+1) UNRELEASED; urgency=low
* xdriinfo 1.0.2.
+ Drop 03_xvinfo_manpage_typo.diff, merged upstream.
* xwininfo 1.0.3.
+ * Add myself to Uploaders, and remove Branden with his permission.
-- Brice Goglin <bgoglin@debian.org> Wed, 22 Aug 2007 08:25:17 +0200
diff --git a/debian/control b/debian/control
index a4c563d..3a9f86d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-utils
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0-1),
libxaw7-dev (>= 1:1.0.1-1), libxext-dev (>= 1:1.0.0-1),
libxft-dev (>= 2.1.8.2-6), libxi-dev (>= 1:1.0.0-3),
commit 9c0b76e13c7ad9423f491556b0d268c4899752fc
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 28 22:58:28 2007 +0200
xwininfo 1.0.3
diff --git a/debian/changelog b/debian/changelog
index a74c3a2..5c2d507 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-utils (7.2+1) UNRELEASED; urgency=low
* xvinfo 1.0.2.
* xdriinfo 1.0.2.
+ Drop 03_xvinfo_manpage_typo.diff, merged upstream.
+ * xwininfo 1.0.3.
-- Brice Goglin <bgoglin@debian.org> Wed, 22 Aug 2007 08:25:17 +0200
diff --git a/xwininfo/ChangeLog b/xwininfo/ChangeLog
index 5294bfd..eb3fcd5 100644
--- a/xwininfo/ChangeLog
+++ b/xwininfo/ChangeLog
@@ -1,46 +1,261 @@
-2006-04-01 Adam Jackson <ajax@freedesktop.org>
+commit b7e88cd9d28a3d3e467b769f3efe87f7c2f4c0a5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 27 14:20:35 2007 -0700
- * configure.ac:
- Bump to 1.0.2.
+ Version bump: 1.0.3
-2006-03-09 Alan Coopersmith <alan.coopersmith@sun.com>
+commit 56f0b5dfb1486e262eb514fac44c73cea4bb4471
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 27 14:20:02 2007 -0700
- * xwininfo.c:
- Clear two tiny memory leaks. (Coverity ids #900 & 901)
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c8d205c30547ca526404a0b257c3cc5d40970be6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Aug 7 15:50:13 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Add static & const qualifiers to xwininfo.c
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 77d50c0bf824f847bd9ede30c21618845258de76
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Tue Aug 7 15:38:23 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Replace sprintf's with snprintf & strlcat
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 118bd50a9bbc10cab7846fb6ac1a0d25ba4c3422
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 6 19:52:13 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ dsimple.c: ANSIfy function declarations
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e093e4be56bb2be385a972962cf89f234e987ab4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 6 19:44:24 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Purge unused code from dsimple.c
+
+ dsimple.c was originally shared source among several X apps.
+ Since modularization gave each app it's own copy, much of the code is
+ no longer needed in each app.
-2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com>
+commit 59bbe12a40fdb3d39429d0d0ce809ad28116e7ed
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Aug 6 19:18:57 2007 -0700
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
+ Rename xwininfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `dsimple.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5a251886c0f158f4c8a342b6fbdeebf3dbd1c0fd
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu May 24 18:20:11 2007 -0700
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Man page formatting: make -geometry bold like other options
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 07459b14b36f15cfdfc6384019aaf020c7920cd4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu May 24 18:17:28 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ renamed: .cvsignore -> .gitignore
+commit 24fc2a569df9eaa776bcdddbb26bf4ea97b69d13
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+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
+
+ X.Org Bugzilla #10616: <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
+ Reported upstream from
+ Debian bug #350313 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=350313>
+
+commit 412a3232373131634072df0d0b4843abf360def4
+Author: Adam Jackson <ajax@nwnk.net>
+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: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:55 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit a4169ffa7eb6eb9a28fd64a0686a813da975736c
+Author: Adam Jackson <ajax@nwnk.net>
+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: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: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: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: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:35:09 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 296d8e6ab8a86e5653529d0497ca5751d89f23b5
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+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:56 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit ee7bf4989434ba5f30451c3f07e4a6e01e6532d4
+Author: Kevin E Martin <kem@kem.org>
+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
+ with separate build roots.
+
+commit 4e58b0e12d46503c5f75ead9a859694aafd5b9b7
+Author: Kevin E Martin <kem@kem.org>
+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: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: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: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:39 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 270145dc0f3ad5c7ad7d6086da19c0a25ea853a9
+Author: Adam Jackson <ajax@nwnk.net>
+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:46 2005 +0000
+
+ Build system for xwininfo
+
+commit 5cd08344c43c739c9a6837f1a60ae7c42e5afabe
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+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
+ kinds of printer fonts (controlled by the xp-listfonts-modes attribute
+ as described in the CDE DtPrint and Xprint specifications).
+
+commit ac7cc196b722ee4653326aee459f40ad16a260c1
+Author: Egbert Eich <eich@suse.de>
+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: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: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:32 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 6dfbd3f819f10e4d04653df2074526860007968e
+Author: Egbert Eich <eich@suse.de>
+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: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: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:24 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 5e5a590668dc3ebe7e2cb568aad4c9c14021f2a2
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+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 d5bb27c..bb177d5 100644
--- a/xwininfo/Makefile.am
+++ b/xwininfo/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xwininfo
-xwininfo_CFLAGS = $(XWININFO_CFLAGS)
+AM_CFLAGS = $(XWININFO_CFLAGS)
xwininfo_LDADD = $(XWININFO_LIBS)
xwininfo_SOURCES = \
@@ -37,8 +37,16 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
+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)
+
+dist-hook: ChangeLog
SED = sed
diff --git a/xwininfo/Makefile.in b/xwininfo/Makefile.in
index 0515c9a..c980439 100644
--- a/xwininfo/Makefile.in
+++ b/xwininfo/Makefile.in
@@ -77,8 +77,7 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_xwininfo_OBJECTS = xwininfo-dsimple.$(OBJEXT) \
- xwininfo-xwininfo.$(OBJEXT)
+am_xwininfo_OBJECTS = dsimple.$(OBJEXT) xwininfo.$(OBJEXT)
xwininfo_OBJECTS = $(am_xwininfo_OBJECTS)
am__DEPENDENCIES_1 =
xwininfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -213,7 +212,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-xwininfo_CFLAGS = $(XWININFO_CFLAGS)
+AM_CFLAGS = $(XWININFO_CFLAGS)
xwininfo_LDADD = $(XWININFO_LIBS)
xwininfo_SOURCES = \
dsimple.c \
@@ -225,8 +224,9 @@ appman_PRE = \
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
CLEANFILES = $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog
SED = sed
# Strings to replace in man pages
@@ -334,8 +334,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwininfo-dsimple.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwininfo-xwininfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dsimple.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwininfo.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -350,34 +350,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-xwininfo-dsimple.o: dsimple.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -MT xwininfo-dsimple.o -MD -MP -MF "$(DEPDIR)/xwininfo-dsimple.Tpo" -c -o xwininfo-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwininfo-dsimple.Tpo" "$(DEPDIR)/xwininfo-dsimple.Po"; else rm -f "$(DEPDIR)/xwininfo-dsimple.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xwininfo-dsimple.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -c -o xwininfo-dsimple.o `test -f 'dsimple.c' || echo '$(srcdir)/'`dsimple.c
-
-xwininfo-dsimple.obj: dsimple.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -MT xwininfo-dsimple.obj -MD -MP -MF "$(DEPDIR)/xwininfo-dsimple.Tpo" -c -o xwininfo-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwininfo-dsimple.Tpo" "$(DEPDIR)/xwininfo-dsimple.Po"; else rm -f "$(DEPDIR)/xwininfo-dsimple.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsimple.c' object='xwininfo-dsimple.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -c -o xwininfo-dsimple.obj `if test -f 'dsimple.c'; then $(CYGPATH_W) 'dsimple.c'; else $(CYGPATH_W) '$(srcdir)/dsimple.c'; fi`
-
-xwininfo-xwininfo.o: xwininfo.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -MT xwininfo-xwininfo.o -MD -MP -MF "$(DEPDIR)/xwininfo-xwininfo.Tpo" -c -o xwininfo-xwininfo.o `test -f 'xwininfo.c' || echo '$(srcdir)/'`xwininfo.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwininfo-xwininfo.Tpo" "$(DEPDIR)/xwininfo-xwininfo.Po"; else rm -f "$(DEPDIR)/xwininfo-xwininfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xwininfo.c' object='xwininfo-xwininfo.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -c -o xwininfo-xwininfo.o `test -f 'xwininfo.c' || echo '$(srcdir)/'`xwininfo.c
-
-xwininfo-xwininfo.obj: xwininfo.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -MT xwininfo-xwininfo.obj -MD -MP -MF "$(DEPDIR)/xwininfo-xwininfo.Tpo" -c -o xwininfo-xwininfo.obj `if test -f 'xwininfo.c'; then $(CYGPATH_W) 'xwininfo.c'; else $(CYGPATH_W) '$(srcdir)/xwininfo.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xwininfo-xwininfo.Tpo" "$(DEPDIR)/xwininfo-xwininfo.Po"; else rm -f "$(DEPDIR)/xwininfo-xwininfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xwininfo.c' object='xwininfo-xwininfo.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xwininfo_CFLAGS) $(CFLAGS) -c -o xwininfo-xwininfo.obj `if test -f 'xwininfo.c'; then $(CYGPATH_W) 'xwininfo.c'; else $(CYGPATH_W) '$(srcdir)/xwininfo.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@@ -474,6 +446,9 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -603,6 +578,7 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -658,8 +634,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
+ dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-appmanDATA install-binPROGRAMS install-data \
@@ -672,6 +648,13 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-info-am
+.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)
+
+dist-hook: ChangeLog
+
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/xwininfo/aclocal.m4 b/xwininfo/aclocal.m4
index f17e720..2d86b12 100644
--- a/xwininfo/aclocal.m4
+++ b/xwininfo/aclocal.m4
@@ -159,7 +159,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/xwininfo/config.guess b/xwininfo/config.guess
index 0f0fe71..278f9e9 100755
--- a/xwininfo/config.guess
+++ b/xwininfo/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@ EOF
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff --git a/xwininfo/config.h.in b/xwininfo/config.h.in
index 1ca4092..1818e9c 100644
--- a/xwininfo/config.h.in
+++ b/xwininfo/config.h.in
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
/* Name of package */
#undef PACKAGE
diff --git a/xwininfo/config.sub b/xwininfo/config.sub
index 5defff6..1761d8b 100755
--- a/xwininfo/config.sub
+++ b/xwininfo/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@ case $basic_machine in
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
diff --git a/xwininfo/configure b/xwininfo/configure
index 17eeaae..d5dfc21 100755
--- a/xwininfo/configure
+++ b/xwininfo/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xwininfo 1.0.2.
+# Generated by GNU Autoconf 2.61 for xwininfo 1.0.3.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xwininfo'
PACKAGE_TARNAME='xwininfo'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='xwininfo 1.0.2'
+PACKAGE_VERSION='1.0.3'
+PACKAGE_STRING='xwininfo 1.0.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1194,7 +1194,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xwininfo 1.0.2 to adapt to many kinds of systems.
+\`configure' configures xwininfo 1.0.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1264,7 +1264,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xwininfo 1.0.2:";;
+ short | recursive ) echo "Configuration of xwininfo 1.0.3:";;
esac
cat <<\_ACEOF
@@ -1360,7 +1360,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xwininfo configure 1.0.2
+xwininfo configure 1.0.3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1374,7 +1374,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xwininfo $as_me 1.0.2, which was
+It was created by xwininfo $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2044,7 +2044,7 @@ fi
# Define the identity of the package.
PACKAGE='xwininfo'
- VERSION='1.0.2'
+ VERSION='1.0.3'
cat >>confdefs.h <<_ACEOF
@@ -3392,6 +3392,102 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+for ac_func in strlcat
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
# Checks for pkg-config packages
@@ -3604,7 +3700,7 @@ Alternatively, you may set the environment variables XWININFO_CFLAGS
and XWININFO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -3614,7 +3710,7 @@ Alternatively, you may set the environment variables XWININFO_CFLAGS
and XWININFO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -4240,7 +4336,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xwininfo $as_me 1.0.2, which was
+This file was extended by xwininfo $as_me 1.0.3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4293,7 +4389,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xwininfo config.status 1.0.2
+xwininfo config.status 1.0.3
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/xwininfo/configure.ac b/xwininfo/configure.ac
index 9a8cdfe..4205a59 100644
--- a/xwininfo/configure.ac
+++ b/xwininfo/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xwininfo,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwininfo)
+AC_INIT(xwininfo,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xwininfo)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -31,6 +31,8 @@ AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
+AC_CHECK_FUNCS([strlcat])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XWININFO, xmuu xext x11)
AC_SUBST(XWININFO_CFLAGS)
diff --git a/xwininfo/dsimple.c b/xwininfo/dsimple.c
index c84ac3b..03b72e7 100644
--- a/xwininfo/dsimple.c
+++ b/xwininfo/dsimple.c
@@ -41,13 +41,10 @@ from The Open Group.
* Written by Mark Lillibridge. Last updated 7/1/87
*/
-#ifdef BUILD_PRINTSUPPORT
-#include <X11/XprintUtil/xprintutil.h>
-#endif /* BUILD_PRINTSUPPORT */
#include "dsimple.h"
/*
- * Just_display: A group of routines designed to make the writting of simple
+ * Just_display: A group of routines designed to make the writing of simple
* X11 applications which open a display but do not open
* any windows much faster and easier. Unless a routine says
* otherwise, it may be assumed to require program_name, dpy,
@@ -61,54 +58,15 @@ from The Open Group.
char *program_name = "unknown_program";
Display *dpy = NULL;
int screen = 0;
-Bool printer_output = False; /* Video or printer output ? */
-#ifdef BUILD_PRINTSUPPORT
-XPContext pcontext = None;
-#endif /* BUILD_PRINTSUPPORT */
Reply to: