Hello community,
here is the log from the commit of package xorg-x11-libs for openSUSE:Factory
checked in at Thu Oct 28 16:41:19 CEST 2010.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2010-10-27 09:36:56.000000000 +0200
+++ xorg-x11-libs/xorg-x11-libs.changes 2010-10-28 16:20:31.000000000 +0200
@@ -1,0 +2,15 @@
+Thu Oct 28 14:14:29 UTC 2010 - sndirsch@novell.com
+
+- libXcomposite 0.4.3
+ * This minor maintenance release provides build improvements and
+ reduces both buildtime & runtime dependencies of the library.
+- libXcursor 1.1.11
+ * This minor maintenance release provides the usual recent set
+ of build configuration improvements and janitorial cleanups.
+- libXinerama 1.1.1
+ * This minor maintenance release of the Xlib-based library for
+ the Xinerama extension protocol provides the usual set of
+ recent build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXcomposite-0.4.2.tar.bz2
libXcursor-1.1.10.tar.bz2
libXinerama-1.1.tar.bz2
New:
----
libXcomposite-0.4.3.tar.bz2
libXcursor-1.1.11.tar.bz2
libXinerama-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.YBJMHE/_old 2010-10-28 16:40:02.000000000 +0200
+++ /var/tmp/diff_new_pack.YBJMHE/_new 2010-10-28 16:40:02.000000000 +0200
@@ -34,7 +34,7 @@
#
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 8
+Release: 9
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -44,14 +44,14 @@
Source3: libXScrnSaver-1.2.0.tar.bz2
Source4: libXTrap-X11R7.0-1.0.0.tar.bz2
Source5: libXaw-1.0.8.tar.bz2
-Source6: libXcomposite-0.4.2.tar.bz2
-Source7: libXcursor-1.1.10.tar.bz2
+Source6: libXcomposite-0.4.3.tar.bz2
+Source7: libXcursor-1.1.11.tar.bz2
Source8: libXdamage-1.1.3.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
Source10: libXfont-1.4.2.tar.bz2
Source11: libXfontcache-1.0.5.tar.bz2
Source12: libXft-2.1.14.tar.bz2
-Source14: libXinerama-1.1.tar.bz2
+Source14: libXinerama-1.1.1.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
Source16: libXrandr-1.3.0.tar.bz2
Source17: libXtst-1.1.0.tar.bz2
++++++ libXcomposite-0.4.2.tar.bz2 -> libXcomposite-0.4.3.tar.bz2 ++++++
++++ 10268 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/libXcomposite-0.4.2/ChangeLog new/libXcomposite-0.4.3/ChangeLog
--- old/libXcomposite-0.4.2/ChangeLog 2010-06-09 02:06:00.000000000 +0200
+++ new/libXcomposite-0.4.3/ChangeLog 2010-10-28 07:40:53.000000000 +0200
@@ -1,3 +1,77 @@
+commit 8898782b98457292057d249ab9e40cfc2fed7d8d
+Author: Alan Coopersmith
+Date: Wed Oct 27 22:40:32 2010 -0700
+
+ libXcomposite 0.4.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit 206af895a90d5582a8078c86a33a0ba5888b7e27
+Author: Gaetan Nadon
+Date: Sun Aug 15 10:41:17 2010 -0400
+
+ man: list files to install only once
+
+ Newer versions of autoconf detect that error.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 542ff68e43a33a5c1849f9a88d2d5cc6d0827d04
+Author: Gaetan Nadon
+Date: Sat Aug 14 20:12:57 2010 -0400
+
+ man: store shadow man pages in git rather than generating them
+
+ Simplify the build process and the makefile.
+
+ Local fix in CVS for bug 5628 is not required
+ as the problem has been fixed in
+ util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
+
+ Signed-off-by: Gaetan Nadon
+
+commit 976db8a67a3e0462d0a675e2bfb2fe715e715bae
+Author: Gaetan Nadon
+Date: Sat Aug 14 19:58:14 2010 -0400
+
+ 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
+
+ Signed-off-by: Gaetan Nadon
+
+commit dc0afc177521014462baa966359b45d7a40a0c63
+Author: Fernando Carrijo
+Date: Thu Jul 1 06:52:10 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo
+ Acked-by: Tiago Vignatti
+ Reviewed-by: Alan Coopersmith
+
+commit 219e4de3666e3a7dda42c64ab1539a4cc5adbee4
+Author: Alan Coopersmith
+Date: Wed Jun 30 22:49:26 2010 -0700
+
+ Remove unneeded dependencies from configure.ac & xcomposite.pc
+
+ We only need Xfixes headers for the XserverRegion definition, don't
+ need to link against it directly or require clients link against it,
+ so only use CFLAGS from it in the Makefile, and only list it in
+ Requires.private in the .pc file.
+
+ Don't need libXext at all - no headers or functions from it are used.
+
+ Also clean up some extra appearances of *_CFLAGS & *_LIBS that aren't needed.
+
+ Signed-off-by: Alan Coopersmith
+ Reviewed-by: Dan Nicholson
+ Acked-by: Peter Hutterer
+
commit 01c4691e18b536de6585a0e93e05e2831cf2be34
Author: Alan Coopersmith
Date: Tue Jun 8 17:05:02 2010 -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/libXcomposite-0.4.2/configure.ac new/libXcomposite-0.4.3/configure.ac
--- old/libXcomposite-0.4.2/configure.ac 2010-06-09 02:04:49.000000000 +0200
+++ new/libXcomposite-0.4.3/configure.ac 2010-10-28 07:39:50.000000000 +0200
@@ -33,16 +33,16 @@
dnl synchronized.
dnl
AC_INIT(libXcomposite,
- 0.4.2,
+ [0.4.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXcomposite)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.6)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
# Check for progs
@@ -65,9 +65,8 @@
fi
COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(COMPOSITEEXT_VERSION)
-PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto)
-AC_SUBST(XCOMPOSITE_CFLAGS)
-AC_SUBST(XCOMPOSITE_LIBS)
+PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11)
+PKG_CHECK_MODULES(XFIXES, xfixes)
AC_OUTPUT([Makefile
src/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/libXcomposite-0.4.2/man/Makefile.am new/libXcomposite-0.4.3/man/Makefile.am
--- old/libXcomposite-0.4.2/man/Makefile.am 2010-01-30 08:38:16.000000000 +0100
+++ new/libXcomposite-0.4.3/man/Makefile.am 2010-09-04 01:15:46.000000000 +0200
@@ -1,12 +1,11 @@
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
libman_xml = Xcomposite.xml
-libman_PRE = $(libman_xml:xml=man)
+libman_PRE = $(libman_xml:xml=man) \
+ $(Xcomposite_shadows:=.man)
-Xcomposite_man_aliases = \
+Xcomposite_shadows = \
XCompositeQueryExtension \
XCompositeQueryVersion \
XCompositeVersion \
@@ -19,45 +18,21 @@
XCompositeGetOverlayWindow \
XCompositeReleaseOverlayWindow
-Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
-
if INSTALL_MANPAGES
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xcomposite_shadowmen)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
endif
EXTRA_DIST = $(libman_PRE) $(libman_xml)
CLEANFILES = $(libman_DATA)
-MAINTAINERCLEANFILES = $(libman_PRE)
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-$(Xcomposite_shadowmen):
- $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
-
-# Substitute system-specific values 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'
+MAINTAINERCLEANFILES = $(libman_xml:xml=man)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
- $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
# Generate nroff sources from DocBook/xml
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/libXcomposite-0.4.2/man/XCompositeCreateRegionFromBorderClip.man new/libXcomposite-0.4.3/man/XCompositeCreateRegionFromBorderClip.man
--- old/libXcomposite-0.4.2/man/XCompositeCreateRegionFromBorderClip.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeCreateRegionFromBorderClip.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeGetOverlayWindow.man new/libXcomposite-0.4.3/man/XCompositeGetOverlayWindow.man
--- old/libXcomposite-0.4.2/man/XCompositeGetOverlayWindow.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeGetOverlayWindow.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeNameWindowPixmap.man new/libXcomposite-0.4.3/man/XCompositeNameWindowPixmap.man
--- old/libXcomposite-0.4.2/man/XCompositeNameWindowPixmap.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeNameWindowPixmap.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeQueryExtension.man new/libXcomposite-0.4.3/man/XCompositeQueryExtension.man
--- old/libXcomposite-0.4.2/man/XCompositeQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeQueryExtension.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeQueryVersion.man new/libXcomposite-0.4.3/man/XCompositeQueryVersion.man
--- old/libXcomposite-0.4.2/man/XCompositeQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeQueryVersion.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeRedirectSubwindows.man new/libXcomposite-0.4.3/man/XCompositeRedirectSubwindows.man
--- old/libXcomposite-0.4.2/man/XCompositeRedirectSubwindows.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeRedirectSubwindows.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeRedirectWindow.man new/libXcomposite-0.4.3/man/XCompositeRedirectWindow.man
--- old/libXcomposite-0.4.2/man/XCompositeRedirectWindow.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeRedirectWindow.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeReleaseOverlayWindow.man new/libXcomposite-0.4.3/man/XCompositeReleaseOverlayWindow.man
--- old/libXcomposite-0.4.2/man/XCompositeReleaseOverlayWindow.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeReleaseOverlayWindow.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeUnredirectSubwindows.man new/libXcomposite-0.4.3/man/XCompositeUnredirectSubwindows.man
--- old/libXcomposite-0.4.2/man/XCompositeUnredirectSubwindows.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeUnredirectSubwindows.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeUnredirectWindow.man new/libXcomposite-0.4.3/man/XCompositeUnredirectWindow.man
--- old/libXcomposite-0.4.2/man/XCompositeUnredirectWindow.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeUnredirectWindow.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/man/XCompositeVersion.man new/libXcomposite-0.4.3/man/XCompositeVersion.man
--- old/libXcomposite-0.4.2/man/XCompositeVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.4.3/man/XCompositeVersion.man 2010-09-04 01:15:46.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcomposite.__libmansuffix__
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/libXcomposite-0.4.2/src/Makefile.am new/libXcomposite-0.4.3/src/Makefile.am
--- old/libXcomposite-0.4.2/src/Makefile.am 2009-10-16 23:26:57.000000000 +0200
+++ new/libXcomposite-0.4.3/src/Makefile.am 2010-07-01 07:42:53.000000000 +0200
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(XFIXES_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libXcomposite.la
@@ -28,7 +28,7 @@
xcompositeint.h \
Xcomposite.c
-libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS) $(X_LIBS) $(XCOMPOSITE_LIBS)
+libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
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/libXcomposite-0.4.2/src/xcompositeint.h new/libXcomposite-0.4.3/src/xcompositeint.h
--- old/libXcomposite-0.4.2/src/xcompositeint.h 2010-06-09 01:59:12.000000000 +0200
+++ new/libXcomposite-0.4.3/src/xcompositeint.h 2010-07-08 00:33:38.000000000 +0200
@@ -45,8 +45,6 @@
#ifndef _XCOMPOSITEINT_H_
#define _XCOMPOSITEINT_H_
-#define NEED_EVENTS
-#define NEED_REPLIES
#include
#include
#include
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/libXcomposite-0.4.2/xcomposite.pc.in new/libXcomposite-0.4.3/xcomposite.pc.in
--- old/libXcomposite-0.4.2/xcomposite.pc.in 2009-10-16 23:26:57.000000000 +0200
+++ new/libXcomposite-0.4.3/xcomposite.pc.in 2010-07-01 07:47:16.000000000 +0200
@@ -4,9 +4,9 @@
includedir=@includedir@
Name: Xcomposite
-Description: X Composite Library
+Description: X Composite Extension Library
Version: @PACKAGE_VERSION@
-Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@ xfixes
-Requires.private: x11 xfixes xext
+Requires: xproto compositeproto >= @COMPOSITEEXT_VERSION@
+Requires.private: x11 xfixes
Cflags: -I${includedir}
Libs: -L${libdir} -lXcomposite
++++++ libXcursor-1.1.10.tar.bz2 -> libXcursor-1.1.11.tar.bz2 ++++++
++++ 38926 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/libXcursor-1.1.10/ChangeLog new/libXcursor-1.1.11/ChangeLog
--- old/libXcursor-1.1.10/ChangeLog 2009-08-28 06:50:03.000000000 +0200
+++ new/libXcursor-1.1.11/ChangeLog 2010-10-28 07:48:48.000000000 +0200
@@ -1,3 +1,162 @@
+commit 731e84d79e83b59d022d0f453b245696b4d2750f
+Author: Alan Coopersmith
+Date: Wed Oct 27 22:48:19 2010 -0700
+
+ libXcursor 1.1.11
+
+ Signed-off-by: Alan Coopersmith
+
+commit 42b7717c32b3c7097180667a9ba2f62e40fc6506
+Author: Gaetan Nadon
+Date: Mon Aug 16 19:28:57 2010 -0400
+
+ man: whitespace management
+
+ Signed-off-by: Gaetan Nadon
+
+commit 862bc06d58152e74e85fc29db7eaec06af20e00b
+Author: Gaetan Nadon
+Date: Mon Aug 16 19:25:25 2010 -0400
+
+ man: reorder makefile statements
+
+ No functional change. Shadows are part of libman_PRE.
+
+ Signed-off-by: Gaetan Nadon
+
+commit b18568dd5b5a11ae49cad66a54ec50465c6ffa77
+Author: Gaetan Nadon
+Date: Mon Aug 16 19:17:21 2010 -0400
+
+ man: store shadow man pages in git rather than generating them
+
+ Simplify the build process and the makefile.
+
+ Local fix in CVS for bug 5628 is not required
+ as the problem has been fixed in
+ util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
+
+ Signed-off-by: Gaetan Nadon
+
+commit 68d830bcf67632b474c8996b6a2c9bcde8e27f97
+Author: Gaetan Nadon
+Date: Mon Aug 16 19:05:35 2010 -0400
+
+ 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
+
+ Signed-off-by: Gaetan Nadon
+
+commit 0caadca51ca56a2ae2cfe67cbd2b29e89b6a68d8
+Author: Gaetan Nadon
+Date: Mon Mar 29 16:50:33 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 b511b260ddcec34035c1d97285f27f3182663a6a
+Author: Gaetan Nadon
+Date: Mon Mar 29 14:53:48 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon
+
+commit a3e03bb23bf7a92bf20d51eebe692e0a4f667065
+Author: Gaetan Nadon
+Date: Tue Feb 16 10:37:21 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 8198d1490959d49573790405e205a471ac7a5b98
+Author: Gaetan Nadon
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit ecddb70049a1e79b88d4d647f7e944237055fa2e
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:10 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 02cd3d7a617c71dbc13023f91f41b896dc260c50
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 1ca6aefa6690930b336490525f5ed515ddad26ac
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:42 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 1c158db62ad2c7584d88e840f3c7fe151de84150
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:19 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 5e14cd9bd8a8f9266ecaa69d58c15d8e298d8a78
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:24 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 fbf229879370a96a070ebf087426f6f6c0dbe5a2
Author: Peter Hutterer
Date: Fri Aug 28 14:49:15 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/libXcursor-1.1.10/INSTALL new/libXcursor-1.1.11/INSTALL
--- old/libXcursor-1.1.10/INSTALL 2009-03-10 00:25:59.000000000 +0100
+++ new/libXcursor-1.1.11/INSTALL 2010-10-28 07:48:48.000000000 +0200
@@ -1,5 +1,8 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+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.
@@ -7,7 +10,10 @@
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
@@ -20,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
@@ -32,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.
@@ -64,6 +67,9 @@
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
=====================
@@ -75,7 +81,7 @@
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.
@@ -84,34 +90,46 @@
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=PATH'.
+ 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=PATH', the package will use
-PATH 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=PATH' to specify different values for particular
+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.
@@ -134,6 +152,28 @@
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
==========================
@@ -156,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
@@ -186,9 +226,14 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
+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
======================
@@ -197,7 +242,14 @@
`--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'
@@ -224,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/libXcursor-1.1.10/Makefile.am new/libXcursor-1.1.11/Makefile.am
--- old/libXcursor-1.1.10/Makefile.am 2009-03-10 00:25:59.000000000 +0100
+++ new/libXcursor-1.1.11/Makefile.am 2010-04-10 02:45:46.000000000 +0200
@@ -26,19 +26,20 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcursor.pc
-EXTRA_DIST = xcursor.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
if LINT
lint:
(cd src && $(MAKE) $(MFLAGS) lint)
endif LINT
-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/libXcursor-1.1.10/config.h.in new/libXcursor-1.1.11/config.h.in
--- old/libXcursor-1.1.10/config.h.in 2009-08-28 06:49:51.000000000 +0200
+++ new/libXcursor-1.1.11/config.h.in 2010-10-28 07:48:44.000000000 +0200
@@ -52,6 +52,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/libXcursor-1.1.10/configure.ac new/libXcursor-1.1.11/configure.ac
--- old/libXcursor-1.1.10/configure.ac 2009-08-28 06:48:54.000000000 +0200
+++ new/libXcursor-1.1.11/configure.ac 2010-10-28 07:47:31.000000000 +0200
@@ -21,27 +21,29 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
dnl This is the package version number, not the shared library
dnl version. This same version number must appear in Xcursor.h
dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's
dnl not possible to extract the version number here from Xcursor.h
dnl
-AC_INIT([libXcursor],1.1.10,[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libXcursor], [1.1.11],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],[libXcursor])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_SRCDIR([Makefile.am])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-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)
+XORG_DEFAULT_OPTIONS
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
AC_ARG_WITH(icondir,
AC_HELP_STRING([--with-icondir=<path>],
@@ -68,13 +70,6 @@
# Check for X
PKG_CHECK_MODULES(XCURSOR, xrender >= 0.8.2 xfixes x11 fixesproto)
AC_DEFINE(HAVE_XFIXES, 1, [Define to 1 if you have Xfixes])
-XCURSOR_CFLAGS="$CWARNFLAGS $XCURSOR_CFLAGS"
-AC_SUBST(XCURSOR_CFLAGS)
-AC_SUBST(XCURSOR_LIBS)
-
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
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/libXcursor-1.1.10/man/Makefile.am new/libXcursor-1.1.11/man/Makefile.am
--- old/libXcursor-1.1.10/man/Makefile.am 2009-03-10 00:25:59.000000000 +0100
+++ new/libXcursor-1.1.11/man/Makefile.am 2010-09-04 01:15:50.000000000 +0200
@@ -1,73 +1,51 @@
libmandir = $(LIB_MAN_DIR)
-libman_PRE = Xcursor.man
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
+libman_PRE = \
+ Xcursor.man \
+ $(Xcursor_shadows:=.man)
+
+Xcursor_shadows = \
+ XcursorImageCreate \
+ XcursorImageDestroy \
+ XcursorImagesCreate \
+ XcursorImagesDestroy \
+ XcursorCursorsCreate \
+ XcursorCursorsDestroy \
+ XcursorXcFileLoadImage \
+ XcursorXcFileLoadImages \
+ XcursorXcFileLoadAllImages \
+ XcursorXcFileLoad \
+ XcursorXcFileSave \
+ XcursorFilenameLoadImage \
+ XcursorFilenameLoadImages \
+ XcursorFilenameLoadAllImages \
+ XcursorFilenameLoad \
+ XcursorFilenameSaveImages \
+ XcursorFilenameSave \
+ XcursorLibraryLoadImage \
+ XcursorLibraryLoadImages \
+ XcursorFilenameLoadCursor \
+ XcursorLibraryLoadCursor \
+ XcursorLibraryLoadCursors \
+ XcursorShapeLoadImage \
+ XcursorShapeLoadImages \
+ XcursorShapeLoadCursor \
+ XcursorShapeLoadCursors \
+ XcursorSupportsARGB \
+ XcursorSetDefaultSize \
+ XcursorGetDefaultSize \
+ XcursorSetTheme \
+ XcursorGetTheme
-all-local: $(libman_DATA)
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
CLEANFILES = $(libman_DATA)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-
-MAN_SUBSTS = \
- -e 's|__xorgversion__|"$(XORGRELSTRING)"|' \
- -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g' \
- -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'
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += -e 's|__XCURSORPATH__|$(XCURSORPATH_LIST)|g'
.man.$(LIB_MAN_SUFFIX):
- -rm -f $@
- sed $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files
-
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-libman_DATA += $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@)
-BUILT_SOURCES = shadows.DONE
-CLEANFILES += shadows.DONE
-
-Xcursor_shadows = \
- XcursorImageCreate \
- XcursorImageDestroy \
- XcursorImagesCreate \
- XcursorImagesDestroy \
- XcursorCursorsCreate \
- XcursorCursorsDestroy \
- XcursorXcFileLoadImage \
- XcursorXcFileLoadImages \
- XcursorXcFileLoadAllImages \
- XcursorXcFileLoad \
- XcursorXcFileSave \
- XcursorFilenameLoadImage \
- XcursorFilenameLoadImages \
- XcursorFilenameLoadAllImages \
- XcursorFilenameLoad \
- XcursorFilenameSaveImages \
- XcursorFilenameSave \
- XcursorLibraryLoadImage \
- XcursorLibraryLoadImages \
- XcursorFilenameLoadCursor \
- XcursorLibraryLoadCursor \
- XcursorLibraryLoadCursors \
- XcursorShapeLoadImage \
- XcursorShapeLoadImages \
- XcursorShapeLoadCursor \
- XcursorShapeLoadCursors \
- XcursorSupportsARGB \
- XcursorSetDefaultSize \
- XcursorGetDefaultSize \
- XcursorSetTheme \
- XcursorGetTheme
-
-shadows.DONE:
- -rm -f $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xcursor_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcursor.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+ $(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/libXcursor-1.1.10/man/XcursorCursorsCreate.man new/libXcursor-1.1.11/man/XcursorCursorsCreate.man
--- old/libXcursor-1.1.10/man/XcursorCursorsCreate.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorCursorsCreate.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorCursorsDestroy.man new/libXcursor-1.1.11/man/XcursorCursorsDestroy.man
--- old/libXcursor-1.1.10/man/XcursorCursorsDestroy.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorCursorsDestroy.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameLoad.man new/libXcursor-1.1.11/man/XcursorFilenameLoad.man
--- old/libXcursor-1.1.10/man/XcursorFilenameLoad.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameLoad.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameLoadAllImages.man new/libXcursor-1.1.11/man/XcursorFilenameLoadAllImages.man
--- old/libXcursor-1.1.10/man/XcursorFilenameLoadAllImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameLoadAllImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameLoadCursor.man new/libXcursor-1.1.11/man/XcursorFilenameLoadCursor.man
--- old/libXcursor-1.1.10/man/XcursorFilenameLoadCursor.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameLoadCursor.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameLoadImage.man new/libXcursor-1.1.11/man/XcursorFilenameLoadImage.man
--- old/libXcursor-1.1.10/man/XcursorFilenameLoadImage.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameLoadImage.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameLoadImages.man new/libXcursor-1.1.11/man/XcursorFilenameLoadImages.man
--- old/libXcursor-1.1.10/man/XcursorFilenameLoadImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameLoadImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameSave.man new/libXcursor-1.1.11/man/XcursorFilenameSave.man
--- old/libXcursor-1.1.10/man/XcursorFilenameSave.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameSave.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorFilenameSaveImages.man new/libXcursor-1.1.11/man/XcursorFilenameSaveImages.man
--- old/libXcursor-1.1.10/man/XcursorFilenameSaveImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorFilenameSaveImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorGetDefaultSize.man new/libXcursor-1.1.11/man/XcursorGetDefaultSize.man
--- old/libXcursor-1.1.10/man/XcursorGetDefaultSize.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorGetDefaultSize.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorGetTheme.man new/libXcursor-1.1.11/man/XcursorGetTheme.man
--- old/libXcursor-1.1.10/man/XcursorGetTheme.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorGetTheme.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorImageCreate.man new/libXcursor-1.1.11/man/XcursorImageCreate.man
--- old/libXcursor-1.1.10/man/XcursorImageCreate.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorImageCreate.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorImageDestroy.man new/libXcursor-1.1.11/man/XcursorImageDestroy.man
--- old/libXcursor-1.1.10/man/XcursorImageDestroy.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorImageDestroy.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorImagesCreate.man new/libXcursor-1.1.11/man/XcursorImagesCreate.man
--- old/libXcursor-1.1.10/man/XcursorImagesCreate.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorImagesCreate.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorImagesDestroy.man new/libXcursor-1.1.11/man/XcursorImagesDestroy.man
--- old/libXcursor-1.1.10/man/XcursorImagesDestroy.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorImagesDestroy.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorLibraryLoadCursor.man new/libXcursor-1.1.11/man/XcursorLibraryLoadCursor.man
--- old/libXcursor-1.1.10/man/XcursorLibraryLoadCursor.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorLibraryLoadCursor.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorLibraryLoadCursors.man new/libXcursor-1.1.11/man/XcursorLibraryLoadCursors.man
--- old/libXcursor-1.1.10/man/XcursorLibraryLoadCursors.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorLibraryLoadCursors.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorLibraryLoadImage.man new/libXcursor-1.1.11/man/XcursorLibraryLoadImage.man
--- old/libXcursor-1.1.10/man/XcursorLibraryLoadImage.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorLibraryLoadImage.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorLibraryLoadImages.man new/libXcursor-1.1.11/man/XcursorLibraryLoadImages.man
--- old/libXcursor-1.1.10/man/XcursorLibraryLoadImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorLibraryLoadImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorSetDefaultSize.man new/libXcursor-1.1.11/man/XcursorSetDefaultSize.man
--- old/libXcursor-1.1.10/man/XcursorSetDefaultSize.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorSetDefaultSize.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorSetTheme.man new/libXcursor-1.1.11/man/XcursorSetTheme.man
--- old/libXcursor-1.1.10/man/XcursorSetTheme.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorSetTheme.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorShapeLoadCursor.man new/libXcursor-1.1.11/man/XcursorShapeLoadCursor.man
--- old/libXcursor-1.1.10/man/XcursorShapeLoadCursor.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorShapeLoadCursor.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorShapeLoadCursors.man new/libXcursor-1.1.11/man/XcursorShapeLoadCursors.man
--- old/libXcursor-1.1.10/man/XcursorShapeLoadCursors.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorShapeLoadCursors.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorShapeLoadImage.man new/libXcursor-1.1.11/man/XcursorShapeLoadImage.man
--- old/libXcursor-1.1.10/man/XcursorShapeLoadImage.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorShapeLoadImage.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorShapeLoadImages.man new/libXcursor-1.1.11/man/XcursorShapeLoadImages.man
--- old/libXcursor-1.1.10/man/XcursorShapeLoadImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorShapeLoadImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorSupportsARGB.man new/libXcursor-1.1.11/man/XcursorSupportsARGB.man
--- old/libXcursor-1.1.10/man/XcursorSupportsARGB.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorSupportsARGB.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorXcFileLoad.man new/libXcursor-1.1.11/man/XcursorXcFileLoad.man
--- old/libXcursor-1.1.10/man/XcursorXcFileLoad.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorXcFileLoad.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorXcFileLoadAllImages.man new/libXcursor-1.1.11/man/XcursorXcFileLoadAllImages.man
--- old/libXcursor-1.1.10/man/XcursorXcFileLoadAllImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorXcFileLoadAllImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorXcFileLoadImage.man new/libXcursor-1.1.11/man/XcursorXcFileLoadImage.man
--- old/libXcursor-1.1.10/man/XcursorXcFileLoadImage.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorXcFileLoadImage.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorXcFileLoadImages.man new/libXcursor-1.1.11/man/XcursorXcFileLoadImages.man
--- old/libXcursor-1.1.10/man/XcursorXcFileLoadImages.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorXcFileLoadImages.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/man/XcursorXcFileSave.man new/libXcursor-1.1.11/man/XcursorXcFileSave.man
--- old/libXcursor-1.1.10/man/XcursorXcFileSave.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcursor-1.1.11/man/XcursorXcFileSave.man 2010-09-04 01:15:50.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xcursor.__libmansuffix__
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/libXcursor-1.1.10/missing new/libXcursor-1.1.11/missing
--- old/libXcursor-1.1.10/missing 2009-03-10 00:49:19.000000000 +0100
+++ new/libXcursor-1.1.11/missing 2010-10-28 07:48:44.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/libXcursor-1.1.10/src/Makefile.am new/libXcursor-1.1.11/src/Makefile.am
--- old/libXcursor-1.1.10/src/Makefile.am 2009-03-10 00:25:59.000000000 +0100
+++ new/libXcursor-1.1.11/src/Makefile.am 2010-02-25 08:37:25.000000000 +0100
@@ -6,8 +6,11 @@
XCURSORPATH=@XCURSORPATH@
libXcursor_la_LIBADD = $(XCURSOR_LIBS)
-AM_CFLAGS = $(XCURSOR_CFLAGS) \
- -DICONDIR=\"$(ICONDIR)\" -DXCURSORPATH=\"$(XCURSORPATH)\"
+AM_CFLAGS = \
+ $(XCURSOR_CFLAGS) \
+ $(CWARNFLAGS)\
+ -DICONDIR=\"$(ICONDIR)\" \
+ -DXCURSORPATH=\"$(XCURSORPATH)\"
INCLUDES = -I$(top_srcdir)/include/X11/Xcursor
++++++ libXinerama-1.1.tar.bz2 -> libXinerama-1.1.1.tar.bz2 ++++++
++++ 44042 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/libXinerama-1.1/COPYING new/libXinerama-1.1.1/COPYING
--- old/libXinerama-1.1/COPYING 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/COPYING 2010-10-28 08:27:02.000000000 +0200
@@ -1,12 +1,66 @@
-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) 2007, Oracle and/or its affiliates. All rights reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice (including the next
+paragraph) 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 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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Copyright 2003 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 dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+
+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.
+
+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
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization from Digital
+Equipment Corporation.
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/libXinerama-1.1/ChangeLog new/libXinerama-1.1.1/ChangeLog
--- old/libXinerama-1.1/ChangeLog 2009-10-02 05:27:36.000000000 +0200
+++ new/libXinerama-1.1.1/ChangeLog 2010-10-28 08:29:12.000000000 +0200
@@ -1,3 +1,209 @@
+commit 8e62595cc1af274f1c40868c5d7461c176982062
+Author: Alan Coopersmith
+Date: Wed Oct 27 23:28:24 2010 -0700
+
+ libXinerama 1.1.1
+
+ Signed-off-by: Alan Coopersmith
+
+commit d94e21941a296ed125d4704c31af020fd140fcbc
+Author: Alan Coopersmith
+Date: Wed Oct 27 23:27:21 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith
+
+commit d3da9510deb14255ee7eabdecc3988af57441ee7
+Author: Jesse Adkins
+Date: Tue Sep 28 13:30:03 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins
+ Signed-off-by: Alan Coopersmith
+
+commit c09ed03c45c8141b620a49bce2dc19a2729b60b8
+Author: Gaetan Nadon
+Date: Mon Aug 16 20:06:56 2010 -0400
+
+ man: store shadow man pages in git rather than generating them
+
+ Simplify the build process and the makefile.
+
+ Local fix in CVS for bug 5628 is not required
+ as the problem has been fixed in
+ util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
+
+ Signed-off-by: Gaetan Nadon
+
+commit ade2b02753362b178d7e926e18601ae2b0698532
+Author: Alan Coopersmith
+Date: Wed Jul 7 16:38:03 2010 -0700
+
+ Use make rules instead of shell for loops to generate shadow man pages
+
+ Allows parallel make and simpler build logs/error reporting
+
+ Signed-off-by: Alan Coopersmith
+
+commit 2921352cfef9faf007f2b35aa06089425ba095ed
+Author: Alan Coopersmith
+Date: Wed Jul 7 16:32:00 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 2b5874a864152ac0466476b1c5b8ab0203887d20
+Author: Fernando Carrijo
+Date: Thu Jul 1 06:57:33 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo
+ Acked-by: Tiago Vignatti
+ Reviewed-by: Alan Coopersmith
+
+commit d8a51c48a4278b3481a5301be8ecb533fe87e9a7
+Author: Gaetan Nadon
+Date: Mon Mar 29 16:50:34 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 fa1772317219f2e2b4079c463f4139e02bec9853
+Author: Gaetan Nadon
+Date: Mon Mar 29 14:53:49 2010 -0400
+
+ config: remove the pkgconfig pc.in file from EXTRA_DIST
+
+ Automake always includes it in the tarball.
+
+ Signed-off-by: Gaetan Nadon
+
+commit 43b50ccdd50511aad7bdd1869b294813550f7741
+Author: Gaetan Nadon
+Date: Tue Feb 16 10:37:21 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 e528b336ce5aa66aa720fd94df4618f40a85b818
+Author: Alan Coopersmith
+Date: Thu Jan 14 20:43:47 2010 -0800
+
+ Fill in COPYING with licenses from source files
+
+ Signed-off-by: Alan Coopersmith
+
+commit e569f85315c0ff82a1481706f0736b85dc3bccf9
+Author: Alan Coopersmith
+Date: Thu Jan 14 20:40:40 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith
+
+commit a470f6392f4bd532e6e855445346f00e680983db
+Author: Gaetan Nadon
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 31f4af6528b6b45ea6f946f5ac97260f06c24071
+Author: Gaetan Nadon
+Date: Wed Oct 28 14:09:10 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 f23ac859c9d47158c9ef58b93361e43e8cd63db3
+Author: Gaetan Nadon
+Date: Tue Oct 27 15:07:25 2009 -0400
+
+ Deploy the new XORG_DEFAULT_OPTIONS #24242
+
+ This macro aggregate a number of existing macros that sets commmon
+ X.Org components configuration options. It shields the configuration file from
+ future changes.
+
+commit 94b6ea6665839bb399fe4befd3b6d1b20d128de8
+Author: Gaetan Nadon
+Date: Mon Oct 26 22:08:43 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 231ee8c9bbed45d89eed56e6c861af259b12f005
+Author: Gaetan Nadon
+Date: Thu Oct 22 12:34:19 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 968cb085c8e3fece7f10fe8e4c290f32e0b246b0
+Author: Alan Coopersmith
+Date: Mon Nov 2 14:58:54 2009 -0800
+
+ Fix PanroamiXOff typo in comment in panoramiXext.h
+
+ Signed-off-by: Alan Coopersmith
+
+commit 96c0d0e13c90e01c4335b64369adfac02ff8a148
+Author: Jeremy Huddleston
+Date: Wed Oct 21 12:47:25 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 ee877cebfea0773a91337439d32ece12444cf0a6
Author: Peter Hutterer
Date: Fri Oct 2 13:27:04 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/libXinerama-1.1/INSTALL new/libXinerama-1.1.1/INSTALL
--- old/libXinerama-1.1/INSTALL 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/INSTALL 2010-10-28 08:29:12.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/libXinerama-1.1/Makefile.am new/libXinerama-1.1.1/Makefile.am
--- old/libXinerama-1.1/Makefile.am 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/Makefile.am 2010-04-10 02:46:20.000000000 +0200
@@ -24,15 +24,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xinerama.pc
-EXTRA_DIST = xinerama.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
if LINT
lint:
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/libXinerama-1.1/config.h.in new/libXinerama-1.1.1/config.h.in
--- old/libXinerama-1.1/config.h.in 2009-10-02 05:27:26.000000000 +0200
+++ new/libXinerama-1.1.1/config.h.in 2010-10-28 08:29:04.000000000 +0200
@@ -49,6 +49,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/libXinerama-1.1/configure.ac new/libXinerama-1.1.1/configure.ac
--- old/libXinerama-1.1/configure.ac 2009-10-02 05:26:58.000000000 +0200
+++ new/libXinerama-1.1.1/configure.ac 2010-10-28 08:28:03.000000000 +0200
@@ -20,27 +20,27 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libXinerama, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libXinerama], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXinerama])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-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)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
-XINERAMA_CFLAGS="$CWARNFLAGS $XINERAMA_CFLAGS"
-AC_SUBST(XINERAMA_CFLAGS)
-AC_SUBST(XINERAMA_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
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/libXinerama-1.1/include/X11/extensions/panoramiXext.h new/libXinerama-1.1.1/include/X11/extensions/panoramiXext.h
--- old/libXinerama-1.1/include/X11/extensions/panoramiXext.h 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/include/X11/extensions/panoramiXext.h 2009-11-02 23:58:27.000000000 +0100
@@ -36,7 +36,7 @@
typedef struct {
Window window; /* PanoramiX window - may not exist */
int screen;
- int State; /* PanroamiXOff, PanoramiXOn */
+ int State; /* PanoramiXOff, PanoramiXOn */
int width; /* width of this screen */
int height; /* height of this screen */
int ScreenCount; /* real physical number of screens */
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/libXinerama-1.1/man/Makefile.am new/libXinerama-1.1.1/man/Makefile.am
--- old/libXinerama-1.1/man/Makefile.am 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/man/Makefile.am 2010-10-28 08:26:43.000000000 +0200
@@ -1,73 +1,45 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-#
-# 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 copyright holders 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 copyright holders.
-#
+# Copyright (c) 2007, 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.
+#
libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
-libman_PRE = Xinerama.man
-
-BUILT_SOURCES = shadows.DONE
+libman_PRE = \
+ Xinerama.man \
+ $(Xinerama_shadows:=.man)
+
+Xinerama_shadows = \
+ XineramaQueryExtension \
+ XineramaQueryVersion \
+ XineramaIsActive \
+ XineramaQueryScreens
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@)
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__xservername__/Xorg/g' \
- -e 's/__xconfigfile__/xorg.conf/g' \
- -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
- -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-Xinerama_shadows = \
- XineramaQueryExtension \
- XineramaQueryVersion \
- XineramaIsActive \
- XineramaQueryScreens
-
-shadows.DONE:
- -rm -f $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xinerama_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xinerama.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+ $(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/libXinerama-1.1/man/Xinerama.man new/libXinerama-1.1.1/man/Xinerama.man
--- old/libXinerama-1.1/man/Xinerama.man 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/man/Xinerama.man 2010-10-28 08:26:22.000000000 +0200
@@ -1,32 +1,24 @@
.\"
-.\"
-.\" Copyright © 2007 Sun Microsystems, Inc. All rights reserved.
+.\" Copyright (c) 2007, 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, and/or sell copies of the Software, and to permit persons
-.\" to whom the Software is furnished to do so, provided that the above
-.\" copyright notice(s) and this permission notice appear in all copies of
-.\" the Software and that both the above copyright notice(s) and this
-.\" permission notice appear in supporting documentation.
-.\"
-.\" 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
-.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-.\"
-.\" Except as contained in this notice, the name of a copyright holder
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" of the copyright holder.
+.\" 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.
.\"
.de TQ
.br
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/libXinerama-1.1/man/XineramaIsActive.man new/libXinerama-1.1.1/man/XineramaIsActive.man
--- old/libXinerama-1.1/man/XineramaIsActive.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXinerama-1.1.1/man/XineramaIsActive.man 2010-09-04 01:16:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
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/libXinerama-1.1/man/XineramaQueryExtension.man new/libXinerama-1.1.1/man/XineramaQueryExtension.man
--- old/libXinerama-1.1/man/XineramaQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXinerama-1.1.1/man/XineramaQueryExtension.man 2010-09-04 01:16:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
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/libXinerama-1.1/man/XineramaQueryScreens.man new/libXinerama-1.1.1/man/XineramaQueryScreens.man
--- old/libXinerama-1.1/man/XineramaQueryScreens.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXinerama-1.1.1/man/XineramaQueryScreens.man 2010-09-04 01:16:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
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/libXinerama-1.1/man/XineramaQueryVersion.man new/libXinerama-1.1.1/man/XineramaQueryVersion.man
--- old/libXinerama-1.1/man/XineramaQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXinerama-1.1.1/man/XineramaQueryVersion.man 2010-09-04 01:16:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xinerama.__libmansuffix__
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/libXinerama-1.1/src/Makefile.am new/libXinerama-1.1.1/src/Makefile.am
--- old/libXinerama-1.1/src/Makefile.am 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/src/Makefile.am 2010-02-25 08:38:18.000000000 +0100
@@ -2,7 +2,9 @@
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(XINERAMA_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
+
lib_LTLIBRARIES = libXinerama.la
libXinerama_la_SOURCES = \
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/libXinerama-1.1/src/Xinerama.c new/libXinerama-1.1.1/src/Xinerama.c
--- old/libXinerama-1.1/src/Xinerama.c 2009-03-10 02:06:17.000000000 +0100
+++ new/libXinerama-1.1.1/src/Xinerama.c 2010-10-07 06:13:01.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: XPanoramiX.c,v 1.4 2000/08/17 19:45:51 cpqbld Exp $ */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -23,10 +22,7 @@
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.2 2001/07/23 17:20:28 dawes Exp $ */
-#define NEED_EVENTS
-#define NEED_REPLIES
#include
#include
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org