Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri Sep 24 08:37:12 CEST 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-09-22 09:43:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-24 03:59:03.000000000 +0200
@@ -1,0 +2,25 @@
+Fri Sep 24 03:57:09 CEST 2010 - sndirsch@suse.de
+
+- xauth 1.0.5
+ * This minor maintenance release fixes a couple bugs and
+ includes the usual recent build improvements/janitorial
+ cleanups.
+- xclock 1.0.5
+ * This minor maintenance release of the classic non-shaped
+ window clock fixes a crash on startup on 64-bit architectures
+ and includes the usual set of recent build improvements/
+ janitorial cleanups.
+
+-------------------------------------------------------------------
+Thu Sep 23 05:58:43 CEST 2010 - sndirsch@suse.de
+
+- oclock 1.0.2
+ * This minor maintenance release of the classic shaped-window
+ clock application mainly provides several years worth of
+ accumulated improvements to the build configuration and other
+ janitorial improvements.
+- setxkbmap 1.2.0
+ * This minor feature release adds the -query option to print
+ the current RLMVO layout in use by the X server.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
oclock-X11R7.0-1.0.1.tar.bz2
setxkbmap-1.1.0.tar.bz2
xauth-1.0.4.tar.bz2
xclock-1.0.4.tar.bz2
New:
----
oclock-1.0.2.tar.bz2
setxkbmap-1.2.0.tar.bz2
xauth-1.0.5.tar.bz2
xclock-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.lvpfpN/_old 2010-09-24 08:35:01.000000000 +0200
+++ /var/tmp/diff_new_pack.lvpfpN/_new 2010-09-24 08:35:01.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: 19
+Release: 20
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -47,23 +47,23 @@
Source12: luit-1.0.5.tar.bz2
Source14: mkfontdir-1.0.5.tar.bz2
Source15: mkfontscale-1.0.7.tar.bz2
-Source16: oclock-X11R7.0-1.0.1.tar.bz2
+Source16: oclock-1.0.2.tar.bz2
Source17: proxymngr-X11R7.0-1.0.1.tar.bz2
Source18: rgb-1.0.3.tar.bz2
Source19: rstart-1.0.3.tar.bz2
Source20: scripts-X11R7.0-1.0.1.tar.bz2
Source21: sessreg-1.0.6.tar.bz2
-Source22: setxkbmap-1.1.0.tar.bz2
+Source22: setxkbmap-1.2.0.tar.bz2
Source23: showfont-1.0.2.tar.bz2
Source24: smproxy-1.0.3.tar.bz2
Source25: twm-1.0.4.tar.bz2
Source26: viewres-1.0.2.tar.bz2
Source27: x11perf-1.5.2.tar.bz2
-Source28: xauth-1.0.4.tar.bz2
+Source28: xauth-1.0.5.tar.bz2
Source29: xbiff-1.0.2.tar.bz2
Source30: xcalc-1.0.3.tar.bz2
Source31: xclipboard-1.1.0.tar.bz2
-Source32: xclock-1.0.4.tar.bz2
+Source32: xclock-1.0.5.tar.bz2
Source33: xcmsdb-1.0.2.tar.bz2
Source34: xconsole-1.0.3.tar.bz2
Source35: xcursor-themes-1.0.2.tar.bz2
++++++ oclock-X11R7.0-1.0.1.tar.bz2 -> oclock-1.0.2.tar.bz2 ++++++
++++ 18220 lines of diff (skipped)
++++++ setxkbmap-1.1.0.tar.bz2 -> setxkbmap-1.2.0.tar.bz2 ++++++
++++ 10026 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/setxkbmap-1.1.0/COPYING new/setxkbmap-1.2.0/COPYING
--- old/setxkbmap-1.1.0/COPYING 2009-03-10 00:21:14.000000000 +0100
+++ new/setxkbmap-1.2.0/COPYING 2010-01-14 18:21:50.000000000 +0100
@@ -1,12 +1,22 @@
-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 (c) 1996 by Silicon Graphics Computer Systems, Inc.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff -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/setxkbmap-1.1.0/ChangeLog new/setxkbmap-1.2.0/ChangeLog
--- old/setxkbmap-1.1.0/ChangeLog 2009-07-09 01:18:01.000000000 +0200
+++ new/setxkbmap-1.2.0/ChangeLog 2010-09-23 05:45:00.000000000 +0200
@@ -1,3 +1,168 @@
+commit 12131d9f8a14a62e592f4db9193ed29593511d57
+Author: Alan Coopersmith
+Date: Wed Sep 22 20:44:34 2010 -0700
+
+ setxkbmap 1.2.0
+
+ Signed-off-by: Alan Coopersmith
+
+commit 9c2fe7cf4573a154032c4058d3dda4cc737f5efa
+Author: Alan Coopersmith
+Date: Wed Sep 22 20:40:23 2010 -0700
+
+ config: remove AC_SUBST of CFLAGS & LIBS that PKG_CHECK_MODULES handles
+
+ Signed-off-by: Alan Coopersmith
+
+commit bbbe661b5b111836f9fb8adf9c3c329480008d60
+Author: Alan Coopersmith
+Date: Wed Sep 22 20:39:41 2010 -0700
+
+ config: Remove AC_PROG_CC & AC_PROG_INSTALL that XORG_DEFAULT_OPTIONS provide
+
+ Signed-off-by: Alan Coopersmith
+
+commit d4ed95d3574f8dd562c4af527bf5309d3e50a8d8
+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 2f16193cb1926f1a1257b53e250598d6bb770eb1
+Author: Alan Coopersmith
+Date: Fri Jul 23 13:58:46 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
+ Use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 63327e1aae13e86b840bbbc816cb8cf9661ad4f9
+Author: Gaetan Nadon
+Date: Thu Jan 7 18:03:56 2010 -0500
+
+ COPYING: replace stub with actual copyright notice
+
+ Refer to setxkbmap.c
+ Silicon Graphics Computer Systems, Inc.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 1447b0fe61683dcc6ed72d9e833474501ce2860c
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:52 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 5c85e2069428229d6146681ba22822238c488c4a
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:07 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 be882dbbcac30a347094286f93b8cc2459ed3b9b
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 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 815fdaad442dbafb9b0f6c240486a9b92594b432
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:14 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 86d876cf4baff71f735b3dbe823333f6fd94d8a0
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:19 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit c229a714fc1fcef5d6189d6fae92b9899e8f0495
+Author: Alan Coopersmith
+Date: Thu Oct 8 18:11:56 2009 -0700
+
+ Change default XKB rules file from "xorg" to "base"
+
+ Signed-off-by: Alan Coopersmith
+
+commit 08fa8d42ec875802bbe34291b087abdc559f183e
+Author: Alan Coopersmith
+Date: Thu Oct 8 18:07:43 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith
+
+commit 36288deba168dd2ca94630ffeab69f85461e33f8
+Author: Alan Coopersmith
+Date: Thu Oct 8 16:52:11 2009 -0700
+
+ Add -query option to print current RLMVO settings
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Peter Hutterer
+
+commit 41416fdee30424d78771511bea39eef95f718c2a
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:19 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3a5518589ffb7d24e164dd9616cd1fbb8200f39a
+Author: Alan Coopersmith
+Date: Fri Jul 31 21:02:37 2009 -0700
+
+ Comment typo fix
+
+ Signed-off-by: Alan Coopersmith
+
commit 0f16d3da90c101e653b552dd3810b7c3092cb145
Author: Peter Hutterer
Date: Thu Jul 9 09:10:41 2009 +1000
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/setxkbmap-1.1.0/INSTALL new/setxkbmap-1.2.0/INSTALL
--- old/setxkbmap-1.1.0/INSTALL 2009-03-10 00:21:14.000000000 +0100
+++ new/setxkbmap-1.2.0/INSTALL 2010-09-23 05:45:00.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/setxkbmap-1.1.0/Makefile.am new/setxkbmap-1.2.0/Makefile.am
--- old/setxkbmap-1.1.0/Makefile.am 2009-04-29 03:56:08.000000000 +0200
+++ new/setxkbmap-1.2.0/Makefile.am 2010-07-23 22:57:17.000000000 +0200
@@ -23,8 +23,7 @@
XKBCONFIGROOT=@XKBCONFIGROOT@
-AM_CFLAGS = $(SETXKBMAP_CFLAGS) \
- -D__XKBDEFRULES__='"xorg"' \
+AM_CFLAGS = $(CWARNFLAGS) $(SETXKBMAP_CFLAGS) \
-DDFLT_XKB_CONFIG_ROOT=\"$(XKBCONFIGROOT)\"
setxkbmap_LDADD = $(SETXKBMAP_LIBS)
@@ -38,40 +37,29 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
+dist-hook: ChangeLog INSTALL
-MAN_SUBSTS = \
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+setxkbmap_MAN_SUBSTS = \
-e 's|__xkbconfigroot__|"$(XKBCONFIGROOT)"|' \
- -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'
+ $(MAN_SUBSTS)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(setxkbmap_MAN_SUBSTS) < $< > $@
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
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/setxkbmap-1.1.0/README new/setxkbmap-1.2.0/README
--- old/setxkbmap-1.1.0/README 2009-03-10 00:21:14.000000000 +0100
+++ new/setxkbmap-1.2.0/README 2009-10-16 23:38:34.000000000 +0200
@@ -0,0 +1,27 @@
+setxkbmap is an X11 client to change the keymaps in the X server for a
+specified keyboard to use the layout determined by the options listed
+on the command line.
+
+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/setxkbmap
+
+ http://cgit.freedesktop.org/xorg/app/setxkbmap
+
+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
+
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/setxkbmap-1.1.0/config.h.in new/setxkbmap-1.2.0/config.h.in
--- old/setxkbmap-1.1.0/config.h.in 2009-07-09 01:18:01.000000000 +0200
+++ new/setxkbmap-1.2.0/config.h.in 2010-09-23 05:44:44.000000000 +0200
@@ -42,6 +42,9 @@
/* 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
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/setxkbmap-1.1.0/configure.ac new/setxkbmap-1.2.0/configure.ac
--- old/setxkbmap-1.1.0/configure.ac 2009-07-09 01:10:31.000000000 +0200
+++ new/setxkbmap-1.2.0/configure.ac 2010-09-23 05:44:19.000000000 +0200
@@ -21,21 +21,22 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(setxkbmap,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],setxkbmap)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([setxkbmap],
+ [1.2.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [setxkbmap])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# 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)
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AC_ARG_WITH(xkb-config-root,
AC_HELP_STRING([--with-xkb-config-root=<paths>],
@@ -46,15 +47,8 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(SETXKBMAP, xkbfile x11)
-SETXKBMAP_CFLAGS="$CWARNFLAGS $SETXKBMAP_CFLAGS"
-AC_SUBST(SETXKBMAP_CFLAGS)
-AC_SUBST(SETXKBMAP_LIBS)
# Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
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/setxkbmap-1.1.0/missing new/setxkbmap-1.2.0/missing
--- old/setxkbmap-1.1.0/missing 2009-03-10 00:58:38.000000000 +0100
+++ new/setxkbmap-1.2.0/missing 2010-09-23 05:44:45.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# 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
@@ -18,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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, 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
@@ -89,6 +87,9 @@
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 $?
;;
@@ -106,15 +107,22 @@
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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ 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
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ 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
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ 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
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ 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
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# 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/setxkbmap-1.1.0/setxkbmap.c new/setxkbmap-1.2.0/setxkbmap.c
--- old/setxkbmap-1.1.0/setxkbmap.c 2009-04-29 03:56:08.000000000 +0200
+++ new/setxkbmap-1.2.0/setxkbmap.c 2010-07-23 22:29:54.000000000 +0200
@@ -48,7 +48,7 @@
#define DFLT_XKB_CONFIG_ROOT "/usr/share/X11/xkb"
#endif
#ifndef DFLT_XKB_RULES_FILE
-#define DFLT_XKB_RULES_FILE __XKBDEFRULES__
+#define DFLT_XKB_RULES_FILE "base"
#endif
#ifndef DFLT_XKB_LAYOUT
#define DFLT_XKB_LAYOUT "us"
@@ -85,6 +85,7 @@
/***====================================================================***/
static Bool print = False;
+static Bool query = False;
static Bool synch = False;
static int verbose = 5;
@@ -240,6 +241,7 @@
MSG("-model <name> Specifies model used to choose component names\n");
MSG("-option <name> Adds an option used to choose component names\n");
MSG("-print Print a complete xkb_keymap description and exit\n");
+ MSG("-query Print the current layout settings and exit\n");
MSG("-rules <name> Name of rules file to use\n");
MSG("-symbols <name> Specifies symbols component name\n");
MSG("-synch Synchronize request w/X server\n");
@@ -254,6 +256,8 @@
{
if (wantRules)
{
+ if (svValue[RULES_NDX])
+ MSG1("rules: %s\n", svValue[RULES_NDX]);
if (svValue[MODEL_NDX])
MSG1("model: %s\n", svValue[MODEL_NDX]);
if (svValue[LAYOUT_NDX])
@@ -430,6 +434,8 @@
}
else if (streq(argv[i], "-print"))
print = True;
+ else if (streq(argv[i], "-query"))
+ query = True;
else if (streq(argv[i], "-rules"))
ok = setOptString(&i, argc, argv, RULES_NDX, FROM_CMD_LINE);
else if (streq(argv[i], "-symbols"))
@@ -547,7 +553,7 @@
/***====================================================================***/
/**
- * Retrieve xkb values from th the XKB_RULES_NAMES property and store their
+ * Retrieve xkb values from the XKB_RULES_NAMES property and store their
* contents in svValues.
* If the property cannot be read, the built-in defaults are used.
*
@@ -977,7 +983,7 @@
dumpNames(False, True);
}
/* Upload the new description to the server. */
- if (dpy && !print)
+ if (dpy && !print && !query)
{
XkbComponentNamesRec cmdNames;
cmdNames.types = svValue[TYPES_NDX];
@@ -1008,6 +1014,10 @@
{
printKeymap();
}
+ if (query)
+ {
+ dumpNames(True, False);
+ }
return True;
}
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/setxkbmap-1.1.0/setxkbmap.man new/setxkbmap-1.2.0/setxkbmap.man
--- old/setxkbmap-1.1.0/setxkbmap.man 2009-04-29 03:56:08.000000000 +0200
+++ new/setxkbmap-1.2.0/setxkbmap.man 2009-10-16 23:38:34.000000000 +0200
@@ -80,11 +80,15 @@
argument first.
.TP 8
.B \-print
-With this option the \fBsetxkbmap\fP just prints component names in a format
+With this option \fBsetxkbmap\fP just prints component names in a format
acceptable by \fBxkbcomp\fP (an XKB keymap compiler) and exits. The option
can be used for tests instead of a verbose option and in cases when one needs
to run both the \fBsetxkbmap\fP and the \fBxkbcomp\fP in chain (see below).
.TP 8
+.B \-query
+With this option \fBsetxkbmap\fP just prints the current rules, model,
+layout, variant, and options, then exits.
+.TP 8
.B \-rules \fIfile\fP
Specifies the name of the rules file used to resolve the requested layout
and model to a set of component names.
++++++ xauth-1.0.4.tar.bz2 -> xauth-1.0.5.tar.bz2 ++++++
++++ 10334 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/xauth-1.0.4/ChangeLog new/xauth-1.0.5/ChangeLog
--- old/xauth-1.0.4/ChangeLog 2009-09-22 05:33:23.000000000 +0200
+++ new/xauth-1.0.5/ChangeLog 2010-09-24 02:57:47.000000000 +0200
@@ -1,3 +1,154 @@
+commit da552fc4c69a62b6227383452e56428cd5d696a0
+Author: Alan Coopersmith
+Date: Thu Sep 23 17:57:16 2010 -0700
+
+ xauth 1.0.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit eec190f060cd61b44e0e7029309f7db841c824b8
+Author: Alan Coopersmith
+Date: Thu Sep 23 07:33:02 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 732922acd465f081f8cbd315aa687dd745da2337
+Author: Alan Coopersmith
+Date: Thu Sep 23 07:29:53 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 6eef00c1021930444e09d8334b06bbad83d7f2fb
+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 4f6dea33200af6d42e29b43269d8ee389db1b98f
+Author: Jeremy Huddleston
+Date: Thu Aug 26 08:26:31 2010 -0700
+
+ Fix build failure resulting from previous commit on systems without strlcpy
+
+ Found-by: Tinderbox
+ Signed-off-by: Jeremy Huddleston
+
+commit 135338af9a141d609e07e42208b9104465346ae4
+Author: Jeremy Huddleston
+Date: Wed Aug 25 18:23:26 2010 -0700
+
+ launchd: Properly support launchd sockets in xauth
+
+ What we had in place before was a hack that always used ':0'. This change
+ results in the bundle id being used to differentiate different connections.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 96ea88d3aeae710d8fc04f23151d5b669c5e8a0c
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:52 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 1eb55d8efd568c31e8bc9f1f7ab91558ceecfc06
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:08 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 f326a1fe16f6717fb822228051a7fdfd30048cab
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:24 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 e3a895e81611d881e74fb5106319af513f78df07
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 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 b0f1523247680c9a6045c3a6296bf45d4106de1e
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:15 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 b6c280336a6cf681917692933589d878e9984470
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:20 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston
+
+commit 1c701094169b6e33f7faf21a269e949bf134a326
+Author: Alan Coopersmith
+Date: Fri Oct 9 22:58:52 2009 -0700
+
+ Bug 7051: xauth says creating new authority file even though it does not
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=7051
+
+ Signed-off-by: Alan Coopersmith
+
commit d2d802ea9f882b7b7eac1251309d8141e55f213e
Author: Alan Coopersmith
Date: Mon Sep 21 20:25:09 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-1.0.4/INSTALL new/xauth-1.0.5/INSTALL
--- old/xauth-1.0.4/INSTALL 2006-07-11 04:51:56.000000000 +0200
+++ new/xauth-1.0.5/INSTALL 2010-09-24 02:57:47.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/xauth-1.0.4/Makefile.am new/xauth-1.0.5/Makefile.am
--- old/xauth-1.0.4/Makefile.am 2009-09-22 05:20:30.000000000 +0200
+++ new/xauth-1.0.5/Makefile.am 2010-09-23 16:32:34.000000000 +0200
@@ -38,7 +38,8 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
if LINT
@@ -50,35 +51,19 @@
endif LINT
-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) < $< > $@
+
-MAINTAINERCLEANFILES=ChangeLog
+.PHONY: ChangeLog INSTALL
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+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/xauth-1.0.4/config.h.in new/xauth-1.0.5/config.h.in
--- old/xauth-1.0.4/config.h.in 2009-09-22 05:33:23.000000000 +0200
+++ new/xauth-1.0.5/config.h.in 2010-09-24 02:57:34.000000000 +0200
@@ -30,6 +30,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_STAT_H
@@ -60,6 +63,9 @@
/* 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
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/xauth-1.0.4/configure.ac new/xauth-1.0.5/configure.ac
--- old/xauth-1.0.4/configure.ac 2009-09-22 05:24:22.000000000 +0200
+++ new/xauth-1.0.5/configure.ac 2010-09-24 02:57:01.000000000 +0200
@@ -20,30 +20,30 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xauth],
+ [1.0.5],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xauth])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_WITH_LINT, XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
+# 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
AC_TYPE_SIGNAL
AC_CHECK_HEADERS([net/errno.h])
+AC_CHECK_FUNCS([strlcpy])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
-AC_SUBST(XAUTH_CFLAGS)
-AC_SUBST(XAUTH_LIBS)
# Transport selection macro from xtrans.m4
# Needed to set *CONN defines for gethost.c & parsedpy.c
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/xauth-1.0.4/gethost.c new/xauth-1.0.5/gethost.c
--- old/xauth-1.0.4/gethost.c 2008-03-17 23:25:34.000000000 +0100
+++ new/xauth-1.0.5/gethost.c 2010-09-04 01:04:27.000000000 +0200
@@ -280,7 +280,28 @@
src = buf;
len = strlen (buf);
}
- } else {
+ } else if(prefix == 0 && (strncmp (fulldpyname, "/tmp/launch", 11) == 0)) {
+ /* Use the bundle id (part preceding : in the basename) as our src id */
+ char *c;
+#ifdef HAVE_STRLCPY
+ strlcpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+#else
+ strncpy(buf, strrchr(fulldpyname, '/') + 1, sizeof(buf));
+ buf[sizeof(buf) - 1] = '\0';
+#endif
+
+ c = strchr(buf, ':');
+
+ /* In the legacy case with no bundle id, use the full path */
+ if(c == buf) {
+ src = fulldpyname;
+ } else {
+ *c = '\0';
+ src = buf;
+ }
+
+ len = strlen(src);
+ } else {
src = fulldpyname;
len = prefix;
}
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/xauth-1.0.4/parsedpy.c new/xauth-1.0.5/parsedpy.c
--- old/xauth-1.0.4/parsedpy.c 2006-07-11 04:51:56.000000000 +0200
+++ new/xauth-1.0.5/parsedpy.c 2010-09-04 01:04:27.000000000 +0200
@@ -162,6 +162,9 @@
if (!host) return False;
+ if(strncmp (host, "/tmp/launch", 11) == 0) {
+ family = FamilyLocal;
+ }
/*
* get the display number; we know that there is something after the
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/xauth-1.0.4/process.c new/xauth-1.0.5/process.c
--- old/xauth-1.0.4/process.c 2009-07-27 22:27:33.000000000 +0200
+++ new/xauth-1.0.5/process.c 2010-09-04 01:04:27.000000000 +0200
@@ -485,9 +485,6 @@
if (cp && strncmp (cp, "/unix:", 6) == 0)
prelen = (cp - displayname);
- if (strncmp (displayname, "/tmp/launch", 11) == 0)
- displayname = strrchr(displayname, '/') + 1;
-
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
&family, &host, &dpynum, &scrnum, &rest)) {
return False;
@@ -769,7 +766,7 @@
return -1;
} /* else ignore it */
fprintf (stderr,
- "%s: creating new authority file %s\n",
+ "%s: file %s does not exist\n",
ProgramName, authfilename);
} else {
xauth_existed = True;
++++++ xclock-1.0.4.tar.bz2 -> xclock-1.0.5.tar.bz2 ++++++
++++ 10168 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/xclock-1.0.4/COPYING new/xclock-1.0.5/COPYING
--- old/xclock-1.0.4/COPYING 2009-09-22 06:01:06.000000000 +0200
+++ new/xclock-1.0.5/COPYING 2010-07-02 01:47:26.000000000 +0200
@@ -44,35 +44,23 @@
------------------------------------------------------------
-Copyright 2004 Sun Microsystems, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of Sun Microsystems, Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-This software is provided "AS IS," without a warranty of any kind.
-
-ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
-SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR
-LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE,
-MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES.
-IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
-PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
-THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
-SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+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 AUTHORS OR COPYRIGHT HOLDERS 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.
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/xclock-1.0.4/ChangeLog new/xclock-1.0.5/ChangeLog
--- old/xclock-1.0.4/ChangeLog 2009-09-22 06:05:58.000000000 +0200
+++ new/xclock-1.0.5/ChangeLog 2010-09-24 03:34:58.000000000 +0200
@@ -1,3 +1,160 @@
+commit 97110e50013fc5735c6220f559588b0be9a8b821
+Author: Alan Coopersmith
+Date: Thu Sep 23 18:34:13 2010 -0700
+
+ xclock 1.0.5
+
+ Signed-off-by: Alan Coopersmith
+
+commit 051b0f943db06ee56349dc6a03735f4b4d3f6e0f
+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 b5ce0b4f7e7b36451872df82c37251fc3d860de4
+Author: Jeremy Huddleston
+Date: Thu Aug 26 08:23:41 2010 -0700
+
+ Remove extraneous reference to HAS_STRLCAT
+
+ Signed-off-by: Jeremy Huddleston
+
+commit eefa040512ec291da7cc537774e14d24801b784e
+Author: David Coppa
+Date: Thu Jul 29 21:46:11 2010 +0200
+
+ Fix a crash on sparc64.
+
+ The pid variable that is passed to XChangeProperty() is not a long.
+ The libX11 code deferences the variable as a long and on a 64-bit sparc
+ this must be aligned on a 8-byte boundary.
+
+ Signed-off-by: Matthieu Herrb
+
+ Reviewed-by: Alan Coopersmith
+
+commit ed35a91ebdbe54befb003599364434193d5c8078
+Author: Alan Coopersmith
+Date: Thu Jul 1 16:50:16 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith
+
+commit cd064a06a4d87c1acb890a0b0f2a543c0e90116b
+Author: Alan Coopersmith
+Date: Thu Jul 1 16:46:54 2010 -0700
+
+ Xmu functions are called directly, so include it in PKG_CHECK_MODULES
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7b8ac4d10c8d745750a015ad50e07d5e3ef704fa
+Author: Alan Coopersmith
+Date: Wed Jun 30 23:25:03 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 3f3532422225e23114427ad6f1fbc039e60b64c9
+Author: Alan Coopersmith
+Date: Fri Jan 15 13:05:38 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit bf3695b37628fda8b06fc5363123cf25c77fe76e
+Author: Gaetan Nadon
+Date: Sat Dec 19 20:48:47 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 ee1225481c1c5fe7b6fb9093df5fe4ae9f490e9e
+Author: Gaetan Nadon
+Date: Thu Nov 26 09:19:53 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit baf85e944fbd238586805293025a11f62ee56683
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:08 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 795cd3133fd861d8aa987c76b1227befc641fd17
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:24 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 ff0358b1b151f2f07d6bf4345ef32769dab96365
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:38 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 742033062d0153f8e5dcf1214ac904131a27c2cb
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:15 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 30db8ad3c045a4fbcff171435bb8e56ed792a5ec
+Author: Peter Hutterer
+Date: Mon Sep 28 08:31:17 2009 +1000
+
+ Add INSTALL to .gitignore. (#24157)
+
+ Avoids git error "fatal: Untracked working tree file 'INSTALL' would be
+ overwritten by merge." when switching between pre-1.0.4 and now.
+
+ X.Org Bug 24157 http://bugs.freedesktop.org/show_bug.cgi?id=24157
+
+ Signed-off-by: Peter Hutterer
+
commit 779dd2f2af9a65f96b741c2692d7055bf5970969
Author: Alan Coopersmith
Date: Mon Sep 21 21:05:16 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xclock-1.0.4/Clock.c new/xclock-1.0.5/Clock.c
--- old/xclock-1.0.4/Clock.c 2009-09-22 06:01:06.000000000 +0200
+++ new/xclock-1.0.5/Clock.c 2010-09-04 01:04:42.000000000 +0200
@@ -48,38 +48,28 @@
******************************************************************/
/*
- * Copyright 2004 Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of Sun Microsystems, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any kind.
- *
- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
- * SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES OR
- * LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR RELATING TO USE,
- * MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS DERIVATIVES.
- * IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
- * PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
- * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
- * THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
- * SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
*
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * 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 AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+/*
* Authors: I18N - Steve Swales - March 2000
* bgpixmap - Alan Coopersmith (as part of STSF project) - Sept. 2001
*/
@@ -1523,7 +1513,7 @@
XClearArea (dpy, win,
clear_from, 0, w->core.width - clear_from, w->core.height,
False);
-#if defined(HAS_STRLCAT) || defined(HAVE_STRLCPY)
+#ifdef HAVE_STRLCPY
strlcpy (w->clock.prev_time_string+i, time_ptr+i,
sizeof(w->clock.prev_time_string)-i);
#else
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/xclock-1.0.4/INSTALL new/xclock-1.0.5/INSTALL
--- old/xclock-1.0.4/INSTALL 2009-09-22 06:05:40.000000000 +0200
+++ new/xclock-1.0.5/INSTALL 2010-09-24 03:34:58.000000000 +0200
@@ -2,7 +2,7 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+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.
@@ -159,7 +159,7 @@
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+ ./configure CC="cc -Ae"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
@@ -174,16 +174,6 @@
./configure CC="cc -nodtk"
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
Specifying the System Type
==========================
@@ -199,8 +189,7 @@
where SYSTEM can have one of these forms:
- OS
- KERNEL-OS
+ OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
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/xclock-1.0.4/Makefile.am new/xclock-1.0.5/Makefile.am
--- old/xclock-1.0.4/Makefile.am 2009-09-22 06:01:06.000000000 +0200
+++ new/xclock-1.0.5/Makefile.am 2010-07-02 01:45:43.000000000 +0200
@@ -44,10 +44,10 @@
app-defaults/XClock
EXTRA_DIST = \
- ChangeLog \
clmask.bit \
clock.bit
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(APPDEFAULTFILES)
appmandir = $(APP_MAN_DIR)
@@ -57,35 +57,19 @@
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-MAINTAINERCLEANFILES=ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
-
-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'
+dist-hook: ChangeLog INSTALL
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) < $< > $@
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/xclock-1.0.4/config.h.in new/xclock-1.0.5/config.h.in
--- old/xclock-1.0.4/config.h.in 2009-09-22 06:05:38.000000000 +0200
+++ new/xclock-1.0.5/config.h.in 2010-09-24 03:34:42.000000000 +0200
@@ -51,6 +51,9 @@
/* 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
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/xclock-1.0.4/configure.ac new/xclock-1.0.5/configure.ac
--- old/xclock-1.0.4/configure.ac 2009-09-22 06:04:34.000000000 +0200
+++ new/xclock-1.0.5/configure.ac 2010-09-24 03:33:53.000000000 +0200
@@ -21,21 +21,25 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xclock,[1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xclock)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xclock],
+ [1.0.5],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xclock])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# 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
-XORG_DEFAULT_OPTIONS
AC_CHECK_FUNCS([strlcpy getpid])
@@ -43,10 +47,7 @@
[AC_DEFINE(HAVE_ICONV, 1, [Define to 1 if iconv() is available.])])
dnl Required dependencies
-PKG_CHECK_MODULES(XCLOCK_X11, x11)
-PKG_CHECK_MODULES(XAW, xaw7)
-XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS"
-XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS"
+PKG_CHECK_MODULES(XCLOCK, xaw7 xmu x11)
dnl Optional dependencies
AC_ARG_WITH(xft, AC_HELP_STRING([--with-xft],[Use Xft2 and Xrender for rendering (Default is YES)]),use_xft="$withval",use_xft="try")
@@ -71,7 +72,7 @@
AC_SUBST(XCLOCK_LIBS)
PKG_CHECK_MODULES(APPDEFS, xt)
-xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+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)]),
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/xclock-1.0.4/xclock.c new/xclock-1.0.5/xclock.c
--- old/xclock-1.0.4/xclock.c 2009-09-22 06:01:06.000000000 +0200
+++ new/xclock-1.0.5/xclock.c 2010-08-07 03:39:32.000000000 +0200
@@ -215,7 +215,7 @@
#ifdef HAVE_GETPID
{
- pid_t pid = getpid();
+ unsigned long pid = (unsigned long)getpid();
XChangeProperty(XtDisplay(toplevel), XtWindow(toplevel),
XInternAtom(XtDisplay(toplevel), "_NET_WM_PID", False),
XA_CARDINAL, 32, PropModeReplace,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org