Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri Sep 24 11:28:04 CEST 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-09-24 03:59:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-09-24 09:04:36.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Sep 24 06:55:04 UTC 2010 - sndirsch@novell.com
+
+- xcmsdb 1.0.3
+ * This minor maintenance release provides only corrections to
+ the COPYING notice and the usual round of recent build
+ improvements & janitorial cleanups.
+- xconsole 1.0.4
+ * This minor maintenance release includes several years of build
+ improvements and janitorial fixes, including support for
+ building without libXaw8 macros.
+ * obsoletes xconsole-no-stropts.patch
+- xcursorgen 1.0.4
+ * This minor maintenance release allows building with libpng 1.4
+ & later, and includes the usual round of recent build
+ improvements & janitorial cleanups.
+ * obsoletes xcursorgen-libpng.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xcmsdb-1.0.2.tar.bz2
xconsole-1.0.3.tar.bz2
xconsole-no-stropts.patch
xcursorgen-1.0.3.tar.bz2
xcursorgen-libpng.diff
New:
----
xcmsdb-1.0.3.tar.bz2
xconsole-1.0.4.tar.bz2
xcursorgen-1.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.ypiXBt/_old 2010-09-24 11:27:30.000000000 +0200
+++ /var/tmp/diff_new_pack.ypiXBt/_new 2010-09-24 11:27:30.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: 20
+Release: 21
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -64,10 +64,10 @@
Source30: xcalc-1.0.3.tar.bz2
Source31: xclipboard-1.1.0.tar.bz2
Source32: xclock-1.0.5.tar.bz2
-Source33: xcmsdb-1.0.2.tar.bz2
-Source34: xconsole-1.0.3.tar.bz2
+Source33: xcmsdb-1.0.3.tar.bz2
+Source34: xconsole-1.0.4.tar.bz2
Source35: xcursor-themes-1.0.2.tar.bz2
-Source36: xcursorgen-1.0.3.tar.bz2
+Source36: xcursorgen-1.0.4.tar.bz2
Source37: xdbedizzy-1.0.2.tar.bz2
Source38: xditview-1.0.2.tar.bz2
Source39: xdm-1.1.10.tar.bz2
@@ -148,10 +148,8 @@
Patch46: xfd.diff
Patch47: xfs-no_config_file.diff
Patch48: mkfontscale-skip_symlinks.diff
-Patch53: xconsole-no-stropts.patch
Patch54: xinit-client-session.patch
Patch56: xdm-consolekit.diff
-Patch59: xcursorgen-libpng.diff
Patch61: twm-sig11.diff
Patch62: twm-suse.diff
Patch63: xauth-tolerant-hostname-changes.diff
@@ -264,9 +262,6 @@
pushd xfd-*
%patch46
popd
-pushd xconsole-*
-%patch53 -p1
-popd
pushd xinit-*
%patch54 -p1
popd
@@ -274,7 +269,6 @@
patch -d xfs-* -p0 -s < %PATCH47
patch -d mkfontscale-* -p1 -s < %PATCH48
patch -d xdm-* -p1 -s < %PATCH56
-patch -d xcursorgen-* -p1 -s < %PATCH59
patch -d twm-* -p1 -s < %PATCH61
patch -d twm-* -p1 -s < %PATCH62
patch -d xauth-* -p1 -s < %PATCH63
++++++ xcmsdb-1.0.2.tar.bz2 -> xcmsdb-1.0.3.tar.bz2 ++++++
++++ 8571 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/xcmsdb-1.0.2/COPYING new/xcmsdb-1.0.3/COPYING
--- old/xcmsdb-1.0.2/COPYING 2006-07-11 04:52:09.000000000 +0200
+++ new/xcmsdb-1.0.3/COPYING 2010-08-06 17:42:21.000000000 +0200
@@ -1,12 +1,43 @@
-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.
+(c) Copyright 1990 Tektronix Inc.
+ All Rights Reserved
-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 Tektronix not be used
+in advertising or publicity pertaining to distribution of the software
+without specific, written prior permission.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+Tektronix disclaims all warranties with regard to this software, including
+all implied warranties of merchantability and fitness, in no event shall
+Tektronix 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.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 1993, 1998 The Open Group
+
+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.
+
+The above copyright notice and this permission notice 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 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.
+
+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
+dealing in this Software without prior written authorization from the
+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/xcmsdb-1.0.2/ChangeLog new/xcmsdb-1.0.3/ChangeLog
--- old/xcmsdb-1.0.2/ChangeLog 2009-10-15 08:17:40.000000000 +0200
+++ new/xcmsdb-1.0.3/ChangeLog 2010-09-24 04:04:46.000000000 +0200
@@ -1,3 +1,108 @@
+commit b9ddf66b520bfadb3ce65e7d988474e2acfd6048
+Author: Alan Coopersmith
+Date: Thu Sep 23 19:03:34 2010 -0700
+
+ xcmsdb 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit d279151713bd7f3023ebd24494a8021c7f9b896b
+Author: Alan Coopersmith
+Date: Thu Sep 23 18:58:16 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 0f3e8ddb7ba7b0cd0b07f16a41f38dec47a25f27
+Author: Alan Coopersmith
+Date: Thu Sep 23 18:57:04 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.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 4d06455d3b31d1d721805526c4a05f143f7d92ef
+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 68ca4762f91601feb8369a54234e2957ca1f9a48
+Author: Alan Coopersmith
+Date: Fri Aug 6 08:42:45 2010 -0700
+
+ Add Open Group notice to COPYING for man page
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8d26b362b4172d3e5cc1760d051f480bf9932be5
+Author: Gaetan Nadon
+Date: Thu Jan 7 21:31:03 2010 -0500
+
+ COPYING: replace stub with actual copyright notice
+
+ Refer to xcmsdb.c
+ Copyright 1990 Tektronix Inc.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 50dfd44f0c1f9e66d8378298580a32d01a3e5fce
+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 6038a8d561337d2fd275135dfadb26aa691024e6
+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 a0d137251dec348557a33e758f40419955f674ad
+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 537a1fdd08991d82f0e6e8e52f2fa80672abbb8d
+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 0929f650a140ff25ac7f3e337e2784891f851ca4
Author: Alan Coopersmith
Date: Wed Oct 14 23:16:12 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/xcmsdb-1.0.2/INSTALL new/xcmsdb-1.0.3/INSTALL
--- old/xcmsdb-1.0.2/INSTALL 2006-07-11 04:52:09.000000000 +0200
+++ new/xcmsdb-1.0.3/INSTALL 2010-09-24 04:04:46.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/xcmsdb-1.0.2/Makefile.am new/xcmsdb-1.0.3/Makefile.am
--- old/xcmsdb-1.0.2/Makefile.am 2009-10-15 07:56:51.000000000 +0200
+++ new/xcmsdb-1.0.3/Makefile.am 2010-09-24 03:56:16.000000000 +0200
@@ -39,38 +39,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):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+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/xcmsdb-1.0.2/config.h.in new/xcmsdb-1.0.3/config.h.in
--- old/xcmsdb-1.0.2/config.h.in 2009-10-15 08:17:21.000000000 +0200
+++ new/xcmsdb-1.0.3/config.h.in 2010-09-24 04:04:11.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/xcmsdb-1.0.2/configure.ac new/xcmsdb-1.0.3/configure.ac
--- old/xcmsdb-1.0.2/configure.ac 2009-10-15 08:16:02.000000000 +0200
+++ new/xcmsdb-1.0.3/configure.ac 2010-09-24 04:03:23.000000000 +0200
@@ -21,26 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xcmsdb,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xcmsdb)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xcmsdb],
+ [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xcmsdb])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: 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)
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCMSDB, x11)
-AC_SUBST(XCMSDB_CFLAGS)
-AC_SUBST(XCMSDB_LIBS)
AC_OUTPUT([Makefile])
++++++ xconsole-1.0.3.tar.bz2 -> xconsole-1.0.4.tar.bz2 ++++++
++++ 14477 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/xconsole-1.0.3/COPYING new/xconsole-1.0.4/COPYING
--- old/xconsole-1.0.3/COPYING 2006-07-11 04:52:12.000000000 +0200
+++ new/xconsole-1.0.4/COPYING 2010-08-06 17:47:35.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 1990, 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/xconsole-1.0.3/ChangeLog new/xconsole-1.0.4/ChangeLog
--- old/xconsole-1.0.3/ChangeLog 2007-08-21 04:00:17.000000000 +0200
+++ new/xconsole-1.0.4/ChangeLog 2010-09-24 04:32:20.000000000 +0200
@@ -1,126 +1,299 @@
+commit d71b95d96588e1ca020fa15db6ceb3050d41bbdc
+Author: Alan Coopersmith
+Date: Thu Sep 23 19:31:52 2010 -0700
+
+ xconsole 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7507dea14fdc259d50dd1e2693d4f3cd5235eeb4
+Author: Alan Coopersmith
+Date: Thu Sep 23 19:28:30 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+
+ Signed-off-by: Alan Coopersmith
+
+commit 49bc4d3002ede196319bfc2829dda169c706e300
+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 53fdc18e1723eb42596ad72ccd0e84ebfbd0a0e4
+Author: Alan Coopersmith
+Date: Fri Aug 6 08:47:48 2010 -0700
+
+ Fill in COPYING file with copyright notices from source code
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3105c7119df08bab8d1668997c6b332ba5ff732c
+Author: Alan Coopersmith
+Date: Thu Jul 1 17:05:25 2010 -0700
+
+ Xmu functions are called directly, so include it in PKG_CHECK_MODULES
+
+ Signed-off-by: Alan Coopersmith
+
+commit ee142aaa65ef5a96b205110b8fa7dc5f9fe4fc20
+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 fee6d15b7cc5f1fad77fed4988bd856399e5750a
+Author: Gaetan Nadon
+Date: Thu Feb 11 10:08:06 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 45fd4b1fa6f81acd33d183b00b060a69087da194
+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 89dbe10377a39ee7001d1c34ce8f01aa209bb376
+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 11cd7489b6f96f194171be418bf9112b5f1cbc1d
+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 fe30cb2c210cf51b239505deaac63593a0ab53f9
+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 41d1f93ec0cfd8754d3c6f81bb4cb113328291cd
+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 099fc3d0dd7b769693bf1bce70112e1e13fe5336
+Author: Alan Coopersmith
+Date: Thu Oct 1 14:54:21 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith
+
+commit 3254ca74de650838e46a551e7c567a79fd971503
+Author: Alan Coopersmith
+Date: Mon Aug 3 16:26:13 2009 -0700
+
+ Remove errant #error I_PUSH from SVR4 code path
+
+ Signed-off-by: Alan Coopersmith
+
+commit 58c8fc6828c07867955882f9126b116edc2036d2
+Author: Matthieu Herrb
+Date: Sat Jul 25 14:08:41 2009 +1000
+
+ Prevent inclusion of stropts.h on Linux.
+
+ Systems like Linux/glibc that have openpty() will not mess around with SVR4
+ like stream modules, so no need to include streams related headers.
+
+ Signed-off-by: Peter Hutterer
+
+commit acc7c587322e2f1952900ad554061c5a8d08f7c3
+Author: Paulo Cesar Pereira de Andrade
+Date: Mon Jan 19 20:16:40 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit 5b3da5679d78ac025358ba0e4beb35e8a9cacd5c
+Author: Julien Cristau
+Date: Sun Nov 16 21:25:33 2008 +0100
+
+ Fix header inclusion for openpty()
+
+ AC_CHECK_HEADERS(foo.h) defines HAVE_FOO_H, not HAS_FOO_H.
+ This fixes a compiler warning:
+ xconsole.c:839: warning: implicit declaration of function 'openpty'
+
+commit 9f690af8ed736ffcae0f0e3771bbc4ab851f8202
+Author: James Cloos
+Date: Wed Aug 20 10:32:50 2008 -0400
+
+ xaw8 is gone, use xaw7
+
+commit 0ac48669dfcfd2760eaab31c934ff0b83ff2dd2c
+Author: Julien Cristau
+Date: Fri May 16 14:24:55 2008 +0200
+
+ $(builddir) is the current directory
+
+ Apparently automake doesn't always export the builddir variable.
+ This fixes my previous commit.
+
+commit 6e305f9cdfaffd87f1852a1c24271b10b0bd5079
+Author: Julien Cristau
+Date: Sun Apr 20 19:48:09 2008 +0200
+
+ Fix build with builddir != srcdir
+
+commit e321bfbe9970a89d486437ed5eedcd83a10a749e
+Author: Jeremy Huddleston
+Date: Thu Mar 27 20:07:41 2008 -0700
+
+ Build fix for file systems that are not case sensitive
+
+commit 2f9d3842be3d5d58270e54821552735cdb098075
+Merge: d5ffc49... cda9968...
+Author: James Cloos
+Date: Mon Sep 3 05:59:57 2007 -0400
+
+ Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/app/xconsole
+
+commit d5ffc49536871784f269ba938566fa77733b16e3
+Author: James Cloos
+Date: Mon Sep 3 05:51:18 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
commit cda9968cea772dbc94b50d791a5be62203ae9ddf
Author: Alan Coopersmith
Date: Mon Aug 20 18:58:33 2007 -0700
Version bump: 1.0.3
-configure.ac
-
commit 9eee6c49bd6f57d51c517a6703cac2f29732231a
Author: Alan Coopersmith
Date: Mon Aug 20 18:54:22 2007 -0700
Add *~ to .gitignore to skip patch/emacs droppings
-.gitignore
-
commit d1e90da451da71d7d362236c5709d9931ab7b9d1
Author: Alan Coopersmith
Date: Mon Aug 20 18:53:41 2007 -0700
Replace xconsole_CFLAGS with AM_CFLAGS to make automake-1.10 happier
-Makefile.am
-
commit 3d4f2f96fc661095ce615928e6b586784f5d35e5
Author: Matthieu Herrb
Date: Sun Jul 30 18:42:08 2006 +0200
Check if openpty() is available and use it if it is.
-configure.ac
-xconsole.c
-
commit 5bdbbecf51e3a73c6660498f8598f0731b43a703
Author: Matthieu Herrb
Date: Sun Jul 30 16:31:03 2006 +0200
Remove ChangeLog, replace with a rule that generates it using git-log
-ChangeLog
-Makefile.am
-
commit c8a026e7c8457cd726f8f6fbd74ade325a9f486e
Author: Matthieu Herrb
Date: Sun Jul 30 16:29:10 2006 +0200
rename .cvsignore -> .gitignore
-.cvsignore
-.gitignore
-
commit 86e5d9ca5836d4ad02faa1a5f9c0db239464bde1
Author: Adam Jackson
Date: Wed Apr 26 23:38:08 2006 +0000
Bump to 1.0.2
-ChangeLog
-configure.ac
-
commit 219ef4e86f05e7a473e399c5188efdb7f16f31f1
Author: Matthieu Herrb
Date: Sat Mar 18 18:31:08 2006 +0000
Avoid potential underflow if read() returns -1. Coverity CID 414
-ChangeLog
-xconsole.c
-
commit 950d308b3230e7e89d307fd95abb983e44987665
Author: Kevin E Martin
Date: Wed Dec 21 02:29:49 2005 +0000
Update package version for X11R7 release.
-ChangeLog
-configure.ac
-
commit f3755877004e49e96f26b120e0716f6673dc738b
Author: Adam Jackson
Date: Mon Dec 19 16:22:42 2005 +0000
Stub COPYING files
-COPYING
-
commit a87b4d1f07448fde9b4f7ecad965210a339caaa5
Author: Kevin E Martin
Date: Thu Dec 15 00:24:05 2005 +0000
Update package version number for final X11R7 release candidate.
-ChangeLog
-configure.ac
-
commit d82f94100bd454d3298c6548173827a67cb4d7ad
Author: Kevin E Martin
Date: Wed Dec 7 16:17:59 2005 +0000
Change to use the app-defaults default dir configured in libXt.
-ChangeLog
-Makefile.am
-configure.ac
-
commit c681eac9a17d8d3f16efa2a992b02972cfa71926
Author: Kevin E Martin
Date: Tue Dec 6 22:48:20 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-ChangeLog
-Makefile.am
-
commit 406fdcbe2e0b7f6af37c6d6965f85adfa8bb3aa6
Author: Kevin E Martin
Date: Sat Dec 3 05:49:18 2005 +0000
Update package version number for X11R7 RC3 release.
-ChangeLog
-configure.ac
-
commit 81d992f635798580d71fc79abf9df2a825f125e0
Author: Alan Coopersmith
Date: Mon Nov 28 22:01:40 2005 +0000
@@ -128,50 +301,36 @@
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)
-Makefile.am
-
commit 61eac81e62e1b9b141ce7aaf3fd778ad1f9d7924
Author: Eric Anholt
Date: Mon Nov 21 10:34:59 2005 +0000
Another pass at .cvsignores for apps.
-.cvsignore
-
commit 68ea4cb352cc528736914c7d328df024164e0e60
Author: Eric Anholt
Date: Sun Nov 20 22:08:51 2005 +0000
Add/improve .cvsignore files for apps.
-.cvsignore
-
commit 630bdf36e17b8f125f8aa0cabf41c75e650ac973
Author: Kevin E Martin
Date: Wed Nov 9 21:09:20 2005 +0000
Update package version number for X11R7 RC2 release.
-ChangeLog
-configure.ac
-
commit 31dbed9163fd4384dc5dc81f426ce82176587dd2
Author: Kean Johnson
Date: Tue Nov 8 06:33:31 2005 +0000
See ChangeLog entry 2005-11-07 for details.
-xconsole.c
-
commit 0710398b397c5f8b09b6216bd18e84337fb4efdb
Author: Kevin E Martin
Date: Wed Oct 19 02:47:52 2005 +0000
Update package version number for RC1 release.
-ChangeLog
-configure.ac
-
commit 34924fc44be47d2d58c701485b4e1b6fad28c21d
Author: Alan Coopersmith
Date: Tue Oct 18 00:32:55 2005 +0000
@@ -180,8 +339,6 @@
$(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
the monolith & allow localization
-Makefile.am
-
commit 324e3c08212f7dbe8b08f7d9028f2e775cbc73c1
Author: Alan Coopersmith
Date: Mon Oct 17 23:56:21 2005 +0000
@@ -189,17 +346,12 @@
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
-Makefile.am
-
commit ad9813ed3ad1d8adb562ac9b279c18753249786f
Author: Alan Coopersmith
Date: Fri Oct 14 00:25:43 2005 +0000
Use sed to fill in variables in man page
-Makefile.am
-configure.ac
-
commit f8ca981b964aaa3c59eab661ce35efb7d7085020
Author: Alan Coopersmith
Date: Wed Aug 17 21:03:23 2005 +0000
@@ -207,8 +359,6 @@
Bugzilla #4130 https://bugs.freedesktop.org/show_bug.cgi?id=4130
xconsole: non-ascii characters don't show up (Samuel Thibault)
-xconsole.c
-
commit 05a718f11fc97f1e34cf927fd8762f8251356dcb
Author: Alan Coopersmith
Date: Mon Aug 1 20:25:29 2005 +0000
@@ -216,8 +366,6 @@
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
-Makefile.am
-
commit c0ecb99582a714c95282f1187c0f39acee640779
Author: Kevin E Martin
Date: Fri Jul 29 21:22:31 2005 +0000
@@ -232,24 +380,18 @@
- Update build script to build macros first
- Update modular Xorg version
-configure.ac
-
commit b23b1f35930ed0d10fef42a23f88a2dacd29d91c
Author: Daniel Stone
Date: Wed Jul 27 00:15:46 2005 +0000
Fix xconsole build break on AIX caused by removal of ptyx defines.
-xconsole.c
-
commit b471e2609662c2ec83d26ee32a7900e528f67f75
Author: Alan Coopersmith
Date: Tue Jul 26 15:44:02 2005 +0000
Replace more GNU make-ism's with more portable macros
-Makefile.am
-
commit e656ddba66cda7432279cd10ac5a450e8b2c342c
Author: Adam Jackson
Date: Wed Jul 20 19:31:52 2005 +0000
@@ -257,17 +399,12 @@
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.
-Makefile.am
-configure.ac
-
commit 171e31464fc9d4f39403931b1126c3e2cf52b84e
Author: Matthieu Herrb
Date: Sun Jul 17 21:11:32 2005 +0000
fix rules to work with non-GNU make.
-Makefile.am
-
commit 6fa7b824f077a0c04eb678c8736cda077232a084
Author: Søren Sandmann Pedersen
Date: Thu Jul 7 23:08:22 2005 +0000
@@ -275,17 +412,6 @@
- Build system for xconsole
- Remove include of "../xterm/ptyx" from xc/programs/xconsole/xconsole.c
-AUTHORS
-COPYING
-ChangeLog
-INSTALL
-Makefile.am
-NEWS
-README
-autogen.sh
-configure.ac
-xconsole.c
-
commit b38b9a7731430359f10ba74706fc6d4c786d2d36
Author: Egbert Eich
Date: Mon Oct 18 14:21:46 2004 +0000
@@ -319,76 +445,48 @@
Added 'pic' to the man page rendering command pipeline (Werner Fink).
Added missing return value (Stefan Dirsch, Roland Mainz)
-xconsole.c
-
commit 7da0d180d6852916e5dca44842ee88e7d8429e6e
Author: Egbert Eich
Date: Fri Apr 23 19:54:41 2004 +0000
Merging XORG-CURRENT into trunk
-XConsole.ad
-xconsole.c
-xconsole.man
-
commit 0b03eedd1839ec360b2bb7c0b4b9592cd53cfda5
Author: Egbert Eich
Date: Sun Mar 14 08:35:01 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
-XConsole.ad
-xconsole.c
-xconsole.man
-
commit 2ec4fa572aba38d9e01205a2b440f6fcf29b796e
Author: Egbert Eich
Date: Wed Mar 3 12:12:55 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
-XConsole.ad
-xconsole.c
-xconsole.man
-
commit 798ad4a31ca485e2b04a2a623b1fc96f3860d11f
Author: Egbert Eich
Date: Thu Feb 26 13:36:16 2004 +0000
readding XFree86's cvs IDs
-XConsole.ad
-xconsole.c
-xconsole.man
-
commit 297a4fba84512347e1f65d5c9eca649c24271067
Author: Egbert Eich
Date: Thu Feb 26 09:23:58 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
-XConsole.ad
-xconsole.c
-xconsole.man
-
commit b53d3aeeedd692ef010a3ec5961079aee7d47fb3
Author: Kaleb Keithley
Date: Tue Nov 25 19:29:03 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
-xconsole.c
-
commit 2b2c62b3be8dd36d3231a2ad18d8b212e81695d1
Author: Kaleb Keithley
Date: Fri Nov 14 16:48:58 2003 +0000
XFree86 4.3.0.1
-XConsole.ad
-xconsole.c
-xconsole.man
-
commit 593922e4e9e9bdcb9bd2b66493b91023d8f0984b
Author: Kaleb Keithley
Date: Fri Nov 14 15:54:53 2003 +0000
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/xconsole-1.0.3/INSTALL new/xconsole-1.0.4/INSTALL
--- old/xconsole-1.0.3/INSTALL 2006-07-11 04:52:12.000000000 +0200
+++ new/xconsole-1.0.4/INSTALL 2010-09-24 04:32:20.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/xconsole-1.0.3/Makefile.am new/xconsole-1.0.4/Makefile.am
--- old/xconsole-1.0.3/Makefile.am 2007-08-21 03:52:44.000000000 +0200
+++ new/xconsole-1.0.4/Makefile.am 2010-07-02 02:02:49.000000000 +0200
@@ -21,7 +21,7 @@
bin_PROGRAMS = xconsole
-AM_CFLAGS = $(XCONSOLE_CFLAGS)
+AM_CFLAGS = $(XCONSOLE_CFLAGS) $(CWARNFLAGS)
xconsole_LDADD = $(XCONSOLE_LIBS)
xconsole_SOURCES = \
@@ -30,60 +30,35 @@
appman_PRE = \
xconsole.man
-# App default files (*.ad)
+# App default files
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
appdefaultdir = @appdefaultdir@
-
-APPDEFAULTFILES = \
- XConsole
-
-SUFFIXES = .ad
-
-.ad:
- cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
-
-CLEANFILES = $(APPDEFAULTFILES)
+dist_appdefault_DATA = \
+ app-defaults/XConsole
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
-
-SED = sed
+EXTRA_DIST = $(appman_PRE)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
-# 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
+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
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
- GIT_DIR=${srcdir}/.git git-log --name-only > 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/xconsole-1.0.3/README new/xconsole-1.0.4/README
--- old/xconsole-1.0.3/README 2006-07-11 04:52:12.000000000 +0200
+++ new/xconsole-1.0.4/README 2009-10-16 23:38:53.000000000 +0200
@@ -0,0 +1,26 @@
+xconsole displays in a X11 window the messages which are usually sent
+to /dev/console
+
+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/xconsole
+
+ http://cgit.freedesktop.org/xorg/app/xconsole
+
+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/xconsole-1.0.3/XConsole.ad new/xconsole-1.0.4/XConsole.ad
--- old/xconsole-1.0.3/XConsole.ad 2006-07-11 04:52:12.000000000 +0200
+++ new/xconsole-1.0.4/XConsole.ad 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-! $Xorg: XConsole.ad,v 1.3 2000/08/17 19:54:13 cpqbld Exp $
-!
-!
-!
-!
-! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.2 2000/03/31 22:55:55 dawes Exp $
-
-*allowShellResize: true
-XConsole.translations: #override\
- <MapNotify>: Deiconified() \n\
- <UnmapNotify>: Iconified() \n\
- <Message>WM_PROTOCOLS: Quit()
-XConsole.baseTranslations: #override\
- <MapNotify>: Deiconified() \n\
- <UnmapNotify>: Iconified() \n\
- <Message>WM_PROTOCOLS: Quit()
-*text.translations: #override\
- Ctrl<KeyPress>C: Clear() \n\
- <KeyPress>Clear: Clear()
-*text.baseTranslations: #override\
- Ctrl<KeyPress>C: Clear() \n\
- <KeyPress>Clear: Clear()
-*text.scrollVertical: Always
-*text.scrollHorizontal: Never
-*text.width: 400
-*text.height: 70
-*text.allowResize: true
-*editType: read
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/xconsole-1.0.3/app-defaults/XConsole new/xconsole-1.0.4/app-defaults/XConsole
--- old/xconsole-1.0.3/app-defaults/XConsole 1970-01-01 01:00:00.000000000 +0100
+++ new/xconsole-1.0.4/app-defaults/XConsole 2009-10-16 23:38:53.000000000 +0200
@@ -0,0 +1,28 @@
+! $Xorg: XConsole.ad,v 1.3 2000/08/17 19:54:13 cpqbld Exp $
+!
+!
+!
+!
+! $XFree86: xc/programs/xconsole/XConsole.ad,v 1.2 2000/03/31 22:55:55 dawes Exp $
+
+*allowShellResize: true
+XConsole.translations: #override\
+ <MapNotify>: Deiconified() \n\
+ <UnmapNotify>: Iconified() \n\
+ <Message>WM_PROTOCOLS: Quit()
+XConsole.baseTranslations: #override\
+ <MapNotify>: Deiconified() \n\
+ <UnmapNotify>: Iconified() \n\
+ <Message>WM_PROTOCOLS: Quit()
+*text.translations: #override\
+ Ctrl<KeyPress>C: Clear() \n\
+ <KeyPress>Clear: Clear()
+*text.baseTranslations: #override\
+ Ctrl<KeyPress>C: Clear() \n\
+ <KeyPress>Clear: Clear()
+*text.scrollVertical: Always
+*text.scrollHorizontal: Never
+*text.width: 400
+*text.height: 70
+*text.allowResize: true
+*editType: read
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/xconsole-1.0.3/config.h.in new/xconsole-1.0.4/config.h.in
--- old/xconsole-1.0.3/config.h.in 2007-08-21 04:00:11.000000000 +0200
+++ new/xconsole-1.0.4/config.h.in 2010-09-24 04:32:08.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/xconsole-1.0.3/configure.ac new/xconsole-1.0.4/configure.ac
--- old/xconsole-1.0.3/configure.ac 2007-08-21 03:58:15.000000000 +0200
+++ new/xconsole-1.0.4/configure.ac 2010-09-24 04:30:42.000000000 +0200
@@ -21,23 +21,31 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xconsole,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xconsole)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xconsole],
+ [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xconsole])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+# 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_PROG_CC
-AC_PROG_INSTALL
+AM_CONFIG_HEADER(config.h)
# Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(XCONSOLE)
-AC_SUBST(XCONSOLE_CFLAGS)
-AC_SUBST(XCONSOLE_LIBS)
+PKG_CHECK_MODULES(XCONSOLE, xaw7 xmu xt x11)
PKG_CHECK_MODULES(APPDEFS, 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)]),
+ [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
AC_SUBST(appdefaultdir)
AC_SEARCH_LIBS(openpty, [util])
@@ -48,7 +56,5 @@
AC_CHECK_HEADERS([util.h pty.h], [break])
fi
-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/xconsole-1.0.3/missing new/xconsole-1.0.4/missing
--- old/xconsole-1.0.3/missing 2007-08-21 04:00:12.000000000 +0200
+++ new/xconsole-1.0.4/missing 2010-09-24 04:32:09.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/xconsole-1.0.3/xconsole.c new/xconsole-1.0.4/xconsole.c
--- old/xconsole-1.0.3/xconsole.c 2006-08-21 22:31:38.000000000 +0200
+++ new/xconsole-1.0.4/xconsole.c 2009-10-16 23:38:53.000000000 +0200
@@ -66,10 +66,10 @@
#include
#include
#ifdef HAS_OPENPTY
-# ifdef HAS_UTIL_H
+# ifdef HAVE_UTIL_H
# include
# endif
-# ifdef HAS_PTY_H
+# ifdef HAVE_PTY_H
# include
# endif
#endif
@@ -182,7 +182,9 @@
# endif
# if defined (SVR4) || defined (USE_PTS)
# include
+# ifndef HAS_OPENPTY
# include /* for I_PUSH */
+# endif
# ifdef sun
# include
# endif
++++++ xcursorgen-1.0.3.tar.bz2 -> xcursorgen-1.0.4.tar.bz2 ++++++
++++ 8516 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/xcursorgen-1.0.3/ChangeLog new/xcursorgen-1.0.4/ChangeLog
--- old/xcursorgen-1.0.3/ChangeLog 2009-10-17 02:42:49.000000000 +0200
+++ new/xcursorgen-1.0.4/ChangeLog 2010-09-24 04:41:41.000000000 +0200
@@ -1,3 +1,116 @@
+commit bd5c027d923351ea8ef541a6d5092ba9e8661f6c
+Author: Alan Coopersmith
+Date: Thu Sep 23 19:41:07 2010 -0700
+
+ xcursorgen 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit b848ae7bbd9d328fa8115707153a92414b302753
+Author: Alan Coopersmith
+Date: Thu Sep 23 19:38:42 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 4768df2f3051a92dc351a4072d2232ffd9304eb0
+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 be56a72e4afc0ba6599fb862f2b527fa49afbf82
+Author: Yaakov Selkowitz
+Date: Sun Aug 8 21:45:54 2010 -0500
+
+ Use AC_PROG_SED and MAN_SUBSTS in macros-1.8
+
+ Tested-by: Gaetan Nadon
+ Signed-off-by: Yaakov Selkowitz
+
+commit 0aa3f45edaddd3deef9845ed290518ebb91e22c0
+Author: Yaakov Selkowitz
+Date: Sun Aug 8 21:45:53 2010 -0500
+
+ Remove INSTALL from git
+
+ The INSTALL file is added to the tarball by XORG_INSTALL.
+
+ Tested-by: Gaetan Nadon
+ Signed-off-by: Yaakov Selkowitz
+
+commit 9e7c41e0e16183110cd7b28d012a0bb69aed4655
+Author: Cody Maloney
+Date: Sun Mar 14 00:07:23 2010 -0800
+
+ Upgraded to work with libpng14
+
+ setjmp(png_ptr->jmpbuf) is depreceated so removed it and changed the
+ configure.ac version number to accept libpng12 or libpng14
+
+ Signed-off-by: Cody Maloney
+ Tested-by: Yaakov Selkowitz
+ Signed-off-by: Alan Coopersmith
+
+commit 194d9a4353dbf0b4c1d2895e60966bbc4429c54d
+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 a8cd9706d08c02a947db00f391dc753a7d8167e0
+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 763593472fd31103f63afa90d4405643d90fc79e
+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 821f55410152bfa8b7e8e3c9ee809e1835db9e2f
+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 db68e86e2d2d058e178598a46f6237f9762e4fd3
+Author: Gaetan Nadon
+Date: Sun Sep 27 16:02:01 2009 -0400
+
+ Makefile.am: do not include autogen.sh in distribution #24183
+
+ This is a private build script that should not be distributed
+
commit 32dc0bbbd067bfe27f506a510da3c5344964ee23
Author: Alan Coopersmith
Date: Fri Oct 16 17:41:51 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/xcursorgen-1.0.3/INSTALL new/xcursorgen-1.0.4/INSTALL
--- old/xcursorgen-1.0.3/INSTALL 2006-07-11 04:52:15.000000000 +0200
+++ new/xcursorgen-1.0.4/INSTALL 2010-09-24 04:41:41.000000000 +0200
@@ -1,16 +1,19 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+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
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+ 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
@@ -23,9 +26,9 @@
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
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+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
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`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. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ 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.
@@ -67,51 +67,66 @@
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.
+ 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=c89 CFLAGS=-O2 LIBS=-lposix
+ ./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
+ 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 must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+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 `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have 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.
+ 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' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+ 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
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+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
@@ -125,7 +140,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ 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
@@ -137,14 +152,36 @@
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
+ 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:
@@ -159,7 +196,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+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
@@ -170,9 +207,9 @@
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'.
+ 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.
@@ -181,7 +218,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ 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
@@ -190,21 +227,29 @@
./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). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ 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'
@@ -231,6 +276,16 @@
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/xcursorgen-1.0.3/Makefile.am new/xcursorgen-1.0.4/Makefile.am
--- old/xcursorgen-1.0.3/Makefile.am 2009-10-17 02:37:49.000000000 +0200
+++ new/xcursorgen-1.0.4/Makefile.am 2010-09-04 01:04:54.000000000 +0200
@@ -11,27 +11,21 @@
appman_PRE = xcursorgen.man
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
+EXTRA_DIST = $(appman_PRE) autogen.sh
+MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-SED = sed
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g'
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(APP_MAN_SUFFIX) .man
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/xcursorgen-1.0.3/config.h.in new/xcursorgen-1.0.4/config.h.in
--- old/xcursorgen-1.0.3/config.h.in 2009-10-17 02:42:25.000000000 +0200
+++ new/xcursorgen-1.0.4/config.h.in 2010-09-24 04:41:34.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/xcursorgen-1.0.3/configure.ac new/xcursorgen-1.0.4/configure.ac
--- old/xcursorgen-1.0.3/configure.ac 2009-10-17 02:41:39.000000000 +0200
+++ new/xcursorgen-1.0.4/configure.ac 2010-09-24 04:40:50.000000000 +0200
@@ -1,25 +1,23 @@
# $XdotOrg: app/xcursorgen/configure.ac,v 1.7 2005/12/15 00:24:05 kem Exp $
-AC_PREREQ([2.57])
-AC_INIT(xcursorgen, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursorgen)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xcursorgen],
+ [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xcursorgen])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros 1.8 or later: 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)
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
-AC_PROG_INSTALL
-
XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12)
-AC_SUBST(XCURSORGEN_CFLAGS)
-AC_SUBST(XCURSORGEN_LIBS)
+PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng >= 1.2.0)
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/xcursorgen-1.0.3/xcursorgen.c new/xcursorgen-1.0.4/xcursorgen.c
--- old/xcursorgen-1.0.3/xcursorgen.c 2009-01-22 16:09:58.000000000 +0100
+++ new/xcursorgen-1.0.4/xcursorgen.c 2010-05-19 03:11:33.000000000 +0200
@@ -196,7 +196,7 @@
return NULL;
}
- if (setjmp (png->jmpbuf))
+ if (setjmp (png_jmpbuf(png)))
{
png_destroy_read_struct (&png, &info, NULL);
return NULL;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org