x11-utils: Changes to 'debian-experimental'
debian/changelog | 5
debian/patches/03_xvinfo_manpage_typo.diff | 13 -
debian/patches/series | 1
xdriinfo/ChangeLog | 161 ++++++++++++++++++---
xdriinfo/Makefile.am | 10 +
xdriinfo/Makefile.in | 36 ++--
xdriinfo/aclocal.m4 | 2
xdriinfo/compile | 142 -------------------
xdriinfo/configure | 24 +--
xdriinfo/configure.ac | 2
xdriinfo/mkinstalldirs | 158 ---------------------
xdriinfo/xdriinfo.man | 7
xvinfo/ChangeLog | 215 ++++++++++++++++++++++++++---
xvinfo/Makefile.am | 12 +
xvinfo/Makefile.in | 38 ++---
xvinfo/aclocal.m4 | 2
xvinfo/compile | 142 -------------------
xvinfo/configure | 24 +--
xvinfo/configure.ac | 2
xvinfo/mkinstalldirs | 158 ---------------------
xvinfo/xvinfo.c | 7
xvinfo/xvinfo.man | 5
22 files changed, 432 insertions(+), 734 deletions(-)
New commits:
commit ab1fde75ef0cb1e50189e4a3d3a6dc60f0285ccf
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 22 08:26:08 2007 +0200
Drop 03_xvinfo_manpage_typo.diff, merged upstream
diff --git a/debian/changelog b/debian/changelog
index abcb522..a74c3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ x11-utils (7.2+1) UNRELEASED; urgency=low
* Add menu entries for editres, xev, xfontsel and xkill.
* xvinfo 1.0.2.
* xdriinfo 1.0.2.
+ + Drop 03_xvinfo_manpage_typo.diff, merged upstream.
- -- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:36:56 +0200
+ -- Brice Goglin <bgoglin@debian.org> Wed, 22 Aug 2007 08:25:17 +0200
x11-utils (0.1) experimental; urgency=low
diff --git a/debian/patches/03_xvinfo_manpage_typo.diff b/debian/patches/03_xvinfo_manpage_typo.diff
deleted file mode 100644
index 6b3dac4..0000000
--- a/debian/patches/03_xvinfo_manpage_typo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xbase-clients/xvinfo/xvinfo.man
-===================================================================
---- xbase-clients.orig/xvinfo/xvinfo.man 2006-02-18 14:55:11.000000000 -0500
-+++ xbase-clients/xvinfo/xvinfo.man 2006-02-26 20:38:32.000000000 -0500
-@@ -11,7 +11,7 @@
- .PP
- .B xvinfo
- prints out the capabilities of any video adaptors associated
--with the display that are accesible through the X-Video extension.
-+with the display that are accessible through the X-Video extension.
- .SH OPTIONS
- .PP
- .TP 8
diff --git a/debian/patches/series b/debian/patches/series
index 3c337e2..578c917 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01_luit_fix_race_condition.diff -p0
02_xev_flush_standard_output.diff
-03_xvinfo_manpage_typo.diff
04_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
commit 870d3273a7c56bca9914ddd8ff5c9f24d182e61f
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 22 08:19:27 2007 +0200
xdriinfo 1.0.2
diff --git a/debian/changelog b/debian/changelog
index cdef58e..abcb522 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11-utils (7.2+1) UNRELEASED; urgency=low
* Add upstream URL to debian/copyright.
* Add menu entries for editres, xev, xfontsel and xkill.
* xvinfo 1.0.2.
+ * xdriinfo 1.0.2.
-- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:36:56 +0200
diff --git a/xdriinfo/ChangeLog b/xdriinfo/ChangeLog
index 2f0efb9..67b4179 100644
--- a/xdriinfo/ChangeLog
+++ b/xdriinfo/ChangeLog
@@ -1,42 +1,149 @@
-2006-04-01 Adam Jackson <ajax@freedesktop.org>
+commit 46dcc268ae983b7f1214b1839776f8f5d72f4222
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Aug 17 16:27:11 2007 -0700
- * configure.ac:
- Bump to 1.0.1.
+ Version bump: 1.0.2
-2006-01-16 Matthias Hopf <mhopf@suse.de>
+commit f930da05f9d0af42d2daa026b1e99a9e5f0ff4a7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Aug 17 16:26:04 2007 -0700
- * xdriinfo.c:
- GLX_GLXEXT_LEGACY -> GLX_GLXEXT_PROTOTYPES + glxext.h
+ Replace static ChangeLog with dist-hook to generate from git log
-2006-01-13 Matthias Hopf <mhopf@suse.de>
+commit 1d8078119bdfc51e656ca4eb0e5ad122f334cd88
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Aug 10 15:22:05 2007 -0700
- * configure.ac:
- Using glXGetProcAddressARB instead of glXGetProcAddress.
- * xdriinfo.c: (main):
- Casting to GLubyte* to remove warning.
+ Change xdriinfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `xdriinfo.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 49b3932cec1d026195129b35a7e1f982c3a70e99
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu May 24 18:13:03 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ renamed: .cvsignore -> .gitignore
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b833138c8caf357326a5c708bb7f31b6f5d081bf
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu May 24 18:12:27 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ 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>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a563d95affd78ebfae6a59425ea2c1832f97efa6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Apr 8 02:31:21 2006 +0000
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bump to 1.0.1.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 12209b48afe65215e693b00bfb0397e275e85114
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Jan 16 10:54:14 2006 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ GLX_GLXEXT_LEGACY -> GLX_GLXEXT_PROTOTYPES + glxext.h
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 36c5e81eff50ef34f8b96014c8ee04c0563ab853
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Jan 13 16:06:10 2006 +0000
- * configure.ac: Remove check for gl/glx.h as that fails when
- installing Mesa in a non-standard directory and causes the build
- script to exit.
+ Using glXGetProcAddressARB instead of glXGetProcAddress.
+ Casting to GLubyte* to remove warning.
+
+commit d7bbc6892078a0541dd4302277eb67ff0bd90e0d
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:06 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 9073b89b1dcaaa7d3ad61c1228290fad12c356f7
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:21 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 34efbba5acd968eb07c0ab6702371d5833353970
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:19 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit ce638f553d89bb202eff94397933ee3c40165819
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Nov 30 01:17:30 2005 +0000
+
+ Bug #5146: Fix building of xdriinfo in the presence of NVIDIA libGL by
+ using the GLX 1.3 glXGetProcAddressARB instead of glXGetProcAddress.
+
+commit 5777c79b762a65b1610ea59f7f3fd47241f797b6
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:41 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 f206a4af9754100eadaa1ca621abf475d005e0de
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:35:00 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit fe407362531a53339c00782a2f7aa90e8f6a47dd
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:51 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 2c7a5cc7407dd6f7132cf3b50c65f3408872a1a2
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:53 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit fe1aed987cafbbb9eb6ea165487b8891473ea52d
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Oct 18 20:25:30 2005 +0000
+
+ Remove check for gl/glx.h as that fails when installing Mesa in a
+ non-standard directory and causes the build script to exit.
+
+commit d30bf6da2b0fcf960805d099ef4903c9a3ae5d9d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:22 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 2ff37b7da09549f212207d3ea24a0295e5f8c955
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:23:22 2005 +0000
+
+ Check for <GL/glx.h> & libGL in configure.ac instead of waiting for failure
+ at build time if neither Mesa nor vendor OpenGL is installed.
+
+commit 8060bfb0e6211bd8f871770bee40f56df4f5fa2c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:44 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit ae8b217d70907921d4df62a17c7f78cdb99474fe
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Mon Aug 29 11:07:33 2005 +0000
+
+ Adding xdriinfo build system.
+
+commit d5234bf9acf43337c35c6b83d003a8a5aab9b61b
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:27:39 2004 +0000
+
+ DRI trunk-20040613 import
+
+commit bbc27fa912a112fad8d28a566d8fab9db5d8bb3f
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Wed Jun 16 09:27:39 2004 +0000
+
+ Initial revision
diff --git a/xdriinfo/Makefile.am b/xdriinfo/Makefile.am
index c5cce1d..1d79232 100644
--- a/xdriinfo/Makefile.am
+++ b/xdriinfo/Makefile.am
@@ -20,7 +20,7 @@
bin_PROGRAMS = xdriinfo
-xdriinfo_CFLAGS = $(XDRIINFO_CFLAGS)
+AM_CFLAGS = $(XDRIINFO_CFLAGS)
# mesa should really use pkg-config ...
xdriinfo_LDADD = $(XDRIINFO_LIBS)
@@ -34,8 +34,14 @@ 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
+
+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/xdriinfo/Makefile.in b/xdriinfo/Makefile.in
index ecd118e..623fdfd 100644
--- a/xdriinfo/Makefile.in
+++ b/xdriinfo/Makefile.in
@@ -76,7 +76,7 @@ CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
-am_xdriinfo_OBJECTS = xdriinfo-xdriinfo.$(OBJEXT)
+am_xdriinfo_OBJECTS = xdriinfo.$(OBJEXT)
xdriinfo_OBJECTS = $(am_xdriinfo_OBJECTS)
am__DEPENDENCIES_1 =
xdriinfo_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -211,7 +211,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-xdriinfo_CFLAGS = $(XDRIINFO_CFLAGS)
+AM_CFLAGS = $(XDRIINFO_CFLAGS)
# mesa should really use pkg-config ...
xdriinfo_LDADD = $(XDRIINFO_LIBS)
xdriinfo_SOURCES = \
@@ -222,8 +222,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
@@ -331,7 +332,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdriinfo-xdriinfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdriinfo.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -346,20 +347,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) '$<'`
-
-xdriinfo-xdriinfo.o: xdriinfo.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xdriinfo_CFLAGS) $(CFLAGS) -MT xdriinfo-xdriinfo.o -MD -MP -MF "$(DEPDIR)/xdriinfo-xdriinfo.Tpo" -c -o xdriinfo-xdriinfo.o `test -f 'xdriinfo.c' || echo '$(srcdir)/'`xdriinfo.c; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xdriinfo-xdriinfo.Tpo" "$(DEPDIR)/xdriinfo-xdriinfo.Po"; else rm -f "$(DEPDIR)/xdriinfo-xdriinfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xdriinfo.c' object='xdriinfo-xdriinfo.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) $(xdriinfo_CFLAGS) $(CFLAGS) -c -o xdriinfo-xdriinfo.o `test -f 'xdriinfo.c' || echo '$(srcdir)/'`xdriinfo.c
-
-xdriinfo-xdriinfo.obj: xdriinfo.c
-@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xdriinfo_CFLAGS) $(CFLAGS) -MT xdriinfo-xdriinfo.obj -MD -MP -MF "$(DEPDIR)/xdriinfo-xdriinfo.Tpo" -c -o xdriinfo-xdriinfo.obj `if test -f 'xdriinfo.c'; then $(CYGPATH_W) 'xdriinfo.c'; else $(CYGPATH_W) '$(srcdir)/xdriinfo.c'; fi`; \
-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xdriinfo-xdriinfo.Tpo" "$(DEPDIR)/xdriinfo-xdriinfo.Po"; else rm -f "$(DEPDIR)/xdriinfo-xdriinfo.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xdriinfo.c' object='xdriinfo-xdriinfo.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) $(xdriinfo_CFLAGS) $(CFLAGS) -c -o xdriinfo-xdriinfo.obj `if test -f 'xdriinfo.c'; then $(CYGPATH_W) 'xdriinfo.c'; else $(CYGPATH_W) '$(srcdir)/xdriinfo.c'; fi`
uninstall-info-am:
install-appmanDATA: $(appman_DATA)
@$(NORMAL_INSTALL)
@@ -456,6 +443,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 \
@@ -585,6 +575,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
@@ -640,8 +631,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 \
@@ -654,6 +645,11 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
uninstall-info-am
+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/xdriinfo/aclocal.m4 b/xdriinfo/aclocal.m4
index f17e720..2d86b12 100644
--- a/xdriinfo/aclocal.m4
+++ b/xdriinfo/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/xdriinfo/compile b/xdriinfo/compile
deleted file mode 100755
index 1b1d232..0000000
--- a/xdriinfo/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/xdriinfo/configure b/xdriinfo/configure
index 7631b99..b2dc1bc 100755
--- a/xdriinfo/configure
+++ b/xdriinfo/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xdriinfo 1.0.1.
+# Generated by GNU Autoconf 2.61 for xdriinfo 1.0.2.
#
# 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='xdriinfo'
PACKAGE_TARNAME='xdriinfo'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='xdriinfo 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='xdriinfo 1.0.2'
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 xdriinfo 1.0.1 to adapt to many kinds of systems.
+\`configure' configures xdriinfo 1.0.2 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 xdriinfo 1.0.1:";;
+ short | recursive ) echo "Configuration of xdriinfo 1.0.2:";;
esac
cat <<\_ACEOF
@@ -1360,7 +1360,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xdriinfo configure 1.0.1
+xdriinfo configure 1.0.2
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 xdriinfo $as_me 1.0.1, which was
+It was created by xdriinfo $as_me 1.0.2, 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='xdriinfo'
- VERSION='1.0.1'
+ VERSION='1.0.2'
cat >>confdefs.h <<_ACEOF
@@ -3663,7 +3663,7 @@ Alternatively, you may set the environment variables XDRIINFO_CFLAGS
and XDRIINFO_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
@@ -3673,7 +3673,7 @@ Alternatively, you may set the environment variables XDRIINFO_CFLAGS
and XDRIINFO_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
@@ -4391,7 +4391,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 xdriinfo $as_me 1.0.1, which was
+This file was extended by xdriinfo $as_me 1.0.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4444,7 +4444,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xdriinfo config.status 1.0.1
+xdriinfo config.status 1.0.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/xdriinfo/configure.ac b/xdriinfo/configure.ac
index 00b4952..6e92ccb 100644
--- a/xdriinfo/configure.ac
+++ b/xdriinfo/configure.ac
@@ -21,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xdriinfo, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xdriinfo)
+AC_INIT(xdriinfo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xdriinfo)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/xdriinfo/mkinstalldirs b/xdriinfo/mkinstalldirs
deleted file mode 100755
index 259dbfc..0000000
--- a/xdriinfo/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/xdriinfo/xdriinfo.man b/xdriinfo/xdriinfo.man
index efe5e51..b48335c 100644
--- a/xdriinfo/xdriinfo.man
+++ b/xdriinfo/xdriinfo.man
@@ -28,6 +28,11 @@ directly then no X connection is needed.
.B DISPLAY
The default display.
.SH "SEE ALSO"
-.IR glxinfo (1x)
+.IR X (__miscmansuffix__),
+.IR xdpyinfo (__appmansuffix__),
+.IR xwininfo (__appmansuffix__),
+.IR xvinfo (__appmansuffix__),
+.IR glxinfo (__appmansuffix__),
+.IR xprop (__appmansuffix__)
.SH AUTHOR
Felix Kuehling
commit a592573a9707acc86b862ba19d7e9046803a3167
Author: Brice Goglin <bgoglin@debian.org>
Date: Wed Aug 22 08:18:33 2007 +0200
xvinfo 1.0.2
diff --git a/debian/changelog b/debian/changelog
index 034d22a..cdef58e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-utils (7.2+1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
* Add menu entries for editres, xev, xfontsel and xkill.
+ * xvinfo 1.0.2.
-- Brice Goglin <bgoglin@debian.org> Fri, 17 Aug 2007 09:36:56 +0200
diff --git a/xvinfo/ChangeLog b/xvinfo/ChangeLog
index 6eb4c51..22b9dc2 100644
--- a/xvinfo/ChangeLog
+++ b/xvinfo/ChangeLog
@@ -1,25 +1,210 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8773a750f5489b4a8f577f87873066486e9d85a8
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 16 16:26:16 2007 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ff49870534195814d4d5f0979f0273ad6ff4337e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 16 16:23:32 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a73b56466eba086b2eb6513b1674e6d7251b4a19
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Aug 16 16:21:30 2007 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Change xvinfo_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:27: compiling `xvinfo.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f237d5c415352c28c9dae1453aa3308532d42bb9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu May 24 18:06:34 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Fix typo in man page (accesible)
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a32fb538f49e8a7a23aef2a844d05f1cd3cc907a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu May 24 18:05:52 2007 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ 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 29190804b219bf3e6289426a832b32ad2f4c53a4
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date: Mon Jan 15 17:14:56 2007 +0100
+
+ Fix FourCC name output on big endian platforms.
+
+ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=9665 .
+
+commit 69758559c5ddb85bbf6501ea8e58c0896c7c1f11
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date: Mon Jan 15 17:13:51 2007 +0100
+
+ Make git ignore object files and Emacs style backup files.
+
+commit f4363bef8760521d07a2b90d81dd85d19192bcf2
+Author: Michel Dänzer <michel@tungstengraphics.com>
+Date: Mon Jan 15 17:12:57 2007 +0100
+
+ Rename .cvsignore to .gitignore.
+
+commit 9f0d4a66bbe6e11957e98d23b4baa8c76d8803b2
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:54 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit c2c5737fd62b06f0bbaf4ef58dfe4846bfbaf48b
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:47 2005 +0000
+
+ Stub COPYING files
+
+commit cff129a50807c98e96b2c226be344ddbfb333c12
+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 dbb5b18240e906a9744e4133b3b76b0aa6ecb615
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:26 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 997a79f1dd547c98a62e59865d41b52618023d54
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:28 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 1afcbdd5cbb3591ce86821d8f35e6132d45f93b6
+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 58bb86147def38e04034527352448759442fad2a
+Author: Eric Anholt <anholt@freebsd.org>
Reply to: