Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Mon Sep 27 15:41:55 CEST 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-09-25 05:59:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-27 11:16:07.000000000 +0200
@@ -1,0 +2,49 @@
+Mon Sep 27 08:43:36 UTC 2010 - sndirsch@novell.com
+
+- xload 1.1.0
+ * This release includes several years worth of build improvements
+ and cleanups, including fixes for builds on case-insenstive
+ filesystems, builds without the Xaw8 macros, and other fixes
+ needed for building on various platforms.
+ Support for displaying translated error messages via gettext is
+ included, but no translations have been (see the mail I just
+ sent to xorg-devel about translations if you're interested in
+ localizing xload or other X.Org apps).
+- xsm 1.0.2
+ * This release includes nearly 5 years worth of build
+ improvements and cleanups, including fixes for builds on
+ case-insensitive filesystems, builds without the Xaw8 macros,
+ and other fixes needed for building on various platforms.
+- xfontsel 1.0.3
+ * This release includes several years worth of build
+ improvements and cleanups, including fixes for builds on
+ case-insensitive filesystems, builds without the Xaw8 macros,
+ and other fixes needed for building on various platforms.
+- xstdcmap 1.0.2
+ * This minor maintenance release accumulates nearly 5 years worth
+ of build system fixes and improvements, and updates to current
+ autotools/macros.
+- xwininfo 1.1.0
+ * The major new feature of this release is the rewrite to use
+ libxcb instead of libX11, batching requests for information to
+ reduce waiting on round-trips in gathering the client
+ information from the X server. Testing over a high-latency
+ connection from California to China and back resulted in an
+ improvement from 8 minutes to 45 seconds to output the
+ complete window tree via xwininfo -root -all of a GNOME
+ desktop session with 114 windows.
+ This release thus libxcb to build, (though it still requires
+ some libX11 headers as well). It also requires a minimum
+ xproto version of 7.0.17.
+ Should anyone need to maintain the libX11 version, a 1.0.x
+ branch can be created in git from the 1.0.5 release base as
+ needed.
+ This release also adds support for reporting some EMWH window
+ manager hints, including UTF-8 localized window names from the
+ _NET_WM_NAME property. (This version does not correctly
+ display names for windows with the WM_NAME property set using
+ the COMPOUND_TEXT encoding. Most current desktops & toolkits
+ will set the _NET_WM_NAME, which is used in preference to
+ WM_NAME if it is set.)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xfontsel-1.0.2.tar.bz2
xload-1.0.2.tar.bz2
xsm-1.0.1-20100211-4f56a25.tar.bz2
xstdcmap-X11R7.0-1.0.1.tar.bz2
xwininfo-1.0.5.tar.bz2
New:
----
xfontsel-1.0.3.tar.bz2
xload-1.1.0.tar.bz2
xsm-1.0.2.tar.bz2
xstdcmap-1.0.2.tar.bz2
xwininfo-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.s5k6R3/_old 2010-09-27 15:41:10.000000000 +0200
+++ /var/tmp/diff_new_pack.s5k6R3/_new 2010-09-27 15:41:10.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 22
+Release: 23
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -78,7 +78,7 @@
Source45: xf86dga-1.0.2.tar.bz2
Source46: xfd-X11R7.0-1.0.1.tar.bz2
Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2
-Source48: xfontsel-1.0.2.tar.bz2
+Source48: xfontsel-1.0.3.tar.bz2
Source49: xfs-1.1.0.tar.bz2
Source50: xfsinfo-1.0.2.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
@@ -91,7 +91,7 @@
Source58: xkbprint-1.0.2.tar.bz2
Source59: xkbutils-1.0.2.tar.bz2
Source60: xkill-1.0.2.tar.bz2
-Source61: xload-1.0.2.tar.bz2
+Source61: xload-1.1.0.tar.bz2
Source62: xlogo-1.0.2.tar.bz2
Source63: xlsatoms-1.1.0.tar.bz2
Source64: xlsclients-1.1.1.tar.bz2
@@ -114,13 +114,13 @@
Source82: xsetmode-X11R7.0-1.0.0.tar.bz2
Source83: xsetpointer-1.0.1.tar.bz2
Source84: xsetroot-1.0.3.tar.bz2
-Source85: xsm-1.0.1-20100211-4f56a25.tar.bz2
-Source86: xstdcmap-X11R7.0-1.0.1.tar.bz2
+Source85: xsm-1.0.2.tar.bz2
+Source86: xstdcmap-1.0.2.tar.bz2
Source87: xtrap-X11R7.1-1.0.2.tar.bz2
Source88: xvidtune-1.0.2.tar.bz2
Source89: xvinfo-1.1.0.tar.bz2
Source90: xwd-1.0.3.tar.bz2
-Source91: xwininfo-1.0.5.tar.bz2
+Source91: xwininfo-1.1.0.tar.bz2
Source92: xwud-1.0.2.tar.bz2
Source93: mkcomposecache-1.2.1.tar.bz2
Source94: rendercheck-1.3.tar.bz2
@@ -250,7 +250,7 @@
pushd xinit-*
%patch7
popd
-pushd xsm
+pushd xsm-*
%patch8
popd
pushd xrx-*
@@ -453,6 +453,7 @@
%ghost /var/log/xdm.errors
%ghost /var/run/xdm.pid
/var/lib/xdm/authdir/
+/usr/%{_lib}/X11/xsm/system.xsm
%files xauth
%defattr(-,root,root)
++++++ xfontsel-1.0.2.tar.bz2 -> xfontsel-1.0.3.tar.bz2 ++++++
++++ 15012 lines of diff (skipped)
++++++ xload-1.0.2.tar.bz2 -> xload-1.1.0.tar.bz2 ++++++
++++ 17807 lines of diff (skipped)
++++++ xsm-1.0.1-20100211-4f56a25.tar.bz2 -> xsm-1.0.2.tar.bz2 ++++++
++++ 15255 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/autogen.sh new/xsm-1.0.2/autogen.sh
--- old/xsm/autogen.sh 2010-04-05 08:19:34.000000000 +0200
+++ new/xsm-1.0.2/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/ChangeLog new/xsm-1.0.2/ChangeLog
--- old/xsm/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/xsm-1.0.2/ChangeLog 2010-09-27 02:04:05.000000000 +0200
@@ -0,0 +1,450 @@
+commit cf08b277a983a97a3db1ee39eeeb6bf953d084db
+Author: Alan Coopersmith
+Date: Sun Sep 26 17:00:05 2010 -0700
+
+ xsm 1.0.2
+
+ Signed-off-by: Alan Coopersmith
+
+commit 88ae324056c2a6be1efd5aa96c4bbd3e0ad4274b
+Author: Alan Coopersmith
+Date: Sun Sep 26 16:54:04 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7089b5ad09474f51bbb04db0f12667605f16b8ed
+Author: Alan Coopersmith
+Date: Sun Sep 26 16:51:35 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8a89975a139dd6b5ecd5f82f2c3a872dc64cf4df
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 4f56a25154eb876f33a46d29eed4be46bba814f2
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:07 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 547b489f70df72524f210cca990d1373cf80eb34
+Author: Gaetan Nadon
+Date: Sat Dec 19 20:48:48 2009 -0500
+
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Signed-off-by: Gaetan Nadon
+
+commit 47a6e14ea0f65a1fceedb3f8611e05255f7333d3
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:55 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 5b1760932cfba4d1e921b4e9e0adfb584e1e365c
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit feda4dcbfcf7102297109101ba310a5c50ed6483
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 24dd7a8ef6d9edc1145855eba880b7c3b5bb2284
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:39 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 12b82f86995178b572a91c377938311acb1e03df
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:16 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 396f6dbb94447d2314a064f3384bae4c9f3dca01
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 26 19:12:30 2009 -0200
+
+ Correct make distcheck and gcc/sparse warnings.
+
+commit e06eddafd5f72f6f0782e37e9617c2e874021038
+Author: Paulo Cesar Pereira de Andrade
+Date: Sun Mar 16 16:25:42 2008 -0300
+
+ Compile warning fixes.
+
+ Include header with prototypes for signals.c, and change prototypes and
+ definitions to match. This should not have any side effects as function
+ arguments are ignored.
+ Ansify some functions with K&R definitions.
+ printhex.c:fprintfhex() could be changed to a "sane" implementation, but
+ only change was "ansification".
+
+commit f1a527497c9621428cdb78dd9d37cb846ec10544
+Author: Paulo Cesar Pereira de Andrade
+Date: Fri Nov 28 03:38:37 2008 -0200
+
+ enable VPATH build, reorganize app default files
+
+ Minor changes to http://bugs.freedesktop.org/attachment.cgi?id=20212.
+
+commit 463bc71d330d357babb4981c933e6b615621c262
+Author: Matthieu Herrb
+Date: Sat Nov 22 15:11:29 2008 +0100
+
+ Fix build in separate directory.
+
+commit 9959f4e34227dc40f43326ed1a2240d4932f99d9
+Author: Julien Cristau
+Date: Sun Nov 16 21:53:59 2008 +0100
+
+ Don't override the RSH variable before checking if it's set
+
+ This allows setting RSH on the configure command line or environment,
+ and lifts the build dependency on an rsh client.
+
+commit 7dee380747bbd0a07c64d8cdb2a229485403847a
+Author: Alan Coopersmith
+Date: Wed Oct 22 09:28:56 2008 -0700
+
+ Use realloc to resize buffer, not malloc+strcpy+free
+
+commit 01ac0b14bea486a626d8565dec8c8e546bb3d82f
+Author: Alan Coopersmith
+Date: Wed Oct 22 08:37:59 2008 -0700
+
+ Constify lock.c
+
+commit 6f1ebee7cba16f31c6201d6654d0c4ff9502ec12
+Author: James Cloos
+Date: Wed Aug 20 10:32:53 2008 -0400
+
+ xaw8 is gone, use xaw7
+
+commit 814b1bd0952299d1864c586f005904101206219b
+Author: Jeremy Huddleston
+Date: Thu Mar 27 20:07:55 2008 -0700
+
+ Build fix for file systems that are not case sensitive
+
+commit cfb89d84fa8ea3f42b130d676125a530bd0e1e94
+Author: Alan Coopersmith
+Date: Thu Feb 21 08:51:42 2008 -0800
+
+ Add PKG_CHECK_MODULES entries for the libraries xsm calls directly
+
+commit 281158a840b5669dcea426fee4bdf4439f4e41c5
+Author: Alan Coopersmith
+Date: Thu Feb 21 08:38:17 2008 -0800
+
+ Change xsm_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:32: compiling `auth.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit 1dee63fcbe0e3915a4b74578d71dab673c6e313d
+Author: James Cloos
+Date: Thu Dec 6 16:37:30 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit adf6777c5c34ca156d77f31af3ab3dec744c109f
+Author: Alan Coopersmith
+Date: Mon Nov 26 13:48:44 2007 -0800
+
+ Remove instructions on monolithic build system from README
+
+commit 6f4560e2ad81736127d2d3544415a05d41e8a2a7
+Author: Alan Coopersmith
+Date: Mon Nov 26 13:21:18 2007 -0800
+
+ Use snprintf, strdup & remove instead of sprintf, malloc/strcpy & unlink
+
+commit fab9dcb15024996ac3a4f94d65ba73f484820534
+Author: James Cloos
+Date: Mon Sep 3 05:51:49 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 43612da3a7dfc4cf301c414e5c4c4a2c526eff0c
+Author: James Cloos
+Date: Thu Aug 23 19:25:13 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 6d14861388ba520387e9f3690985c8c15823e60c
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:54 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 37399858c165d769777b5ad912cca6a28c1e9174
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:47 2005 +0000
+
+ Stub COPYING files
+
+commit 8af442aee53b6519402edc31f7aaec9cff15d24a
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:11 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 436bf72ac6491cd999eef34686a105cc3009aa03
+Author: Kevin E Martin
+Date: Wed Dec 7 16:18:01 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 5c26c0c24b419e91e2d0ee33659f24bcde8f5fe0
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:26 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit b1d7496da8b7ece105553626f2041eb37a4545de
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:28 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 01337278c805f4dcb5472cea320271ff98043e00
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:47 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 6761550f844f7dcc9120aeb47f1e6200541132f4
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:08 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 6eae89f042d8d6a9481f2cb04c5d0be0a8a86ea2
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:56 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit bf766423665374deae5ba0ec1691c22d2edc6474
+Author: Kevin E Martin
+Date: Wed Nov 9 21:09:22 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit ea22303c5ede79f9b0f70f6e9119a45b0f08ed92
+Author: Alan Coopersmith
+Date: Sun Oct 23 16:58:38 2005 +0000
+
+ Fix typo. (Tobias Stoeckmann)
+
+commit 032612fecc97aebc57db04f76f7ea4ce69fe3c4c
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:58 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b64cb46692739f59bb648753a6c16d80c032b46b
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:32:54 2005 +0000
+
+ Change default install dir for app-default files from
+ $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+ the monolith & allow localization
+
+commit c7d2af3102968f14f5d4a5db2c968beca4c701c9
+Author: Alan Coopersmith
+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 98e21bcf2e08115841d53c67a3c1fe66eac04105
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:48 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 0e8270f8cb2ff73eda71589a1e23ce434f03bcf3
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:32 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 71fc4c55831ec988b0a902eaa4408d66c7fd1ea0
+Author: Alan Coopersmith
+Date: Sat Jul 30 21:07:26 2005 +0000
+
+ Add prototypes of Xalloc/free functions.
+ Export ImUtil.h to match modular tree install.
+ Define SVR4 to 1 to avoid warning about redefining to different values.
+ Include missing headers to clear more compiler warnings.
+
+commit a0d7e5f72a1a6b4222ec05b368935d2d84c76e2c
+Author: Alan Coopersmith
+Date: Sat Jul 30 20:33:15 2005 +0000
+
+ Add check for putenv() for xsm's misc.c
+
+commit 660867c1e6639382a389db391db468e214fce235
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:38 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 d52d32f6fb738c87759e84ed65095675a4445270
+Author: Alan Coopersmith
+Date: Tue Jul 26 15:44:03 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit ae806b5d11971407cc06f22ff1ce81c86fbae672
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:04 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 2357729733356dde5bf4fad434cfc6a3c9bd7f44
+Author: Alan Coopersmith
+Date: Sat Jul 16 22:07:13 2005 +0000
+
+ Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get
+ HAS_MKSTEMP defined in modular builds.
+
+commit 6fc73059455d756c2bc5c2780b0fc8a444dd9039
+Author: Alan Coopersmith
+Date: Sat Jul 16 22:00:11 2005 +0000
+
+ Convert more app-defaults rules to work with non-GNU make
+
+commit e2191eda39bb8021d36d86750b9eb6b33702fa95
+Author: Alan Coopersmith
+Date: Sat Jul 16 21:59:14 2005 +0000
+
+ Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection
+ against tempfile race conditions in many places)
+
+commit 2f07c342e877fde5d3f64041ca6ff365a643ddc8
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 20:09:07 2005 +0000
+
+ xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
+ whitespace after backslash modularizeapp.sh: s/destkop/desktop/
+ modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
+ Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
+ Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
+
+commit b2fec4bfd950c450c774543b3336e1beb0bd9aa1
+Author: Egbert Eich
+Date: Fri Apr 23 19:55:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 1233b543cac3b9c1a6155042c4ff73a4b0b73293
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:46 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ba8059df1be266090f17a4877a2fe28818ee511a
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 034f5e9e912b8315e2cdb5ca8c3dfed078733a03
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:27 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit b24c3eb3e0f657d599c8a4edbd2abdfc8c4130ec
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:17 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit d0721af92ab08fc526c7c432ecc6273717cecae0
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:18 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit ac8c3cf394fb9d0eb57332ea7b2d12fb3c4a396d
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit c8ddd5d82a72167de6e0a544b55f9b03ab93053e
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:55 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/config.h.in new/xsm-1.0.2/config.h.in
--- old/xsm/config.h.in 1970-01-01 01:00:00.000000000 +0100
+++ new/xsm-1.0.2/config.h.in 2010-09-27 02:03:51.000000000 +0200
@@ -0,0 +1,70 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if you have the 'mkstemp' function. */
+#undef HAS_MKSTEMP
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you DO NOT have the 'putenv' function. */
+#undef NOPUTENV
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/configure.ac new/xsm-1.0.2/configure.ac
--- old/xsm/configure.ac 2010-04-05 08:19:34.000000000 +0200
+++ new/xsm-1.0.2/configure.ac 2010-09-27 01:59:44.000000000 +0200
@@ -21,22 +21,20 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xsm,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsm)
+AC_PREREQ([2.60])
+AC_INIT([xsm], [1.0.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xsm])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
-
AC_ARG_WITH(rsh, AS_HELP_STRING([--with-rsh=PATH],
[Rsh command to use (default: $bindir/ssh)]),
[ rsh="$withval"],
@@ -51,14 +49,12 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(XSM, x11 xt ice sm xaw7)
-XSM_LIBS="$XSM_LIBS"
+
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
-AC_SUBST(XSM_CFLAGS)
-AC_SUBST(XSM_LIBS)
AC_SUBST(appdefaultdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/INSTALL new/xsm-1.0.2/INSTALL
--- old/xsm/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/xsm-1.0.2/INSTALL 2010-09-27 02:04:04.000000000 +0200
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/Makefile.am new/xsm-1.0.2/Makefile.am
--- old/xsm/Makefile.am 2010-04-05 08:19:33.000000000 +0200
+++ new/xsm-1.0.2/Makefile.am 2010-09-27 01:51:09.000000000 +0200
@@ -93,29 +93,11 @@
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xsm/missing new/xsm-1.0.2/missing
--- old/xsm/missing 1970-01-01 01:00:00.000000000 +0100
+++ new/xsm-1.0.2/missing 2010-09-27 02:03:52.000000000 +0200
@@ -0,0 +1,376 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard , 1996.
+
+# 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, see http://www.gnu.org/licenses/.
+
+# 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.
+
+if test $# -eq 0; then
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to ."
+ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
+ ;;
+
+ -*)
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+ ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
+ echo 1>&2 "\
+WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex*|flex*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
+ touch $file
+ ;;
+
+ tar*)
+ shift
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
++++++ xstdcmap-X11R7.0-1.0.1.tar.bz2 -> xstdcmap-1.0.2.tar.bz2 ++++++
++++ 17429 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/ChangeLog new/xstdcmap-1.0.2/ChangeLog
--- old/xstdcmap-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:54.000000000 +0100
+++ new/xstdcmap-1.0.2/ChangeLog 2010-09-27 03:17:55.000000000 +0200
@@ -1,25 +1,317 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 180893b7d452d31e1a64671292315abef8b7590e
+Author: Alan Coopersmith
+Date: Sun Sep 26 18:16:14 2010 -0700
- * configure.ac:
- Update package version for X11R7 release.
+ xstdcmap 1.0.2
+
+ Signed-off-by: Alan Coopersmith
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a81f0733a01bc0c0aa66394a805cf93d63f462be
+Author: Alan Coopersmith
+Date: Sun Sep 26 18:14:01 2010 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 4215ce6e95c1164298b8caf01dae5ca91e01adaf
+Author: Alan Coopersmith
+Date: Sun Sep 26 18:12:02 2010 -0700
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 03caff7a7deb11f9d7909be41e8f0a15d5292d53
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a728a88ddaad188c5a77a34beac0b032429442c5
+Author: Alan Coopersmith
+Date: Fri Aug 6 15:13:36 2010 -0700
- * configure.ac:
- Update package version number for RC1 release.
+ Fill in COPYING file with copyright notices from source code
+
+ Signed-off-by: Alan Coopersmith
+commit 9388d4661a6e7da03f0a5325a7fe96039fbf2b20
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:07 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 97cb7b01d5628c8b36769816bbc956a8b0c94980
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:55 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 11e74518406cae46a273a15b7e550dc507c95038
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit ca6781c3040f4bd3fbe3f0a1f89e7bcc92bf5a9f
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 8eb678dc5d32719434667593202175d66c347c12
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:39 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 382ee990c5f3d74f43e25601a3cdea30e1c3e1f5
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:16 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 9ddb4817b05da0838c8c41c4ece05677378d7b99
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:31 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit eab07f25a0143a5c19ed3c5197bf1dd10a51fc68
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 26 19:15:41 2009 -0200
+
+ Corrrect make distcheck.
+
+commit ebd4cf07e099d2f702f688b849c28263dad1cb77
+Author: James Cloos
+Date: Thu Dec 6 16:37:31 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit 04e353b86ae2cc54e943eef8be084afa39d47b08
+Author: James Cloos
+Date: Mon Sep 3 05:51:52 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 18ea4fc32a85c990b5b817e13dfcba3ecc513e4e
+Author: James Cloos
+Date: Thu Aug 23 19:25:13 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 6365273a91f167f4fdd09b9b40ba7bb3116889dd
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:54 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 10aa21dd34064de8985677eebc363ee185c2d77f
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:47 2005 +0000
+
+ Stub COPYING files
+
+commit 94d054b6feb5c871a597675493e51b5e32e730f1
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:11 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 78b405a26a5e40ebeac8228752c7a410c45f1c87
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:26 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit fe79d69ff4525ff38539d87840f48c066008db0c
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:28 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 379ee5cf55ef787240b11fb3d4f70e0af06b5cbf
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:47 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 98d2a2ae0169a3c5b3650f9db0fccab8332d9177
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:08 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 5a3494301ef7af36b319d589635f17810bc9cdca
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:56 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 32e10cc48d4b5d34f317d4b52423ec6144bc4c37
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:58 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit eb2e033e8de91920b7e6f284fb530b657a2ff7e3
+Author: Alan Coopersmith
+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 a1635bcc1209cbae77649d2e54ceb39f62436a94
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:48 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit a306faeccaf61f81229cb71c7372b83858e742ab
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:32 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 0d78ed7e435f71fbf39083fd3234b7dcc00bfe34
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:38 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 f44de2580c94b06b8e43bb7f32f9409a5bfe1812
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:04 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 1b024ee5c3ddf09fb5d900cc8e1733d2ba0679d1
+Author: Søren Sandmann Pedersen
+Date: Thu Jul 14 22:40:16 2005 +0000
+
+ Add _BSD_SOURCE to lots of applications - patch from Stefan Dirsch
+
+commit 8b9becb78c06d7d99e00750a18ccf9bceb5d2b2b
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 20:09:09 2005 +0000
+
+ xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
+ whitespace after backslash modularizeapp.sh: s/destkop/desktop/
+ modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
+ Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
+ Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
+
+commit 4120717d0b7037bb4eb940f5ec8244b6bab68c21
+Author: Egbert Eich
+Date: Mon May 24 19:05:02 2004 +0000
+
+ Muffle compiler warnings.
+ fix option name in log message.
+ improve debugging messages.
+
+commit a2f01661f30b115b8dcec91325951be3be71d191
+Author: Egbert Eich
+Date: Fri Apr 23 19:55:07 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 93f45ec42068e4df35bd86810fb6e763b5b392f5
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:46 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit c646b544cdad5846974b57be7f38c708dc4b07f0
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:18 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 250f11b9c9e1cb1aa763bd200def5cbf95a4341c
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:27 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 9ba813fe25b60cf4c4111a90952925f0b48010a2
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:17 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 312a489c911cf5d1f0beebe56e5183991092f43f
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:19 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 715762afbe9f4fc5ea908ee001d78b7711db3469
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 4ef09824a6edd2981de3aec61a9472232fd9e4b7
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:55 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/compile new/xstdcmap-1.0.2/compile
--- old/xstdcmap-X11R7.0-1.0.1/compile 2005-12-21 08:33:40.000000000 +0100
+++ new/xstdcmap-1.0.2/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-#! /bin/sh
-
-# Wrapper for compilers which do not understand `-c -o'.
-
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.
-
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- 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 "$prog" $args
-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.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/config.h.in new/xstdcmap-1.0.2/config.h.in
--- old/xstdcmap-X11R7.0-1.0.1/config.h.in 2005-12-21 08:33:38.000000000 +0100
+++ new/xstdcmap-1.0.2/config.h.in 2010-09-27 03:16:34.000000000 +0200
@@ -1,5 +1,32 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
@@ -15,8 +42,23 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/configure.ac new/xstdcmap-1.0.2/configure.ac
--- old/xstdcmap-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:54.000000000 +0100
+++ new/xstdcmap-1.0.2/configure.ac 2010-09-27 03:15:51.000000000 +0200
@@ -21,22 +21,20 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xstdcmap,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xstdcmap)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xstdcmap], [1.0.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xstdcmap])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(XSTDCMAP, xmu x11)
-AC_SUBST(XSTDCMAP_CFLAGS)
-AC_SUBST(XSTDCMAP_LIBS)
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/COPYING new/xstdcmap-1.0.2/COPYING
--- old/xstdcmap-X11R7.0-1.0.1/COPYING 2005-12-19 17:22:47.000000000 +0100
+++ new/xstdcmap-1.0.2/COPYING 2010-08-07 00:13:27.000000000 +0200
@@ -1,12 +1,21 @@
-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 1989, 1994, 1998 The Open Group
-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. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/INSTALL new/xstdcmap-1.0.2/INSTALL
--- old/xstdcmap-X11R7.0-1.0.1/INSTALL 2005-07-01 22:09:09.000000000 +0200
+++ new/xstdcmap-1.0.2/INSTALL 2010-09-27 03:17:55.000000000 +0200
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/Makefile.am new/xstdcmap-1.0.2/Makefile.am
--- old/xstdcmap-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:26.000000000 +0100
+++ new/xstdcmap-1.0.2/Makefile.am 2010-09-27 03:11:43.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = xstdcmap
-xstdcmap_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE
+AM_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE $(CWARNFLAGS)
xstdcmap_LDADD = $(XSTDCMAP_LIBS)
xstdcmap_SOURCES = \
@@ -36,28 +36,22 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/missing new/xstdcmap-1.0.2/missing
--- old/xstdcmap-X11R7.0-1.0.1/missing 2005-12-21 08:33:40.000000000 +0100
+++ new/xstdcmap-1.0.2/missing 2010-09-27 03:16:34.000000000 +0200
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -14,9 +18,7 @@
# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,42 +105,69 @@
exit 1
;;
- aclocal*)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
- tar)
+ tar*)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +366,11 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xstdcmap-X11R7.0-1.0.1/README new/xstdcmap-1.0.2/README
--- old/xstdcmap-X11R7.0-1.0.1/README 2005-07-01 22:09:09.000000000 +0200
+++ new/xstdcmap-1.0.2/README 2009-10-16 23:40:24.000000000 +0200
@@ -0,0 +1,28 @@
+The xstdcmap utility can be used to selectively define standard colormap
+properties. It is intended to be run from a user's X startup script to
+create standard colormap definitions in order to facilitate sharing of
+scarce colormap resources among clients using PseudoColor visuals.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/app/xstdcmap
+
+ http://cgit.freedesktop.org/xorg/app/xstdcmap
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
++++++ xwininfo-1.0.5.tar.bz2 -> xwininfo-1.1.0.tar.bz2 ++++++
++++ 13961 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org