openSUSE Commits
Threads by month
- ----- 2024 -----
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2010
- 1 participants
- 1023 discussions
Hello community,
here is the log from the commit of package dos2unix for openSUSE:Factory
checked in at Tue Nov 2 10:47:33 CET 2010.
--------
--- dos2unix/dos2unix.changes 2010-08-24 15:28:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/dos2unix/dos2unix.changes 2010-10-31 19:03:14.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de
+
+- Use %_smp_mflags
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dos2unix.spec ++++++
--- /var/tmp/diff_new_pack.IVxBl7/_old 2010-11-02 10:47:11.000000000 +0100
+++ /var/tmp/diff_new_pack.IVxBl7/_new 2010-11-02 10:47:11.000000000 +0100
@@ -21,7 +21,7 @@
BuildRequires: xz
Summary: Text converters to and from DOS/MAC to UNIX
Version: 5.1.1
-Release: 1
+Release: 2
Group: Productivity/Text/Convertors
License: BSD3c
Url: http://www.xs4all.nl/~waterlan/#DOS2UNIX
@@ -43,7 +43,7 @@
%build
export RPM_OPT_FLAGS
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
%install
%makeinstall docdir=%{_defaultdocdir}/%{name}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libnscd for openSUSE:Factory
checked in at Tue Nov 2 10:47:00 CET 2010.
--------
--- libnscd/libnscd.changes 2009-12-14 23:50:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/libnscd/libnscd.changes 2010-10-31 19:03:48.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de
+
+- Use %_smp_mflags
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnscd.spec ++++++
--- /var/tmp/diff_new_pack.rBYccs/_old 2010-11-02 10:46:55.000000000 +0100
+++ /var/tmp/diff_new_pack.rBYccs/_new 2010-11-02 10:46:55.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libnscd (Version 2.0.2)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,7 @@
%endif
#
Version: 2.0.2
-Release: 109
+Release: 116
Summary: Library to Allow Applications to Communicate with nscd
Source: libnscd-%{version}.tar.bz2
Source2: baselibs.conf
@@ -64,7 +64,7 @@
%build
%configure --libdir=/%{_lib} --disable-static --with-pic
-%{__make} %{?jobs:-j%jobs}
+%{__make} %{?_smp_mflags}
%check
make check
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package opie for openSUSE:Factory
checked in at Tue Nov 2 10:46:44 CET 2010.
--------
--- opie/opie.changes 2009-12-14 17:53:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/opie/opie.changes 2010-10-31 19:04:12.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de
+
+- Use %_smp_mflags
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opie.spec ++++++
--- /var/tmp/diff_new_pack.qFFm0M/_old 2010-11-02 10:46:33.000000000 +0100
+++ /var/tmp/diff_new_pack.qFFm0M/_new 2010-11-02 10:46:33.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package opie (Version 2.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
BuildRequires: bison pam-devel
Url: http://www.inner.net/opie
Version: 2.4
-Release: 700
+Release: 708
License: GPLv2+
Group: Productivity/Security
Provides: pam_opie
@@ -58,12 +58,6 @@
This package provides a PAM module and several utility programs that
let you use one-time passwords for authentication.
-
-
-Authors:
---------
- Craig Metz <cmetz(a)inner.net>
-
%prep
%setup -q -n %{name}-%{version} -a 1
%patch0 -p1
@@ -92,10 +86,10 @@
# build opie
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --enable-insecure-override
-make %{?jobs:-j%jobs};
+make %{?_smp_mflags}
# build pam_opie
cd %{name_pam}
-make %{?jobs:-j%jobs};
+make %{?_smp_mflags}
%install
# install opie
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libs for openSUSE:Factory
checked in at Tue Nov 2 10:46:21 CET 2010.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2010-10-28 18:25:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2010-11-02 09:15:58.000000000 +0100
@@ -1,0 +2,61 @@
+Mon Nov 1 23:37:01 UTC 2010 - sndirsch(a)novell.com
+
+- libXevie-1.0.3
+ * This release provides the cleanups and build configuration
+ improvements that have been made since the last libXevie
+ release in 2006.
+
+-------------------------------------------------------------------
+Sat Oct 30 14:46:55 UTC 2010 - sndirsch(a)novell.com
+
+- libXft 2.2.0
+ * This release removes the deprecated xft-config script now that
+ pkg-config is well-established as it's replacement. It also
+ updates the xft pkg-config file to reduce unnecessary linking
+ in users of libXft, but may cause issues if used with versions
+ of pkg-config older than the pkg-config 0.22 release from 2007.
+ It also includes the usual recent set of build configuration
+ improvements and janitorial cleanups.
+- libXtst 1.2.0
+ * This release adds the specification documents for the API's for
+ both extensions, converted from the original troff format to
+ DocBook/XML. It also includes the usual recent rounds of build
+ configuration improvements and janitorial cleanups.
+- libXxf86dga 1.1.2
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+- libXxf86vm 1.1.1
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+- libXScrnSaver 1.2.1
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups, with no additional snarkiness beyond that provided
+ in this announcement.
+
+-------------------------------------------------------------------
+Fri Oct 29 08:27:37 UTC 2010 - sndirsch(a)novell.com
+
+- libXfont 1.4.3
+ * This bug fix release mostly fixes build issues on various
+ platforms involving the hackery required for libXfont to
+ depend on symbols defined in the X server itself. Trying to
+ explain or understand this hackery may be damaging to your
+ sanity - it has already robbed several generations of X
+ developers of ours.
+- libdmx 1.1.1
+ * This minor maintenance release provides the latest set of
+ the usual build configuration improvements and janitorial
+ cleanups.
+- libXrandr 1.3.1
+ * This release includes several fixes to the error handling
+ paths in the library, as well as the usual set of recent
+ build configuration improvements and janitorial cleanups.
+- libXres 1.0.5
+ * This minor maintenance release provides the latest set of
+ the usual build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libdmx-1.1.0.tar.bz2
libXevie-1.0.2.tar.bz2
libXfont-1.4.2.tar.bz2
libXft-2.1.14.tar.bz2
libXrandr-1.3.0.tar.bz2
libXres-1.0.4.tar.bz2
libXScrnSaver-1.2.0.tar.bz2
libXtst-1.1.0.tar.bz2
libXxf86dga-1.1.1.tar.bz2
libXxf86vm-1.1.0.tar.bz2
New:
----
libdmx-1.1.1.tar.bz2
libXevie-1.0.3.tar.bz2
libXfont-1.4.3.tar.bz2
libXft-2.2.0.tar.bz2
libXrandr-1.3.1.tar.bz2
libXres-1.0.5.tar.bz2
libXScrnSaver-1.2.1.tar.bz2
libXtst-1.2.0.tar.bz2
libXxf86dga-1.1.2.tar.bz2
libXxf86vm-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.KVVpl4/_old 2010-11-02 10:45:55.000000000 +0100
+++ /var/tmp/diff_new_pack.KVVpl4/_new 2010-11-02 10:45:55.000000000 +0100
@@ -34,37 +34,37 @@
#
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 10
+Release: 11
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
Summary: Remaining X.Org libraries
Source1: libFS-1.0.3.tar.bz2
Source2: libWindowsWM-1.0.1.tar.bz2
-Source3: libXScrnSaver-1.2.0.tar.bz2
+Source3: libXScrnSaver-1.2.1.tar.bz2
Source4: libXTrap-X11R7.0-1.0.0.tar.bz2
Source5: libXaw-1.0.8.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
+Source9: libXevie-1.0.3.tar.bz2
+Source10: libXfont-1.4.3.tar.bz2
Source11: libXfontcache-1.0.5.tar.bz2
-Source12: libXft-2.1.14.tar.bz2
+Source12: libXft-2.2.0.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
+Source16: libXrandr-1.3.1.tar.bz2
+Source17: libXtst-1.2.0.tar.bz2
Source18: libXvMC-1.0.6.tar.bz2
-Source19: libXxf86dga-1.1.1.tar.bz2
+Source19: libXxf86dga-1.1.2.tar.bz2
Source20: libXxf86misc-1.0.2.tar.bz2
-Source21: libXxf86vm-1.1.0.tar.bz2
-Source22: libdmx-1.1.0.tar.bz2
+Source21: libXxf86vm-1.1.1.tar.bz2
+Source22: libdmx-1.1.1.tar.bz2
Source23: liblbxutil-1.1.0.tar.bz2
Source24: liboldX-X11R7.0-1.0.1.tar.bz2
Source25: libxkbui-X11R7.1-1.0.2.tar.bz2
Source26: xbitmaps-1.1.0.tar.bz2
-Source27: libXres-1.0.4.tar.bz2
+Source27: libXres-1.0.5.tar.bz2
Source29: libvnc-20070501.tar.bz2
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.3.6.tar.bz2
@@ -282,7 +282,7 @@
%files -n xorg-x11-devel
%defattr(-,root,root)
-/usr/bin/xft-config
+%doc /usr/share/doc/*
/usr/include/*.h
%exclude /usr/include/pciaccess.h
/usr/include/X11/*.h
@@ -297,7 +297,6 @@
%exclude /usr/%{_lib}/libpciaccess.so
/usr/%{_lib}/pkgconfig/*.pc
%exclude /usr/%{_lib}/pkgconfig/pciaccess.pc
-%{_mandir}/man1/*
%{_mandir}/man3/*
%doc %{_datadir}/doc/libXvMC/
%doc %{_datadir}/doc/libXaw/
++++++ libdmx-1.1.0.tar.bz2 -> libdmx-1.1.1.tar.bz2 ++++++
++++ 43781 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/libdmx-1.1.0/ChangeLog new/libdmx-1.1.1/ChangeLog
--- old/libdmx-1.1.0/ChangeLog 2009-10-05 03:55:04.000000000 +0200
+++ new/libdmx-1.1.1/ChangeLog 2010-10-29 01:56:59.000000000 +0200
@@ -1,3 +1,174 @@
+commit 09d2ddd805a00568e4b7f668b0f500a63c350940
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Oct 28 16:56:29 2010 -0700
+
+ libdmx 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 83fa1d94d11f368824bea6ba64e9575b57f87769
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:04 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit db8beb3d19f152a87249fa91c957e4782f47df77
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Jul 7 15:10:34 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 <alan.coopersmith(a)oracle.com>
+
+commit 309745fc0095cccc575ead3446480060091161f1
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 06:48:47 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 6d9de78c3cde1e7963cafc6e8155b3e2ea5819c1
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 6163288513cc166c5e8b9488b08a2d07e7100755
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit a8b1449bca44bfddd2e7228bb7d514512e4ef30c
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 442b50b94eaae9202e76c170738fcc049dcc453d
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Jan 13 16:04:33 2010 -0500
+
+ COPYING: replace stub with actual copyright notices
+
+ Refer to dmx.c
+ Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit c34b17f997f63842649b93e1575cd2bc322e8f4e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Fri Nov 27 20:56:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit fdf48235bc529bbda112a70dbd6e9ff560ca6a04
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 fa6e6e76d9a58d021473369e4a9ff287e7e42e15
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 4a78271ada80b64eeb5f6563fd9d1a161abc7afe
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 4fd8605292125d95d1eb58fec1b7daff2f35ec26
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 13:11:11 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 fad53bf1e485036146570d9ead901f23bf4c323f
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:20 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 c43a769428a03c0de58545c611e75243a8d8f2ea
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:27 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 <jeremyhu(a)freedesktop.org>
+
commit a3ff756a3a478162a6f96b9fbf54c9f1a487af38
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Mon Oct 5 11:54:43 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/libdmx-1.1.0/config.h.in new/libdmx-1.1.1/config.h.in
--- old/libdmx-1.1.0/config.h.in 2009-10-05 03:55:04.000000000 +0200
+++ new/libdmx-1.1.1/config.h.in 2010-10-29 01:56:51.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/libdmx-1.1.0/configure.ac new/libdmx-1.1.1/configure.ac
--- old/libdmx-1.1.0/configure.ac 2009-10-05 03:54:38.000000000 +0200
+++ new/libdmx-1.1.1/configure.ac 2010-10-29 01:56:13.000000000 +0200
@@ -21,27 +21,26 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libdmx], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
-DMX_CFLAGS="$CWARNFLAGS $DMX_CFLAGS"
-AC_SUBST(DMX_CFLAGS)
-AC_SUBST(DMX_LIBS)
XORG_CHECK_MALLOC_ZERO
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/libdmx-1.1.0/COPYING new/libdmx-1.1.1/COPYING
--- old/libdmx-1.1.0/COPYING 2009-03-10 00:27:31.000000000 +0100
+++ new/libdmx-1.1.1/COPYING 2010-01-30 08:37:30.000000000 +0100
@@ -1,12 +1,24 @@
-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 2002-2004 Red Hat Inc., Durham, North Carolina.
-Please submit updated COPYING files to the Xorg bugzilla:
+All Rights Reserved.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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 on 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:
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial
+portions of the Software.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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
+NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdmx-1.1.0/INSTALL new/libdmx-1.1.1/INSTALL
--- old/libdmx-1.1.0/INSTALL 2009-03-10 00:27:31.000000000 +0100
+++ new/libdmx-1.1.1/INSTALL 2010-10-29 01:56:59.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 `<wchar.h>' 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/libdmx-1.1.0/Makefile.am new/libdmx-1.1.1/Makefile.am
--- old/libdmx-1.1.0/Makefile.am 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/Makefile.am 2010-04-10 02:45:10.000000000 +0200
@@ -24,15 +24,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmx.pc
-EXTRA_DIST = dmx.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+.PHONY: ChangeLog INSTALL
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
-.PHONY: ChangeLog
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdmx-1.1.0/man/DMXAddInput.man new/libdmx-1.1.1/man/DMXAddInput.man
--- old/libdmx-1.1.0/man/DMXAddInput.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXAddInput.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXAddScreen.man new/libdmx-1.1.1/man/DMXAddScreen.man
--- old/libdmx-1.1.0/man/DMXAddScreen.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXAddScreen.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXChangeDesktopAttributes.man new/libdmx-1.1.1/man/DMXChangeDesktopAttributes.man
--- old/libdmx-1.1.0/man/DMXChangeDesktopAttributes.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXChangeDesktopAttributes.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXChangeScreensAttributes.man new/libdmx-1.1.1/man/DMXChangeScreensAttributes.man
--- old/libdmx-1.1.0/man/DMXChangeScreensAttributes.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXChangeScreensAttributes.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXForceWindowCreation.man new/libdmx-1.1.1/man/DMXForceWindowCreation.man
--- old/libdmx-1.1.0/man/DMXForceWindowCreation.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXForceWindowCreation.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXGetDesktopAttributes.man new/libdmx-1.1.1/man/DMXGetDesktopAttributes.man
--- old/libdmx-1.1.0/man/DMXGetDesktopAttributes.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXGetDesktopAttributes.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXGetInputAttributes.man new/libdmx-1.1.1/man/DMXGetInputAttributes.man
--- old/libdmx-1.1.0/man/DMXGetInputAttributes.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXGetInputAttributes.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXGetInputCount.man new/libdmx-1.1.1/man/DMXGetInputCount.man
--- old/libdmx-1.1.0/man/DMXGetInputCount.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXGetInputCount.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXGetScreenAttributes.man new/libdmx-1.1.1/man/DMXGetScreenAttributes.man
--- old/libdmx-1.1.0/man/DMXGetScreenAttributes.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXGetScreenAttributes.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXGetScreenCount.man new/libdmx-1.1.1/man/DMXGetScreenCount.man
--- old/libdmx-1.1.0/man/DMXGetScreenCount.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXGetScreenCount.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXGetWindowAttributes.man new/libdmx-1.1.1/man/DMXGetWindowAttributes.man
--- old/libdmx-1.1.0/man/DMXGetWindowAttributes.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXGetWindowAttributes.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMX.man new/libdmx-1.1.1/man/DMX.man
--- old/libdmx-1.1.0/man/DMX.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMX.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXQueryExtension.man new/libdmx-1.1.1/man/DMXQueryExtension.man
--- old/libdmx-1.1.0/man/DMXQueryExtension.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXQueryExtension.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXQueryVersion.man new/libdmx-1.1.1/man/DMXQueryVersion.man
--- old/libdmx-1.1.0/man/DMXQueryVersion.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXQueryVersion.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXRemoveInput.man new/libdmx-1.1.1/man/DMXRemoveInput.man
--- old/libdmx-1.1.0/man/DMXRemoveInput.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXRemoveInput.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXRemoveScreen.man new/libdmx-1.1.1/man/DMXRemoveScreen.man
--- old/libdmx-1.1.0/man/DMXRemoveScreen.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXRemoveScreen.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/DMXSync.man new/libdmx-1.1.1/man/DMXSync.man
--- old/libdmx-1.1.0/man/DMXSync.man 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/man/DMXSync.man 2010-10-07 06:08:52.000000000 +0200
@@ -1,5 +1,3 @@
-.\" $XFree86$
-.\"
.\" Copyright 2004 Red Hat Inc., Durham, North Carolina.
.\" All Rights Reserved.
.\"
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/libdmx-1.1.0/man/Makefile.am new/libdmx-1.1.1/man/Makefile.am
--- old/libdmx-1.1.0/man/Makefile.am 2009-03-10 00:27:31.000000000 +0100
+++ new/libdmx-1.1.1/man/Makefile.am 2010-07-08 00:09:59.000000000 +0200
@@ -46,17 +46,7 @@
CLEANFILES = $(libman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdmx-1.1.0/src/dmx.c new/libdmx-1.1.1/src/dmx.c
--- old/libdmx-1.1.0/src/dmx.c 2009-03-10 00:27:31.000000000 +0100
+++ new/libdmx-1.1.1/src/dmx.c 2010-10-07 06:08:52.000000000 +0200
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
@@ -39,7 +38,6 @@
* can be included in client applications by linking with the libdmx.a
* library. */
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#define EXTENSION_PROC_ARGS void *
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/libdmx-1.1.0/src/Makefile.am new/libdmx-1.1.1/src/Makefile.am
--- old/libdmx-1.1.0/src/Makefile.am 2009-08-28 02:08:09.000000000 +0200
+++ new/libdmx-1.1.1/src/Makefile.am 2010-02-25 08:36:39.000000000 +0100
@@ -11,7 +11,8 @@
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(DMX_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
libdmxincludedir = $(includedir)/X11/extensions
libdmxinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dmxext.h
++++++ libXevie-1.0.2.tar.bz2 -> libXevie-1.0.3.tar.bz2 ++++++
++++ 68852 lines of diff (skipped)
++++++ libXfont-1.4.2.tar.bz2 -> libXfont-1.4.3.tar.bz2 ++++++
++++ 43671 lines of diff (skipped)
++++++ libXft-2.1.14.tar.bz2 -> libXft-2.2.0.tar.bz2 ++++++
++++ 67127 lines of diff (skipped)
++++++ libXrandr-1.3.0.tar.bz2 -> libXrandr-1.3.1.tar.bz2 ++++++
++++ 39480 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/libXrandr-1.3.0/ChangeLog new/libXrandr-1.3.1/ChangeLog
--- old/libXrandr-1.3.0/ChangeLog 2009-03-06 15:16:47.000000000 +0100
+++ new/libXrandr-1.3.1/ChangeLog 2010-10-28 21:34:55.000000000 +0200
@@ -1,3 +1,275 @@
+commit b7e31c69d345d3cba359d7648c304cff43ff7437
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Oct 28 12:34:26 2010 -0700
+
+ libXrandr 1.3.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f490ed44a1c85c75183d87d034b94f9973b88abd
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Oct 28 12:30:27 2010 -0700
+
+ Fix configure.ac comment for RandR instead of Render
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 95cf69bd452db86b6aefe3837e1f7010ebf21e80
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Oct 28 12:27:30 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 12f22e0ae0cbd748b416c7e2486f289f89c5c77c
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:03 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 247ad2a3865ba503e6c77444f855c71e7a210f13
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Aug 17 07:57:08 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 <memsize(a)videotron.ca>
+
+commit 8f23ad4703c7fcfdd7d53d52ddebb7590c3cb265
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 14:40:39 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 <alan.coopersmith(a)oracle.com>
+
+commit 82bc24d6137cc4f03944af88e69c4d67b26d3cc9
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 14:34:18 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 <alan.coopersmith(a)oracle.com>
+
+commit 2e5c60f477fc68634f1fa31a2fc4a166642ab318
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 07:01:47 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 18517a55d08cdcf9e29bed6761cf4311e1d4109f
+Author: Leif Middelschulte <leif.middelschulte(a)gmail.com>
+Date: Tue May 25 14:52:50 2010 -0300
+
+ Add parameter safety check
+
+ As mentioned in bugzilla ticket 28150.
+ Calling '_XRRValidateCache' with 'improper' arguments results in a SEGV.
+ This patch adds a parameter validation to the mentioned function.
+
+ Signed-off-by: Leif Middelschulte <leif.middelschulte(a)gmail.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 7a7bac907ac15033c0ddb979202c7f3ddc368726
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 883acff30b23c2bdf446988ff7b780cd61e49a5e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 74bb9072015b8a785f6b6458ba0605287a1ffcaf
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 449d22180549d990ad3164c98b22968359b55df2
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Jan 14 09:41:26 2010 -0500
+
+ COPYING: add missing copyright notices
+
+ Refer to: Xrandr.h XrrConfig.c
+ Copyright © 2006 Intel Corporation
+ Copyright © 2008 Red Hat, Inc.
+ Copyright © 2006 Keith Packard
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 51887f07a7722576933ddcc00c5380266d6fa37c
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 21:02:20 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit cd6fcaeaf0da7ca66ec0ab63ce282def37c21c3b
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 61c4a57286b601ff266a15565740aea31e68d1bb
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 170a3efb274d473165a8d6085c185792b1c43005
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 8567a45cb36857a8b5e2699a3d3ed7850b053281
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 015687dbec93d954fb18981bc6e15937a206a4b7
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 2e07e9d4f300e8153e4e93cd78bc51e0d91dba6f
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Mon Nov 9 17:51:03 2009 -0500
+
+ GetCrtcGamma: Fix error handling.
+
+ We didn't treat _XReply failure as fatal. Parsing an xError as a gamma
+ ramp reply doesn't work that often.
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+ Reviewed-by: Jamey Sharp <jamey(a)minilop.net>
+
+commit 7b41b589213293793182b61f20006229a89d5ba7
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Mon Nov 9 17:50:42 2009 -0500
+
+ GetCrtcGammaSize: Return 0, not garbage, on failure
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+ Reviewed-by: Jamey Sharp <jamey(a)minilop.net>
+
+commit 5e94f071f45ca504ccafe083e2e289351ba6eab4
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Mon Nov 9 17:49:40 2009 -0500
+
+ GetScreenSizeRange: Document funky return code in the header
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+ Reviewed-by: Jamey Sharp <jamey(a)minilop.net>
+
+commit f98cbea8b33356a0de1f777c3a862ecbf163cfd3
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Mon Nov 9 17:49:10 2009 -0500
+
+ SetScreenConfigAndRate: Document error handling better
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+ Reviewed-by: Jamey Sharp <jamey(a)minilop.net>
+
+commit a8af918c0db758a667345b7c3055075124197f6c
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Mon Nov 9 17:48:22 2009 -0500
+
+ GetOutputProperty: Return the error code, not BadRequest
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+ Reviewed-by: Jamey Sharp <jamey(a)minilop.net>
+
+commit 7f463b2a2221065c03b6122c0cffd2fa5cb13427
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:26 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 <jeremyhu(a)freedesktop.org>
+
commit e3036766916d55d0c8ae72d5752fd1699ae7390d
Author: Matthias Hopf <mhopf(a)suse.de>
Date: Fri Mar 6 15:13:56 2009 +0100
@@ -126,7 +398,7 @@
Signed-off-by: Julien Cristau <jcristau(a)debian.org>
commit 83e567f427f68dc4ae2de796a1184748bbe0238e
-Merge: 908de8f... 00f2e30...
+Merge: 908de8f 00f2e30
Author: Julien Cristau <jcristau(a)debian.org>
Date: Mon Dec 1 20:59:39 2008 +0100
@@ -248,7 +520,7 @@
Replace static ChangeLog with dist-hook to generate from git log
commit e56fa06624dc240dbe8d3e127cc3b65da580fe6e
-Merge: 27b91d1... 0294912...
+Merge: 27b91d1 0294912
Author: James Cloos <cloos(a)jhcloos.com>
Date: Sun Nov 11 10:27:35 2007 -0500
@@ -300,7 +572,7 @@
Must pass size information in SetCrtcGamma request.
commit 9c4fea702a0382689898fc14cbdab456fb18c403
-Merge: c85237a... 382b7a3...
+Merge: c85237a 382b7a3
Author: Keith Packard <keithp(a)neko.keithp.com>
Date: Wed Jan 31 14:24:57 2007 -0800
@@ -351,7 +623,7 @@
structure to the XRRCrtcInfo being returned, leaving the value uninitialized.
commit bc75a92cac23dad4a661a13e6af121f6072cecc8
-Merge: 7fcdcbb... 370fa28...
+Merge: 7fcdcbb 370fa28
Author: Dave Airlie <airlied(a)linux.ie>
Date: Sat Dec 2 11:27:36 2006 +1100
@@ -366,7 +638,7 @@
They build. More testing seems indicated.
commit 7fcdcbb0f9c4736bd678be7f9bf76d472293233f
-Merge: 875867f... 0dba1be...
+Merge: 875867f 0dba1be
Author: Eric Anholt <eric(a)anholt.net>
Date: Mon Nov 27 15:41:03 2006 -0800
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/libXrandr-1.3.0/config.h.in new/libXrandr-1.3.1/config.h.in
--- old/libXrandr-1.3.0/config.h.in 2009-03-06 15:15:31.000000000 +0100
+++ new/libXrandr-1.3.1/config.h.in 2010-10-28 21:34:51.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/libXrandr-1.3.0/configure.ac new/libXrandr-1.3.1/configure.ac
--- old/libXrandr-1.3.0/configure.ac 2009-03-06 15:13:27.000000000 +0100
+++ new/libXrandr-1.3.1/configure.ac 2010-10-28 21:30:54.000000000 +0200
@@ -21,29 +21,31 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
-dnl Version should match the current Render version. XRenderQueryVersion
+dnl Version should match the current Randr version. XRRQueryVersion
dnl returns the version from randr.h, NOT the version we set here. But we
dnl try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT([libXrandr], [1.3.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrandr])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
# Check randr configuration, strip extra digits from package version to
# find the required protocol version
@@ -51,14 +53,8 @@
RANDR_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RANDR_VERSION)
PKG_CHECK_MODULES(RANDR, x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto)
-RANDR_CFLAGS="$CWARNFLAGS $RANDR_CFLAGS"
-AC_SUBST(RANDR_CFLAGS)
-AC_SUBST(RANDR_LIBS)
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
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/libXrandr-1.3.0/COPYING new/libXrandr-1.3.1/COPYING
--- old/libXrandr-1.3.0/COPYING 2007-11-15 17:36:24.000000000 +0100
+++ new/libXrandr-1.3.1/COPYING 2010-01-30 08:39:38.000000000 +0100
@@ -17,3 +17,48 @@
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.
+
+Copyright © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett-Packard Company, Inc.
+Copyright © 2006 Intel Corporation
+Copyright © 2008 Red Hat, Inc.
+
+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, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holders make no representations
+about the suitability of this software for any purpose. It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+Copyright © 2000 Compaq Computer Corporation, Inc.
+Copyright © 2002 Hewlett Packard Company, Inc.
+Copyright © 2006 Keith Packard
+
+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, and
+that the name of the copyright holders not be used in advertising or
+publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holders make no representations
+about the suitability of this software for any purpose. It is provided "as
+is" without express or implied warranty.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.3.0/include/X11/extensions/Xrandr.h new/libXrandr-1.3.1/include/X11/extensions/Xrandr.h
--- old/libXrandr-1.3.0/include/X11/extensions/Xrandr.h 2008-12-12 13:04:08.000000000 +0100
+++ new/libXrandr-1.3.1/include/X11/extensions/Xrandr.h 2009-11-11 07:19:10.000000000 +0100
@@ -197,6 +197,7 @@
/* Version 1.2 additions */
+/* despite returning a Status, this returns 1 for success */
Status
XRRGetScreenSizeRange (Display *dpy, Window window,
int *minWidth, int *minHeight,
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/libXrandr-1.3.0/INSTALL new/libXrandr-1.3.1/INSTALL
--- old/libXrandr-1.3.0/INSTALL 2007-11-15 17:36:24.000000000 +0100
+++ new/libXrandr-1.3.1/INSTALL 2010-10-28 21:34:55.000000000 +0200
@@ -1,8 +1,291 @@
-Xrender is built with the traditional configure script:
+Installation Instructions
+*************************
- $ ./configure --prefix=/usr/X11R6
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
-This should generate valid Makefiles, then:
+ 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 `<wchar.h>' 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.
- $ make
- $ make 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/libXrandr-1.3.0/Makefile.am new/libXrandr-1.3.1/Makefile.am
--- old/libXrandr-1.3.0/Makefile.am 2009-02-03 17:09:48.000000000 +0100
+++ new/libXrandr-1.3.1/Makefile.am 2010-04-10 02:46:38.000000000 +0200
@@ -24,12 +24,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xrandr.pc
-EXTRA_DIST = xrandr.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
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/libXrandr-1.3.0/man/Makefile.am new/libXrandr-1.3.1/man/Makefile.am
--- old/libXrandr-1.3.0/man/Makefile.am 2008-04-14 21:10:33.000000000 +0200
+++ new/libXrandr-1.3.1/man/Makefile.am 2010-10-28 21:27:19.000000000 +0200
@@ -1,79 +1,55 @@
#
-# Copyright 2005 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) 2005, 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 = Xrandr.man
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
+libman_PRE = \
+ Xrandr.man \
+ $(Xrandr_shadows:=.man)
+
+Xrandr_shadows = \
+ XRRQueryExtension \
+ XRRQueryVersion \
+ XRRGetScreenInfo \
+ XRRFreeScreenConfigInfo \
+ XRRSetScreenConfig \
+ XRRSetScreenConfigAndRate \
+ XRRConfigRotations \
+ XRRConfigTimes \
+ XRRConfigSizes \
+ XRRConfigRates \
+ XRRConfigCurrentConfiguration \
+ XRRConfigCurrentRate \
+ XRRRootToScreen \
+ XRRSelectInput
-BUILT_SOURCES = shadows.DONE
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
EXTRA_DIST = $(libman_PRE)
-
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
+CLEANFILES = $(libman_DATA)
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)
-
-Xrandr_shadows = \
- XRRQueryExtension \
- XRRQueryVersion \
- XRRGetScreenInfo \
- XRRFreeScreenConfigInfo \
- XRRSetScreenConfig \
- XRRSetScreenConfigAndRate \
- XRRConfigRotations \
- XRRConfigTimes \
- XRRConfigSizes \
- XRRConfigRates \
- XRRConfigCurrentConfiguration \
- XRRConfigCurrentRate \
- XRRRootToScreen \
- XRRSelectInput
-
-shadows.DONE:
- -rm -f $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(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/libXrandr-1.3.0/man/Xrandr.man new/libXrandr-1.3.1/man/Xrandr.man
--- old/libXrandr-1.3.0/man/Xrandr.man 2008-05-19 12:52:50.000000000 +0200
+++ new/libXrandr-1.3.1/man/Xrandr.man 2010-10-07 06:14:20.000000000 +0200
@@ -1,7 +1,4 @@
.\"
-.\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $
-.\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.2 2004/04/23 18:43:47 eich Exp $
-.\"
.\" Copyright 2002 Hewlett-Packard Company.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
.\" documentation for any purpose is hereby granted without fee, provided that
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/libXrandr-1.3.0/man/XRRConfigCurrentConfiguration.man new/libXrandr-1.3.1/man/XRRConfigCurrentConfiguration.man
--- old/libXrandr-1.3.0/man/XRRConfigCurrentConfiguration.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRConfigCurrentConfiguration.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRConfigCurrentRate.man new/libXrandr-1.3.1/man/XRRConfigCurrentRate.man
--- old/libXrandr-1.3.0/man/XRRConfigCurrentRate.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRConfigCurrentRate.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRConfigRates.man new/libXrandr-1.3.1/man/XRRConfigRates.man
--- old/libXrandr-1.3.0/man/XRRConfigRates.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRConfigRates.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRConfigRotations.man new/libXrandr-1.3.1/man/XRRConfigRotations.man
--- old/libXrandr-1.3.0/man/XRRConfigRotations.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRConfigRotations.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRConfigSizes.man new/libXrandr-1.3.1/man/XRRConfigSizes.man
--- old/libXrandr-1.3.0/man/XRRConfigSizes.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRConfigSizes.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRConfigTimes.man new/libXrandr-1.3.1/man/XRRConfigTimes.man
--- old/libXrandr-1.3.0/man/XRRConfigTimes.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRConfigTimes.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRFreeScreenConfigInfo.man new/libXrandr-1.3.1/man/XRRFreeScreenConfigInfo.man
--- old/libXrandr-1.3.0/man/XRRFreeScreenConfigInfo.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRFreeScreenConfigInfo.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRGetScreenInfo.man new/libXrandr-1.3.1/man/XRRGetScreenInfo.man
--- old/libXrandr-1.3.0/man/XRRGetScreenInfo.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRGetScreenInfo.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRQueryExtension.man new/libXrandr-1.3.1/man/XRRQueryExtension.man
--- old/libXrandr-1.3.0/man/XRRQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRQueryExtension.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRQueryVersion.man new/libXrandr-1.3.1/man/XRRQueryVersion.man
--- old/libXrandr-1.3.0/man/XRRQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRQueryVersion.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRRootToScreen.man new/libXrandr-1.3.1/man/XRRRootToScreen.man
--- old/libXrandr-1.3.0/man/XRRRootToScreen.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRRootToScreen.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRSelectInput.man new/libXrandr-1.3.1/man/XRRSelectInput.man
--- old/libXrandr-1.3.0/man/XRRSelectInput.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRSelectInput.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRSetScreenConfigAndRate.man new/libXrandr-1.3.1/man/XRRSetScreenConfigAndRate.man
--- old/libXrandr-1.3.0/man/XRRSetScreenConfigAndRate.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRSetScreenConfigAndRate.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/man/XRRSetScreenConfig.man new/libXrandr-1.3.1/man/XRRSetScreenConfig.man
--- old/libXrandr-1.3.0/man/XRRSetScreenConfig.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXrandr-1.3.1/man/XRRSetScreenConfig.man 2010-09-04 01:16:42.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xrandr.__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/libXrandr-1.3.0/missing new/libXrandr-1.3.1/missing
--- old/libXrandr-1.3.0/missing 2008-03-11 16:32:27.000000000 +0100
+++ new/libXrandr-1.3.1/missing 2010-10-28 21:34:51.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 <pinard(a)iro.umontreal.ca>, 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 <bug-automake(a)gnu.org>."
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/libXrandr-1.3.0/src/Makefile.am new/libXrandr-1.3.1/src/Makefile.am
--- old/libXrandr-1.3.0/src/Makefile.am 2009-02-03 17:09:48.000000000 +0100
+++ new/libXrandr-1.3.1/src/Makefile.am 2010-02-25 08:38:54.000000000 +0100
@@ -11,7 +11,11 @@
XrrScreen.c
libXrandr_la_LIBADD = @RANDR_LIBS@
-AM_CFLAGS = @RANDR_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+
+AM_CFLAGS = \
+ $(RANDR_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
INCLUDES = -I$(top_srcdir)/include/X11/extensions
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/libXrandr-1.3.0/src/Xrandrint.h new/libXrandr-1.3.1/src/Xrandrint.h
--- old/libXrandr-1.3.0/src/Xrandrint.h 2009-02-03 17:09:48.000000000 +0100
+++ new/libXrandr-1.3.1/src/Xrandrint.h 2010-07-08 23:28:50.000000000 +0200
@@ -25,8 +25,6 @@
#ifndef _XRANDRINT_H_
#define _XRANDRINT_H_
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h>
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/libXrandr-1.3.0/src/XrrConfig.c new/libXrandr-1.3.1/src/XrrConfig.c
--- old/libXrandr-1.3.0/src/XrrConfig.c 2009-02-03 17:09:48.000000000 +0100
+++ new/libXrandr-1.3.1/src/XrrConfig.c 2010-06-04 20:16:10.000000000 +0200
@@ -105,7 +105,7 @@
XRRScreenConfiguration **configs;
XRandRInfo *xrri;
- if (XextHasExtension(info)) {
+ if ((screen >= 0) && (screen < ScreenCount(dpy)) && XextHasExtension(info)) {
xrri = (XRandRInfo *) info->data;
configs = xrri->config;
@@ -409,6 +409,7 @@
(void) _XReply (dpy, (xReply *) &rep, 0, xTrue);
+ /* actually .errorCode in struct xError */
if (rep.status == RRSetConfigSuccess) {
/* if we succeed, set our view of reality to what we set it to */
config->config_timestamp = rep.newConfigTimestamp;
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/libXrandr-1.3.0/src/XrrCrtc.c new/libXrandr-1.3.1/src/XrrCrtc.c
--- old/libXrandr-1.3.0/src/XrrCrtc.c 2009-02-03 17:09:48.000000000 +0100
+++ new/libXrandr-1.3.1/src/XrrCrtc.c 2009-11-11 07:19:10.000000000 +0100
@@ -167,7 +167,7 @@
req->crtc = crtc;
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
- rep.status = RRSetConfigFailed;
+ rep.size = 0;
UnlockDisplay (dpy);
SyncHandle ();
return rep.size;
@@ -179,7 +179,7 @@
XExtDisplayInfo *info = XRRFindDisplay(dpy);
xRRGetCrtcGammaReply rep;
xRRGetCrtcGammaReq *req;
- XRRCrtcGamma *crtc_gamma;
+ XRRCrtcGamma *crtc_gamma = NULL;
long nbytes;
long nbytesRead;
@@ -192,7 +192,7 @@
req->crtc = crtc;
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
- rep.status = RRSetConfigFailed;
+ goto out;
nbytes = (long) rep.length << 2;
@@ -204,9 +204,7 @@
if (!crtc_gamma)
{
_XEatData (dpy, (unsigned long) nbytes);
- UnlockDisplay (dpy);
- SyncHandle ();
- return NULL;
+ goto out;
}
_XRead16 (dpy, crtc_gamma->red, rep.size * 2);
_XRead16 (dpy, crtc_gamma->green, rep.size * 2);
@@ -214,7 +212,8 @@
if (nbytes > nbytesRead)
_XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
-
+
+out:
UnlockDisplay (dpy);
SyncHandle ();
return crtc_gamma;
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/libXrandr-1.3.0/src/XrrProperty.c new/libXrandr-1.3.1/src/XrrProperty.c
--- old/libXrandr-1.3.0/src/XrrProperty.c 2009-02-03 17:09:48.000000000 +0100
+++ new/libXrandr-1.3.1/src/XrrProperty.c 2009-11-11 07:19:10.000000000 +0100
@@ -272,7 +272,7 @@
{
UnlockDisplay (dpy);
SyncHandle ();
- return 1;
+ return ((xError *)&rep)->errorCode;
}
*prop = (unsigned char *) NULL;
++++++ libXres-1.0.4.tar.bz2 -> libXres-1.0.5.tar.bz2 ++++++
++++ 60617 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/libXres-1.0.4/ChangeLog new/libXres-1.0.5/ChangeLog
--- old/libXres-1.0.4/ChangeLog 2009-10-09 16:55:41.000000000 +0200
+++ new/libXres-1.0.5/ChangeLog 2010-10-29 01:22:16.000000000 +0200
@@ -1,3 +1,180 @@
+commit 1cb91aaf819ae3c9385c130e4fa0146057c4c89b
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Oct 28 16:21:39 2010 -0700
+
+ libXres 1.0.5
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 564236eb299eb9224f4f09c7bda5bebc987c8af9
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Oct 28 16:19:46 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f00517c478c6e34afd7d1e1477554156d36baf0e
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:02 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit c8bbca66bc1cf75ca01c66901605549dc780def6
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Aug 17 08:39:22 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 <memsize(a)videotron.ca>
+
+commit b4975daf8c85eda619da1cb6f1584876786feaaa
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 14:55:32 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit d2a60612f4a9f50830d3c62780fe74507a8c82ad
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 07:03:29 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f0c0c4e6d50c65b7da6f72404796c25f860a3198
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit eca8fc252af729453a2db8218fcfe3a686ba3df5
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit ceaddfbd0f55c4863bed9c42fcce1fad0348ad19
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 17eeac2a9218f5d22c71d18eee9ec1fe64bdbf5a
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 21:12:39 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit 79251c2f41643ba06d0fd706ea4116f7924ddefa
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Fri Nov 27 20:56:03 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 1f393e74c3dd55c3422804cac98716f1e7e35d85
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 15:08:51 2009 -0400
+
+ configure.ac: AM_MAINTAINER_MODE missing #24238
+
+ This turns off maintainer mode build rules in tarballs.
+ Works in conjunction with autogen.sh --enable-maintainer-mode
+ For all X.Org components.
+
+commit c4f650e235c4cb286377792b836a551e9b63a0e5
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 a8ab75d941ebf3fe83832c990dd7e5f75dc0971b
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 24890a580d43d2224f6f7074c1e3cb2072536d81
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 c34ef112fa1b20ee65a6b287759e899bca2c5823
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:23 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 <jeremyhu(a)freedesktop.org>
+
commit 08032a51fccda19ad4722015f4cc0b1a587592f7
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Fri Oct 9 07:54:44 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXres-1.0.4/config.h.in new/libXres-1.0.5/config.h.in
--- old/libXres-1.0.4/config.h.in 2009-10-09 16:55:12.000000000 +0200
+++ new/libXres-1.0.5/config.h.in 2010-10-29 01:22:11.000000000 +0200
@@ -30,6 +30,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -45,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/libXres-1.0.4/configure.ac new/libXres-1.0.5/configure.ac
--- old/libXres-1.0.4/configure.ac 2009-10-09 16:49:57.000000000 +0200
+++ new/libXres-1.0.5/configure.ac 2010-10-29 01:21:15.000000000 +0200
@@ -21,7 +21,7 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
dnl
dnl Version should match the current XRes version. XResQueryVersion
@@ -30,14 +30,16 @@
dnl digit in the version number to track changes which don't affect the
dnl protocol, so XRes version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXres, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
+AC_INIT([libXres], [1.0.5],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
@@ -53,9 +55,6 @@
# find the required protocol version
RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
-XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS"
-AC_SUBST(XRES_CFLAGS)
-AC_SUBST(XRES_LIBS)
XORG_CHECK_MALLOC_ZERO
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/libXres-1.0.4/include/X11/extensions/XRes.h new/libXres-1.0.5/include/X11/extensions/XRes.h
--- old/libXres-1.0.4/include/X11/extensions/XRes.h 2008-05-22 01:31:54.000000000 +0200
+++ new/libXres-1.0.5/include/X11/extensions/XRes.h 2010-10-07 06:14:32.000000000 +0200
@@ -1,8 +1,6 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
-/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
#ifndef _XRES_H
#define _XRES_H
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/libXres-1.0.4/INSTALL new/libXres-1.0.5/INSTALL
--- old/libXres-1.0.4/INSTALL 2009-10-09 09:15:35.000000000 +0200
+++ new/libXres-1.0.5/INSTALL 2010-10-29 01:22:16.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 `<wchar.h>' 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/libXres-1.0.4/Makefile.am new/libXres-1.0.5/Makefile.am
--- old/libXres-1.0.4/Makefile.am 2009-10-09 08:36:10.000000000 +0200
+++ new/libXres-1.0.5/Makefile.am 2010-04-10 02:46:44.000000000 +0200
@@ -26,12 +26,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xres.pc
-EXTRA_DIST = xres.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
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/libXres-1.0.4/man/Makefile.am new/libXres-1.0.5/man/Makefile.am
--- old/libXres-1.0.4/man/Makefile.am 2009-10-09 08:38:33.000000000 +0200
+++ new/libXres-1.0.5/man/Makefile.am 2010-10-29 01:19:26.000000000 +0200
@@ -1,72 +1,46 @@
#
-# Copyright 2005 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) 2005, 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 = XRes.man
+libman_PRE = \
+ XRes.man \
+ $(XRes_shadows:=.man)
+
+XRes_shadows = \
+ XResQueryExtension \
+ XResQueryVersion \
+ XResQueryClients \
+ XResQueryClientResources \
+ XResQueryClientPixmapBytes
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XRes_shadowmen)
-
-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/__miscmansuffix__/$(MISC_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):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-XRes_shadows = \
- XResQueryExtension \
- XResQueryVersion \
- XResQueryClients \
- XResQueryClientResources \
- XResQueryClientPixmapBytes
-
-XRes_shadowmen = $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
-
-$(XRes_shadowmen):
- $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $@
-
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/libXres-1.0.4/man/XResQueryClientPixmapBytes.man new/libXres-1.0.5/man/XResQueryClientPixmapBytes.man
--- old/libXres-1.0.4/man/XResQueryClientPixmapBytes.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXres-1.0.5/man/XResQueryClientPixmapBytes.man 2010-09-04 01:16:49.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__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/libXres-1.0.4/man/XResQueryClientResources.man new/libXres-1.0.5/man/XResQueryClientResources.man
--- old/libXres-1.0.4/man/XResQueryClientResources.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXres-1.0.5/man/XResQueryClientResources.man 2010-09-04 01:16:49.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__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/libXres-1.0.4/man/XResQueryClients.man new/libXres-1.0.5/man/XResQueryClients.man
--- old/libXres-1.0.4/man/XResQueryClients.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXres-1.0.5/man/XResQueryClients.man 2010-09-04 01:16:49.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__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/libXres-1.0.4/man/XResQueryExtension.man new/libXres-1.0.5/man/XResQueryExtension.man
--- old/libXres-1.0.4/man/XResQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXres-1.0.5/man/XResQueryExtension.man 2010-09-04 01:16:49.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__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/libXres-1.0.4/man/XResQueryVersion.man new/libXres-1.0.5/man/XResQueryVersion.man
--- old/libXres-1.0.4/man/XResQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXres-1.0.5/man/XResQueryVersion.man 2010-09-04 01:16:49.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XRes.__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/libXres-1.0.4/src/Makefile.am new/libXres-1.0.5/src/Makefile.am
--- old/libXres-1.0.4/src/Makefile.am 2009-10-09 08:36:24.000000000 +0200
+++ new/libXres-1.0.5/src/Makefile.am 2010-02-25 08:39:02.000000000 +0100
@@ -5,7 +5,10 @@
libXRes_la_LIBADD = @XRES_LIBS@
-AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
+AM_CFLAGS = \
+ $(CWARNFLAGS) \
+ $(XRES_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS)
INCLUDES = -I$(top_srcdir)/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/libXres-1.0.4/src/XRes.c new/libXres-1.0.5/src/XRes.c
--- old/libXres-1.0.4/src/XRes.c 2008-05-22 01:31:54.000000000 +0200
+++ new/libXres-1.0.5/src/XRes.c 2010-10-07 06:14:32.000000000 +0200
@@ -1,10 +1,7 @@
/*
Copyright (c) 2002 XFree86 Inc
*/
-/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
++++++ libXScrnSaver-1.2.0.tar.bz2 -> libXScrnSaver-1.2.1.tar.bz2 ++++++
++++ 39381 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/libXScrnSaver-1.2.0/ChangeLog new/libXScrnSaver-1.2.1/ChangeLog
--- old/libXScrnSaver-1.2.0/ChangeLog 2009-08-25 10:59:40.000000000 +0200
+++ new/libXScrnSaver-1.2.1/ChangeLog 2010-10-30 07:21:45.000000000 +0200
@@ -1,3 +1,193 @@
+commit aa25c745b032608c9cdc8006ed351d8ef435bf18
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 22:20:54 2010 -0700
+
+ libXScrnSaver 1.2.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f8b5e67d5b9fe5f6d8ff75561d66ac6a4bc16df2
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 22:18:40 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 3ef4f63bf542411aa01e62ef5e8c8120afe255be
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:02 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 25c4abc730f7d2407c33fcd5c48a6a82c541c921
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Aug 17 09:00:28 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 <memsize(a)videotron.ca>
+
+commit 1fb51a78ae5a063aa384b0b6b6fb7b11e972fcfa
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:04:20 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 <alan.coopersmith(a)oracle.com>
+
+commit 2f5b75f49528c4bf57100b5d8fb83788013f7da9
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:01:36 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 <alan.coopersmith(a)oracle.com>
+
+commit d1a4b97476efc64d9c47202b877c72c8b0fed14d
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 07:04:31 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit bd46f8e115caeb4f48af64fc235d2b317f01b41f
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit d665b35a9b33b7b0a80b557115240ff5514bd8cf
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 00e9520738c8660451cdf21e5a3b530924855822
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 0b90e128718f269be334b9e60aa5b50604b1dc8c
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 21:09:04 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit 2f58888d29d779cb84072d1895934dfcee683f4c
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Fri Nov 27 20:56:03 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 27972a511fb73bad74dd0309487af050a6a99c42
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 fe1b6951a8e6ac4006b4f488121746cf71e4771d
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Oct 27 15:07:26 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 7c8ac21a9485beab00560764d16e41a4c26cfc02
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 b0b29818e4893fcf97a67fab58640740f285ad25
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 b27442666e132a521c5ce8c2aaa8de97abfa54b1
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:23 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 <jeremyhu(a)freedesktop.org>
+
commit aa162e709338904604b3f945999956044bcbc7cb
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Tue Aug 25 18:47: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/libXScrnSaver-1.2.0/config.h.in new/libXScrnSaver-1.2.1/config.h.in
--- old/libXScrnSaver-1.2.0/config.h.in 2009-08-25 10:58:40.000000000 +0200
+++ new/libXScrnSaver-1.2.1/config.h.in 2010-10-30 07:21:37.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/libXScrnSaver-1.2.0/configure.ac new/libXScrnSaver-1.2.1/configure.ac
--- old/libXScrnSaver-1.2.0/configure.ac 2009-08-25 10:56:29.000000000 +0200
+++ new/libXScrnSaver-1.2.1/configure.ac 2010-10-30 07:20:29.000000000 +0200
@@ -21,37 +21,34 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libXScrnSaver, 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXScrnSaver)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libXScrnSaver], [1.2.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXScrnSaver])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
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
# Check for dependencies
PKG_CHECK_MODULES(XSCRNSAVER, x11 xext xextproto [scrnsaverproto >= 1.2])
-XSCRNSAVER_CFLAGS="$CWARNFLAGS $XSCRNSAVER_CFLAGS"
-AC_SUBST(XSCRNSAVER_CFLAGS)
-AC_SUBST(XSCRNSAVER_LIBS)
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([Xss])
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
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/libXScrnSaver-1.2.0/include/X11/extensions/scrnsaver.h new/libXScrnSaver-1.2.1/include/X11/extensions/scrnsaver.h
--- old/libXScrnSaver-1.2.0/include/X11/extensions/scrnsaver.h 2009-03-10 00:25:30.000000000 +0100
+++ new/libXScrnSaver-1.2.1/include/X11/extensions/scrnsaver.h 2010-10-07 06:14:42.000000000 +0200
@@ -25,7 +25,6 @@
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86$ */
#ifndef _SCRNSAVER_H_
#define _SCRNSAVER_H_
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/libXScrnSaver-1.2.0/INSTALL new/libXScrnSaver-1.2.1/INSTALL
--- old/libXScrnSaver-1.2.0/INSTALL 2009-03-10 00:25:30.000000000 +0100
+++ new/libXScrnSaver-1.2.1/INSTALL 2010-10-30 07:21:45.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 `<wchar.h>' 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/libXScrnSaver-1.2.0/Makefile.am new/libXScrnSaver-1.2.1/Makefile.am
--- old/libXScrnSaver-1.2.0/Makefile.am 2009-03-10 00:25:30.000000000 +0100
+++ new/libXScrnSaver-1.2.1/Makefile.am 2010-04-10 02:46:47.000000000 +0200
@@ -24,15 +24,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xscrnsaver.pc
-EXTRA_DIST = xscrnsaver.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
# Check source code with tools like lint & sparse
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/libXScrnSaver-1.2.0/man/Makefile.am new/libXScrnSaver-1.2.1/man/Makefile.am
--- old/libXScrnSaver-1.2.0/man/Makefile.am 2009-03-10 00:25:30.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/Makefile.am 2010-10-30 07:18:28.000000000 +0200
@@ -1,77 +1,53 @@
#
-# Copyright 2005 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) 2005, 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 = Xss.man
-
-BUILT_SOURCES = shadows.DONE
-
-EXTRA_DIST = $(libman_PRE)
-
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(Xss_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/__miscmansuffix__/$(MISC_MAN_SUFFIX)/g' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
+libman_PRE = \
+ Xss.man \
+ $(Xss_shadows:=.man)
-SUFFIXES = .$(LIB_MAN_SUFFIX) .man
-
-.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-
-Xss_shadows = \
+Xss_shadows = \
XScreenSaverQueryExtension \
- XScreenSaverQueryVersion \
- XScreenSaverAllocInfo \
+ XScreenSaverQueryVersion \
+ XScreenSaverAllocInfo \
XScreenSaverQueryInfo \
XScreenSaverSelectInput \
- XScreenSaverSetAttributes \
+ XScreenSaverSetAttributes \
XScreenSaverUnsetAttributes \
XScreenSaverRegister \
XScreenSaverUnregister \
XScreenSaverGetRegistered \
XScreenSaverSuspend
-shadows.DONE:
- -rm -f $(Xss_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(Xss_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX) > $$i; \
- done)
+EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
+
+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):
+ $(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/libXScrnSaver-1.2.0/man/XScreenSaverAllocInfo.man new/libXScrnSaver-1.2.1/man/XScreenSaverAllocInfo.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverAllocInfo.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverAllocInfo.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverGetRegistered.man new/libXScrnSaver-1.2.1/man/XScreenSaverGetRegistered.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverGetRegistered.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverGetRegistered.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverQueryExtension.man new/libXScrnSaver-1.2.1/man/XScreenSaverQueryExtension.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverQueryExtension.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverQueryInfo.man new/libXScrnSaver-1.2.1/man/XScreenSaverQueryInfo.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverQueryInfo.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverQueryInfo.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverQueryVersion.man new/libXScrnSaver-1.2.1/man/XScreenSaverQueryVersion.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverQueryVersion.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverRegister.man new/libXScrnSaver-1.2.1/man/XScreenSaverRegister.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverRegister.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverRegister.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverSelectInput.man new/libXScrnSaver-1.2.1/man/XScreenSaverSelectInput.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverSelectInput.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverSelectInput.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverSetAttributes.man new/libXScrnSaver-1.2.1/man/XScreenSaverSetAttributes.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverSetAttributes.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverSetAttributes.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverSuspend.man new/libXScrnSaver-1.2.1/man/XScreenSaverSuspend.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverSuspend.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverSuspend.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverUnregister.man new/libXScrnSaver-1.2.1/man/XScreenSaverUnregister.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverUnregister.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverUnregister.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/XScreenSaverUnsetAttributes.man new/libXScrnSaver-1.2.1/man/XScreenSaverUnsetAttributes.man
--- old/libXScrnSaver-1.2.0/man/XScreenSaverUnsetAttributes.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXScrnSaver-1.2.1/man/XScreenSaverUnsetAttributes.man 2010-09-04 01:16:52.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xss.__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/libXScrnSaver-1.2.0/man/Xss.man new/libXScrnSaver-1.2.1/man/Xss.man
--- old/libXScrnSaver-1.2.0/man/Xss.man 2009-08-25 10:32:20.000000000 +0200
+++ new/libXScrnSaver-1.2.1/man/Xss.man 2010-10-07 06:14:42.000000000 +0200
@@ -1,7 +1,4 @@
.\"
-.\" $XFree86: xc/lib/Xss/Xss.man,v 1.1 2003/10/26 19:00:24 herrb Exp $
-.\" $XdotOrg: lib/XScrnSaver/man/Xss.man,v 1.2 2004/04/23 18:43:51 eich Exp $
-.\"
.\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved.
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
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/libXScrnSaver-1.2.0/missing new/libXScrnSaver-1.2.1/missing
--- old/libXScrnSaver-1.2.0/missing 2009-03-10 00:53:45.000000000 +0100
+++ new/libXScrnSaver-1.2.1/missing 2010-10-30 07:21:37.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 <pinard(a)iro.umontreal.ca>, 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 <bug-automake(a)gnu.org>."
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/libXScrnSaver-1.2.0/src/Makefile.am new/libXScrnSaver-1.2.1/src/Makefile.am
--- old/libXScrnSaver-1.2.0/src/Makefile.am 2009-03-10 00:25:30.000000000 +0100
+++ new/libXScrnSaver-1.2.1/src/Makefile.am 2010-02-25 08:39:07.000000000 +0100
@@ -2,7 +2,8 @@
-I$(top_srcdir)/include/X11 \
-I$(top_srcdir)/include/X11/extensions \
$(XSCRNSAVER_CFLAGS) \
- $(MALLOC_ZERO_CFLAGS)
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
lib_LTLIBRARIES = libXss.la
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/libXScrnSaver-1.2.0/src/XScrnSaver.c new/libXScrnSaver-1.2.1/src/XScrnSaver.c
--- old/libXScrnSaver-1.2.0/src/XScrnSaver.c 2009-03-10 00:25:30.000000000 +0100
+++ new/libXScrnSaver-1.2.1/src/XScrnSaver.c 2010-10-07 06:14:42.000000000 +0200
@@ -1,5 +1,4 @@
/*
- * $XConsortium: XScrnSaver.c,v 1.5 94/04/17 20:59:35 rws Exp $
*
Copyright (c) 1992 X Consortium
@@ -26,10 +25,7 @@
*
* Author: Keith Packard, MIT X Consortium
*/
-/* $XFree86: xc/lib/Xss/XScrnSaver.c,v 3.1 2001/10/28 03:32:40 tsi Exp $ */
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xext.h>
++++++ libXtst-1.1.0.tar.bz2 -> libXtst-1.2.0.tar.bz2 ++++++
++++ 48174 lines of diff (skipped)
++++++ libXxf86dga-1.1.1.tar.bz2 -> libXxf86dga-1.1.2.tar.bz2 ++++++
++++ 43859 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/libXxf86dga-1.1.1/ChangeLog new/libXxf86dga-1.1.2/ChangeLog
--- old/libXxf86dga-1.1.1/ChangeLog 2009-10-06 08:28:35.000000000 +0200
+++ new/libXxf86dga-1.1.2/ChangeLog 2010-10-30 03:00:52.000000000 +0200
@@ -1,3 +1,181 @@
+commit 3eb0d49a8d673c79ba9714d027f1ee056cf4b0b9
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 18:00:17 2010 -0700
+
+ libXxf86dga 1.1.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 967c47b8e431e1b4a25b3436ba4e130cc7eee5b5
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 17:58:37 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit a9cad8418292ee2291004d2c9ada7547120b53fd
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:04 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit a8a764e1c41a8f261f768e9ac2ef24e23ba6eedd
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Aug 17 14:37:23 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 <memsize(a)videotron.ca>
+
+commit 7395fb5197549ce048b9e759eb27cd7f4f284c66
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:28:39 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 <alan.coopersmith(a)oracle.com>
+
+commit 30a8e2d18fe6dc9fac599e2570360ebb27207811
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:26:35 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 86ece63cf0d038eb36e80cc4836eb387c407b773
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 07:08:11 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 5c9d042d4450d28c50258895885836253fbf5e61
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit e8483875af8417918ce99fac61982167f96acf17
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 1ad4c147bbaf1523adba2e9f4b289c0fb4360097
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 253089a20d1496ef4102d06d603f1755e5e6e746
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Jan 14 10:37:36 2010 -0500
+
+ COPYING: fix copyright notice format
+
+ Newlines and spaces.
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 639c859ee3b74088a50bc0402f99261bd5c0f3e9
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 20:56:48 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit cc8610353912c7002da001365cb9a27e1e02091a
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 6631f7b26574e665dfec6003ecc8d0bf77151ab4
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 7c8e098dece92f8ac824c8e2eb3e737cacee57e7
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Oct 27 15:07:26 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 8255d46aafed7f7527360b7b1dbf2333ad41444a
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 efd0fb6f31ee88887e16e98dca89473ff2bb56a1
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 990b19154368d9a1733636367d6a99d863d558ee
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Tue Oct 6 16:14:45 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/libXxf86dga-1.1.1/configure.ac new/libXxf86dga-1.1.2/configure.ac
--- old/libXxf86dga-1.1.1/configure.ac 2009-10-06 08:14:31.000000000 +0200
+++ new/libXxf86dga-1.1.2/configure.ac 2010-10-30 03:00:01.000000000 +0200
@@ -1,22 +1,24 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libXxf86dga, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT([libXxf86dga], [1.1.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXxf86dga])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.99.2])
-XXF86DGA_CFLAGS="$CWARNFLAGS $XXF86DGA_CFLAGS"
XORG_CHECK_MALLOC_ZERO
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/libXxf86dga-1.1.1/COPYING new/libXxf86dga-1.1.2/COPYING
--- old/libXxf86dga-1.1.1/COPYING 2009-03-10 00:27:24.000000000 +0100
+++ new/libXxf86dga-1.1.2/COPYING 2010-01-30 08:40:35.000000000 +0100
@@ -3,10 +3,24 @@
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, sublicence, 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:
+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 fur-
+nished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions 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 THE XFREE86 PROJECT 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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of the XFree86 Project 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 XFree86 Project.
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
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/libXxf86dga-1.1.1/INSTALL new/libXxf86dga-1.1.2/INSTALL
--- old/libXxf86dga-1.1.1/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/INSTALL 2010-10-30 03:00:52.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 `<wchar.h>' 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/libXxf86dga-1.1.1/Makefile.am new/libXxf86dga-1.1.2/Makefile.am
--- old/libXxf86dga-1.1.1/Makefile.am 2009-03-10 00:27:24.000000000 +0100
+++ new/libXxf86dga-1.1.2/Makefile.am 2010-04-10 02:47:09.000000000 +0200
@@ -3,12 +3,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86dga.pc
-EXTRA_DIST = xxf86dga.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
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/libXxf86dga-1.1.1/man/Makefile.am new/libXxf86dga-1.1.2/man/Makefile.am
--- old/libXxf86dga-1.1.1/man/Makefile.am 2009-03-10 00:27:24.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/Makefile.am 2010-10-30 02:58:31.000000000 +0200
@@ -1,86 +1,61 @@
#
-# Copyright 2005 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) 2005, 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 = XDGA.man
+libman_PRE = \
+ XDGA.man \
+ $(XDGA_shadows:=.man)
+
+XDGA_functions = \
+ XDGAQueryExtension \
+ XDGAQueryVersion \
+ XDGAQueryModes \
+ XDGASetMode \
+ XDGAOpenFramebuffer \
+ XDGACloseFramebuffer \
+ XDGASetViewport \
+ XDGAInstallColormap \
+ XDGACreateColormap \
+ XDGASelectInput \
+ XDGAFillRectangle \
+ XDGACopyArea \
+ XDGACopyTransparentArea \
+ XDGAGetViewportStatus \
+ XDGASync \
+ XDGASetClientVersion \
+ XDGAChangePixmapMode \
+ XDGAKeyEventToXKeyEvent
-BUILT_SOURCES = shadows.DONE
+XDGA_shadows = XF86DGA XFree86-DGA $(XDGA_functions)
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XDGA_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/__xconfigfile__/xorg.conf/g' \
- -e 's/__xservername__/Xorg/g' \
- -e 's/__appmansuffix__/$(APP_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)
-DGAFUNCS = XDGAQueryExtension \
- XDGAQueryVersion \
- XDGAQueryModes \
- XDGASetMode \
- XDGAOpenFramebuffer \
- XDGACloseFramebuffer \
- XDGASetViewport \
- XDGAInstallColormap \
- XDGACreateColormap \
- XDGASelectInput \
- XDGAFillRectangle \
- XDGACopyArea \
- XDGACopyTransparentArea \
- XDGAGetViewportStatus \
- XDGASync \
- XDGASetClientVersion \
- XDGAChangePixmapMode \
- XDGAKeyEventToXKeyEvent
-
-XDGA_shadows = XF86DGA XFree86-DGA $(DGAFUNCS)
-
-shadows.DONE:
- -rm -f $(XDGA_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XDGA_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XDGA.$(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/libXxf86dga-1.1.1/man/XDGAChangePixmapMode.man new/libXxf86dga-1.1.2/man/XDGAChangePixmapMode.man
--- old/libXxf86dga-1.1.1/man/XDGAChangePixmapMode.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAChangePixmapMode.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGACloseFramebuffer.man new/libXxf86dga-1.1.2/man/XDGACloseFramebuffer.man
--- old/libXxf86dga-1.1.1/man/XDGACloseFramebuffer.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGACloseFramebuffer.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGACopyArea.man new/libXxf86dga-1.1.2/man/XDGACopyArea.man
--- old/libXxf86dga-1.1.1/man/XDGACopyArea.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGACopyArea.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGACopyTransparentArea.man new/libXxf86dga-1.1.2/man/XDGACopyTransparentArea.man
--- old/libXxf86dga-1.1.1/man/XDGACopyTransparentArea.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGACopyTransparentArea.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGACreateColormap.man new/libXxf86dga-1.1.2/man/XDGACreateColormap.man
--- old/libXxf86dga-1.1.1/man/XDGACreateColormap.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGACreateColormap.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAFillRectangle.man new/libXxf86dga-1.1.2/man/XDGAFillRectangle.man
--- old/libXxf86dga-1.1.1/man/XDGAFillRectangle.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAFillRectangle.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAGetViewportStatus.man new/libXxf86dga-1.1.2/man/XDGAGetViewportStatus.man
--- old/libXxf86dga-1.1.1/man/XDGAGetViewportStatus.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAGetViewportStatus.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAInstallColormap.man new/libXxf86dga-1.1.2/man/XDGAInstallColormap.man
--- old/libXxf86dga-1.1.1/man/XDGAInstallColormap.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAInstallColormap.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAKeyEventToXKeyEvent.man new/libXxf86dga-1.1.2/man/XDGAKeyEventToXKeyEvent.man
--- old/libXxf86dga-1.1.1/man/XDGAKeyEventToXKeyEvent.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAKeyEventToXKeyEvent.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGA.man new/libXxf86dga-1.1.2/man/XDGA.man
--- old/libXxf86dga-1.1.1/man/XDGA.man 2009-03-10 00:27:24.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGA.man 2010-10-07 06:17:11.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $XFree86$
.\"
.TH XDGA 3 __vendorversion__
.SH NAME
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/libXxf86dga-1.1.1/man/XDGAOpenFramebuffer.man new/libXxf86dga-1.1.2/man/XDGAOpenFramebuffer.man
--- old/libXxf86dga-1.1.1/man/XDGAOpenFramebuffer.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAOpenFramebuffer.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAQueryExtension.man new/libXxf86dga-1.1.2/man/XDGAQueryExtension.man
--- old/libXxf86dga-1.1.1/man/XDGAQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAQueryExtension.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAQueryModes.man new/libXxf86dga-1.1.2/man/XDGAQueryModes.man
--- old/libXxf86dga-1.1.1/man/XDGAQueryModes.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAQueryModes.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGAQueryVersion.man new/libXxf86dga-1.1.2/man/XDGAQueryVersion.man
--- old/libXxf86dga-1.1.1/man/XDGAQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGAQueryVersion.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGASelectInput.man new/libXxf86dga-1.1.2/man/XDGASelectInput.man
--- old/libXxf86dga-1.1.1/man/XDGASelectInput.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGASelectInput.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGASetClientVersion.man new/libXxf86dga-1.1.2/man/XDGASetClientVersion.man
--- old/libXxf86dga-1.1.1/man/XDGASetClientVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGASetClientVersion.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGASetMode.man new/libXxf86dga-1.1.2/man/XDGASetMode.man
--- old/libXxf86dga-1.1.1/man/XDGASetMode.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGASetMode.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGASetViewport.man new/libXxf86dga-1.1.2/man/XDGASetViewport.man
--- old/libXxf86dga-1.1.1/man/XDGASetViewport.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGASetViewport.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XDGASync.man new/libXxf86dga-1.1.2/man/XDGASync.man
--- old/libXxf86dga-1.1.1/man/XDGASync.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XDGASync.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XF86DGA.man new/libXxf86dga-1.1.2/man/XF86DGA.man
--- old/libXxf86dga-1.1.1/man/XF86DGA.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XF86DGA.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/man/XFree86-DGA.man new/libXxf86dga-1.1.2/man/XFree86-DGA.man
--- old/libXxf86dga-1.1.1/man/XFree86-DGA.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86dga-1.1.2/man/XFree86-DGA.man 2010-09-04 01:17:14.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XDGA.__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/libXxf86dga-1.1.1/src/config.h.in new/libXxf86dga-1.1.2/src/config.h.in
--- old/libXxf86dga-1.1.1/src/config.h.in 2009-10-06 08:20:07.000000000 +0200
+++ new/libXxf86dga-1.1.2/src/config.h.in 2010-10-30 03:00:45.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/libXxf86dga-1.1.1/src/Makefile.am new/libXxf86dga-1.1.2/src/Makefile.am
--- old/libXxf86dga-1.1.1/src/Makefile.am 2009-09-21 02:11:11.000000000 +0200
+++ new/libXxf86dga-1.1.2/src/Makefile.am 2010-02-25 08:39:37.000000000 +0100
@@ -2,8 +2,10 @@
libXxf86dga_la_SOURCES = XF86DGA.c XF86DGA2.c
-AM_CFLAGS = -I $(top_srcdir)/include \
- $(XXF86DGA_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I $(top_srcdir)/include \
+ $(XXF86DGA_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS) \
+ $(CWARNFLAGS)
libXxf86dga_la_LIBADD = $(XXF86DGA_LIBS)
libXxf86dga_la_LDFLAGS = -version-number 1:0:0
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/libXxf86dga-1.1.1/src/XF86DGA2.c new/libXxf86dga-1.1.2/src/XF86DGA2.c
--- old/libXxf86dga-1.1.1/src/XF86DGA2.c 2009-10-06 07:37:45.000000000 +0200
+++ new/libXxf86dga-1.1.2/src/XF86DGA2.c 2010-10-07 06:17:11.000000000 +0200
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.23 2003/05/05 20:42:30 tsi Exp $ */
/*
Copyright (c) 1995 Jon Tombs
@@ -15,8 +14,6 @@
#include <os2.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xxf86dga.h>
#include <X11/extensions/xf86dgaproto.h>
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/libXxf86dga-1.1.1/src/XF86DGA.c new/libXxf86dga-1.1.2/src/XF86DGA.c
--- old/libXxf86dga-1.1.1/src/XF86DGA.c 2009-10-06 07:38:19.000000000 +0200
+++ new/libXxf86dga-1.1.2/src/XF86DGA.c 2010-07-09 00:24:15.000000000 +0200
@@ -58,9 +58,6 @@
#undef _SC_PAGESIZE
#endif
-
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xxf86dga.h>
#include <X11/extensions/xf86dgaproto.h>
++++++ libXxf86vm-1.1.0.tar.bz2 -> libXxf86vm-1.1.1.tar.bz2 ++++++
++++ 44382 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/libXxf86vm-1.1.0/ChangeLog new/libXxf86vm-1.1.1/ChangeLog
--- old/libXxf86vm-1.1.0/ChangeLog 2009-10-05 04:02:08.000000000 +0200
+++ new/libXxf86vm-1.1.1/ChangeLog 2010-10-30 03:05:25.000000000 +0200
@@ -1,3 +1,170 @@
+commit 6f22da39b65983a582d2055e9e43f5dbc0412f1f
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 18:04:50 2010 -0700
+
+ libXxf86vm 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit fe0659724002e65af6a68be53f57bb8ba85324fe
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 18:03:51 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 84c7286a799d2368ce868afb31b373f8486724c2
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:04 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit b6d645596f284550350d8c690cfcce89d019ab60
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Aug 17 19:53:37 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 <memsize(a)videotron.ca>
+
+commit 01df17daf923b7eeeb3476149d189c5dc8da3bf8
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:50:02 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 <alan.coopersmith(a)oracle.com>
+
+commit a3603591f3086f7aeb92b193b2736733b4e79047
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:37:15 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 <alan.coopersmith(a)oracle.com>
+
+commit 6be94fa76ef3e2c41c7cb8487e639f0312d3b369
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 07:10:51 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 15319d63a389bd9af1819f53a2d021edcd6180f2
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit a3ed63ba72d767371174d1442c810144b0d2f8b7
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 02155a7f70ad94026a7c138081c4249cffbc25a7
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Jan 14 10:15:23 2010 -0500
+
+ COPYING: fix copyright notice incorrect format
+
+ Refer to: XF86VMode.c
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit eba6628379b65326453ea12ddd8cb33b144f3049
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 20:55:56 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit 0d976427d1229b65baa489275c62e47762b2803e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Fri Nov 27 20:56:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit e9fd67ec28d4402a498af78f34815cc9d22d6c73
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 d7cc1a08bfc5c780d0a4f3e0193ff91d0076713c
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Oct 27 15:07:26 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 2bb8c8fcabebf00fdc12b2649459b920e816f382
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 9888ab7cf91cc4c7bf2a545ebc3b8bf0a002aa39
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 b4d998a026f03aa2fea74a909f3edea4e4aed5a1
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Fri Oct 2 09:43:30 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/libXxf86vm-1.1.0/configure.ac new/libXxf86vm-1.1.1/configure.ac
--- old/libXxf86vm-1.1.0/configure.ac 2009-10-05 03:59:25.000000000 +0200
+++ new/libXxf86vm-1.1.1/configure.ac 2010-10-30 03:04:31.000000000 +0200
@@ -1,18 +1,21 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libXxf86vm, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT([libXxf86vm], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXxf86vm])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(src/config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 2.2.99.1])
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/libXxf86vm-1.1.0/COPYING new/libXxf86vm-1.1.1/COPYING
--- old/libXxf86vm-1.1.0/COPYING 2009-03-10 00:27:27.000000000 +0100
+++ new/libXxf86vm-1.1.1/COPYING 2010-01-30 08:40:42.000000000 +0100
@@ -1,10 +1,25 @@
-Copyright (c) 1995 Kaleb S. Keithley
-All Rights Reserved.
+Copyright (c) 1995 Kaleb S. KEITHLEY
-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, sublicence, 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:
+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 shall be included in all copies or substantial portions 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 KALEB S. KEITHLEY 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.
+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 Kaleb S. KEITHLEY 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 Kaleb S. Keithley shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Kaleb S. Keithley.
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY.
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/libXxf86vm-1.1.0/INSTALL new/libXxf86vm-1.1.1/INSTALL
--- old/libXxf86vm-1.1.0/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/INSTALL 2010-10-30 03:05:25.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 `<wchar.h>' 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/libXxf86vm-1.1.0/Makefile.am new/libXxf86vm-1.1.1/Makefile.am
--- old/libXxf86vm-1.1.0/Makefile.am 2009-03-10 00:27:27.000000000 +0100
+++ new/libXxf86vm-1.1.1/Makefile.am 2010-04-10 02:47:14.000000000 +0200
@@ -3,12 +3,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86vm.pc
-EXTRA_DIST = xxf86vm.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
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/libXxf86vm-1.1.0/man/Makefile.am new/libXxf86vm-1.1.1/man/Makefile.am
--- old/libXxf86vm-1.1.0/man/Makefile.am 2009-03-10 00:27:27.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/Makefile.am 2010-10-30 03:03:43.000000000 +0200
@@ -1,90 +1,64 @@
#
-# Copyright 2005 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) 2005, 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 = XF86VM.man
-
-BUILT_SOURCES = shadows.DONE
+libman_PRE = \
+ XF86VM.man \
+ $(XF86VM_shadows:=.man)
+
+XF86VM_shadows = \
+ XF86VidModeQueryExtension \
+ XF86VidModeQueryVersion \
+ XF86VidModeGetModeLine \
+ XF86VidModeGetAllModeLines \
+ XF86VidModeDeleteModeLine \
+ XF86VidModeModModeLine \
+ XF86VidModeSwitchMode \
+ XF86VidModeSwitchToMode \
+ XF86VidModeLockModeSwitch \
+ XF86VidModeGetMonitor \
+ XF86VidModeGetViewPort \
+ XF86VidModeSetViewPort \
+ XF86VidModeValidateModeLine \
+ XF86VidModeSetClientVersion \
+ XF86VidModeGetDotClocks \
+ XF86VidModeGetGamma \
+ XF86VidModeSetGamma \
+ XF86VidModeSetGammaRamp \
+ XF86VidModeGetGammaRamp \
+ XF86VidModeGetGammaRampSize \
+ XF86VidModeGetPermissions
EXTRA_DIST = $(libman_PRE)
+CLEANFILES = $(libman_DATA)
-CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
-
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
- $(XF86VM_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@)
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
.man.$(LIB_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
-XF86VM_shadows = \
- XF86VidModeQueryExtension \
- XF86VidModeQueryVersion \
- XF86VidModeGetModeLine \
- XF86VidModeGetAllModeLines \
- XF86VidModeDeleteModeLine \
- XF86VidModeModModeLine \
- XF86VidModeSwitchMode \
- XF86VidModeSwitchToMode \
- XF86VidModeLockModeSwitch \
- XF86VidModeGetMonitor \
- XF86VidModeGetViewPort \
- XF86VidModeSetViewPort \
- XF86VidModeValidateModeLine \
- XF86VidModeSetClientVersion \
- XF86VidModeGetDotClocks \
- XF86VidModeGetGamma \
- XF86VidModeSetGamma \
- XF86VidModeSetGammaRamp \
- XF86VidModeGetGammaRamp \
- XF86VidModeGetGammaRampSize \
- XF86VidModeGetPermissions
-
-shadows.DONE:
- -rm -f $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@)
- (for i in $(XF86VM_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/XF86VM.$(LIB_MAN_SUFFIX) > $$i; \
- done)
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/libXxf86vm-1.1.0/man/XF86VidModeDeleteModeLine.man new/libXxf86vm-1.1.1/man/XF86VidModeDeleteModeLine.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeDeleteModeLine.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeDeleteModeLine.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetAllModeLines.man new/libXxf86vm-1.1.1/man/XF86VidModeGetAllModeLines.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetAllModeLines.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetAllModeLines.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetDotClocks.man new/libXxf86vm-1.1.1/man/XF86VidModeGetDotClocks.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetDotClocks.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetDotClocks.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetGamma.man new/libXxf86vm-1.1.1/man/XF86VidModeGetGamma.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetGamma.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetGamma.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetGammaRamp.man new/libXxf86vm-1.1.1/man/XF86VidModeGetGammaRamp.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetGammaRamp.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetGammaRamp.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetGammaRampSize.man new/libXxf86vm-1.1.1/man/XF86VidModeGetGammaRampSize.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetGammaRampSize.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetGammaRampSize.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetModeLine.man new/libXxf86vm-1.1.1/man/XF86VidModeGetModeLine.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetModeLine.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetModeLine.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetMonitor.man new/libXxf86vm-1.1.1/man/XF86VidModeGetMonitor.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetMonitor.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetMonitor.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetPermissions.man new/libXxf86vm-1.1.1/man/XF86VidModeGetPermissions.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetPermissions.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetPermissions.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeGetViewPort.man new/libXxf86vm-1.1.1/man/XF86VidModeGetViewPort.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeGetViewPort.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeGetViewPort.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeLockModeSwitch.man new/libXxf86vm-1.1.1/man/XF86VidModeLockModeSwitch.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeLockModeSwitch.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeLockModeSwitch.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeModModeLine.man new/libXxf86vm-1.1.1/man/XF86VidModeModModeLine.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeModModeLine.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeModModeLine.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeQueryExtension.man new/libXxf86vm-1.1.1/man/XF86VidModeQueryExtension.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeQueryExtension.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeQueryExtension.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeQueryVersion.man new/libXxf86vm-1.1.1/man/XF86VidModeQueryVersion.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeQueryVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeQueryVersion.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeSetClientVersion.man new/libXxf86vm-1.1.1/man/XF86VidModeSetClientVersion.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeSetClientVersion.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeSetClientVersion.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeSetGamma.man new/libXxf86vm-1.1.1/man/XF86VidModeSetGamma.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeSetGamma.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeSetGamma.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeSetGammaRamp.man new/libXxf86vm-1.1.1/man/XF86VidModeSetGammaRamp.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeSetGammaRamp.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeSetGammaRamp.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeSetViewPort.man new/libXxf86vm-1.1.1/man/XF86VidModeSetViewPort.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeSetViewPort.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeSetViewPort.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeSwitchMode.man new/libXxf86vm-1.1.1/man/XF86VidModeSwitchMode.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeSwitchMode.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeSwitchMode.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeSwitchToMode.man new/libXxf86vm-1.1.1/man/XF86VidModeSwitchToMode.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeSwitchToMode.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeSwitchToMode.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VidModeValidateModeLine.man new/libXxf86vm-1.1.1/man/XF86VidModeValidateModeLine.man
--- old/libXxf86vm-1.1.0/man/XF86VidModeValidateModeLine.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VidModeValidateModeLine.man 2010-09-04 01:17:24.000000000 +0200
@@ -0,0 +1 @@
+.so man__libmansuffix__/XF86VM.__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/libXxf86vm-1.1.0/man/XF86VM.man new/libXxf86vm-1.1.1/man/XF86VM.man
--- old/libXxf86vm-1.1.0/man/XF86VM.man 2009-03-10 00:27:27.000000000 +0100
+++ new/libXxf86vm-1.1.1/man/XF86VM.man 2010-10-07 06:17:21.000000000 +0200
@@ -1,11 +1,5 @@
-.\" $XdotOrg: lib/Xxf86vm/man/XF86VM.man,v 1.2 2004/04/23 19:23:08 eich Exp $
-.\" $TOG: XF86VM.man /main/6 1997/07/19 10:30:39 kaleb $
-.\"
-.\"
-.\"
.\"
.\" Copyright (c) 1996 Joe Moss, The XFree86 Project
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.14 2003/10/02 13:29:56 eich Exp $
.\"
.de ZN
.ie t \fB\^\\$1\^\fR\\$2
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/libXxf86vm-1.1.0/missing new/libXxf86vm-1.1.1/missing
--- old/libXxf86vm-1.1.0/missing 2009-03-10 00:55:30.000000000 +0100
+++ new/libXxf86vm-1.1.1/missing 2010-10-30 03:05:20.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 <pinard(a)iro.umontreal.ca>, 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 <bug-automake(a)gnu.org>."
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/libXxf86vm-1.1.0/src/config.h.in new/libXxf86vm-1.1.1/src/config.h.in
--- old/libXxf86vm-1.1.0/src/config.h.in 2009-10-05 04:00:41.000000000 +0200
+++ new/libXxf86vm-1.1.1/src/config.h.in 2010-10-30 03:05:19.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/libXxf86vm-1.1.0/src/XF86VMode.c new/libXxf86vm-1.1.1/src/XF86VMode.c
--- old/libXxf86vm-1.1.0/src/XF86VMode.c 2009-08-28 01:38:29.000000000 +0200
+++ new/libXxf86vm-1.1.1/src/XF86VMode.c 2010-07-09 00:33:00.000000000 +0200
@@ -30,8 +30,6 @@
/* THIS IS NOT AN X CONSORTIUM STANDARD */
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/xf86vmproto.h>
#include <X11/extensions/xf86vmode.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libxkbfile for openSUSE:Factory
checked in at Tue Nov 2 10:45:41 CET 2010.
--------
--- xorg-x11-libxkbfile/xorg-x11-libxkbfile.changes 2010-04-04 16:04:29.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libxkbfile/xorg-x11-libxkbfile.changes 2010-10-30 17:50:46.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Oct 30 15:49:40 UTC 2010 - sndirsch(a)novell.com
+
+- libxkbfile 1.0.7
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libxkbfile-1.0.6.tar.bz2
New:
----
libxkbfile-1.0.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libxkbfile.spec ++++++
--- /var/tmp/diff_new_pack.oqhqkk/_old 2010-11-02 10:45:05.000000000 +0100
+++ /var/tmp/diff_new_pack.oqhqkk/_new 2010-11-02 10:45:05.000000000 +0100
@@ -19,11 +19,11 @@
Name: xorg-x11-libxkbfile
-%define dirsuffix 1.0.6
+%define dirsuffix 1.0.7
BuildRequires: pkgconfig xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 4
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
++++++ libxkbfile-1.0.6.tar.bz2 -> libxkbfile-1.0.7.tar.bz2 ++++++
++++ 62506 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/libxkbfile-1.0.6/ChangeLog new/libxkbfile-1.0.7/ChangeLog
--- old/libxkbfile-1.0.6/ChangeLog 2009-10-07 02:18:08.000000000 +0200
+++ new/libxkbfile-1.0.7/ChangeLog 2010-10-30 03:16:31.000000000 +0200
@@ -1,3 +1,125 @@
+commit 5eea77b2c35c10baf899d2b03a85a462fdcf8f93
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 18:16:00 2010 -0700
+
+ libxkbfile 1.0.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit ce593fce1f7930135d1c52711ef1945a3e7418b0
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:04 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 57c03e52e6b4e3ed54df5fdd778865467d08e119
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 06:59:48 2010 -0300
+
+ Purge macro NEED_EVENTS
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 2db176bf5c644cf974f9137bda19e997500d04b1
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit bce9d460a8759c866908c945ceb609de6bf03921
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 79cb4add177bee5dd451a8d459cb344451ea04a8
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Fri Nov 27 20:56:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 8f2565e71d91a81ab0fe11ac7052c9f4bdfcd8fa
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:11 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 6e0c505690db8bedc6cbce726bc02b049e1dafa6
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 5b797b80804946573313e1202c0ef89ce8980bf8
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 fd0dd9539d3bb2471c26187c96b55a542d754c30
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:20 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 2ce3061947dfaf113d6c324efb2b82be2fae028e
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:27 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 <jeremyhu(a)freedesktop.org>
+
commit fa9520d5a63e181c05dd850223a1916e37e71a13
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Tue Oct 6 17:08:58 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libxkbfile-1.0.6/config.h.in new/libxkbfile-1.0.7/config.h.in
--- old/libxkbfile-1.0.6/config.h.in 2009-10-07 02:09:28.000000000 +0200
+++ new/libxkbfile-1.0.7/config.h.in 2010-10-30 03:16:24.000000000 +0200
@@ -33,6 +33,10 @@
/* 'Unlocked stdio' */
#undef HAVE_UNLOCKED_STDIO
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Do not have 'strcasecmp'. */
#undef NEED_STRCASECMP
@@ -51,6 +55,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/libxkbfile-1.0.6/configure.ac new/libxkbfile-1.0.7/configure.ac
--- old/libxkbfile-1.0.6/configure.ac 2009-10-07 02:05:47.000000000 +0200
+++ new/libxkbfile-1.0.7/configure.ac 2010-10-30 03:15:45.000000000 +0200
@@ -21,22 +21,25 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libxkbfile, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libxkbfile)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libxkbfile], [1.0.7],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libxkbfile])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
[Do not have 'strcasecmp'.]))
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/libxkbfile-1.0.6/include/X11/extensions/XKBbells.h new/libxkbfile-1.0.7/include/X11/extensions/XKBbells.h
--- old/libxkbfile-1.0.6/include/X11/extensions/XKBbells.h 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/include/X11/extensions/XKBbells.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,7 +1,6 @@
#ifndef _XKBBELLS_H_
#define _XKBBELLS_H_ 1
-/* $Xorg: XKBbells.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#define XkbBN_Info "Info"
#define XkbBN_Warning "Warning"
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/libxkbfile-1.0.6/include/X11/extensions/XKBconfig.h new/libxkbfile-1.0.7/include/X11/extensions/XKBconfig.h
--- old/libxkbfile-1.0.6/include/X11/extensions/XKBconfig.h 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/include/X11/extensions/XKBconfig.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,7 +1,6 @@
#ifndef _XKBCONFIG_H_
#define _XKBCONFIG_H_ 1
-/* $Xorg: XKBconfig.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.5 2001/01/17 19:43:39 dawes Exp $ */
typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr;
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/libxkbfile-1.0.6/include/X11/extensions/XKBfile.h new/libxkbfile-1.0.7/include/X11/extensions/XKBfile.h
--- old/libxkbfile-1.0.6/include/X11/extensions/XKBfile.h 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/include/X11/extensions/XKBfile.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,9 +1,7 @@
-/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.6 2003/10/24 16:33:09 tsi Exp $ */
#ifndef _XKBFILE_H_
#define _XKBFILE_H_ 1
-/* $Xorg: XKBfile.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
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/libxkbfile-1.0.6/include/X11/extensions/XKBrules.h new/libxkbfile-1.0.7/include/X11/extensions/XKBrules.h
--- old/libxkbfile-1.0.6/include/X11/extensions/XKBrules.h 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/include/X11/extensions/XKBrules.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,7 +1,6 @@
#ifndef _XKBRULES_H_
#define _XKBRULES_H_ 1
-/* $Xorg: XKBrules.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.5 2002/11/26 01:43:25 dawes Exp $ */
/***====================================================================***/
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/libxkbfile-1.0.6/include/X11/extensions/XKMformat.h new/libxkbfile-1.0.7/include/X11/extensions/XKMformat.h
--- old/libxkbfile-1.0.6/include/X11/extensions/XKMformat.h 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/include/X11/extensions/XKMformat.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: XKMformat.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifndef _XKMFORMAT_H_
#define _XKMFORMAT_H_ 1
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/libxkbfile-1.0.6/include/X11/extensions/XKM.h new/libxkbfile-1.0.7/include/X11/extensions/XKM.h
--- old/libxkbfile-1.0.6/include/X11/extensions/XKM.h 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/include/X11/extensions/XKM.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: XKM.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
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/libxkbfile-1.0.6/INSTALL new/libxkbfile-1.0.7/INSTALL
--- old/libxkbfile-1.0.6/INSTALL 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/INSTALL 2010-10-30 03:16:31.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 `<wchar.h>' 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/libxkbfile-1.0.6/Makefile.am new/libxkbfile-1.0.7/Makefile.am
--- old/libxkbfile-1.0.6/Makefile.am 2009-01-30 00:19:44.000000000 +0100
+++ new/libxkbfile-1.0.7/Makefile.am 2010-04-10 02:46:23.000000000 +0200
@@ -24,12 +24,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xkbfile.pc
-EXTRA_DIST = xkbfile.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
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/libxkbfile-1.0.6/src/cout.c new/libxkbfile-1.0.7/src/cout.c
--- old/libxkbfile-1.0.6/src/cout.c 2009-01-22 16:17:10.000000000 +0100
+++ new/libxkbfile-1.0.7/src/cout.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: cout.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
- /* $XFree86: xc/lib/xkbfile/cout.c,v 3.8 2003/02/03 20:12:00 paulo Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
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/libxkbfile-1.0.6/src/maprules.c new/libxkbfile-1.0.7/src/maprules.c
--- old/libxkbfile-1.0.6/src/maprules.c 2009-05-08 20:23:00.000000000 +0200
+++ new/libxkbfile-1.0.7/src/maprules.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: maprules.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -56,7 +54,6 @@
#else
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/X.h>
#include <X11/Xos.h>
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/libxkbfile-1.0.6/src/srvmisc.c new/libxkbfile-1.0.7/src/srvmisc.c
--- old/libxkbfile-1.0.6/src/srvmisc.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/srvmisc.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: srvmisc.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.4 2001/10/28 03:32:47 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
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/libxkbfile-1.0.6/src/xkbatom.c new/libxkbfile-1.0.7/src/xkbatom.c
--- old/libxkbfile-1.0.6/src/xkbatom.c 2009-01-30 00:19:44.000000000 +0100
+++ new/libxkbfile-1.0.7/src/xkbatom.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbatom.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -71,7 +70,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.8 2001/12/14 19:57:03 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
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/libxkbfile-1.0.6/src/xkbbells.c new/libxkbfile-1.0.7/src/xkbbells.c
--- old/libxkbfile-1.0.6/src/xkbbells.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkbbells.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbbells.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
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/libxkbfile-1.0.6/src/xkbconfig.c new/libxkbfile-1.0.7/src/xkbconfig.c
--- old/libxkbfile-1.0.6/src/xkbconfig.c 2009-01-30 00:19:44.000000000 +0100
+++ new/libxkbfile-1.0.7/src/xkbconfig.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbconfig.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -51,7 +49,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
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/libxkbfile-1.0.6/src/xkbdraw.c new/libxkbfile-1.0.7/src/xkbdraw.c
--- old/libxkbfile-1.0.6/src/xkbdraw.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkbdraw.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbdraw.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.3 2001/07/29 05:01:13 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
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/libxkbfile-1.0.6/src/xkberrs.c new/libxkbfile-1.0.7/src/xkberrs.c
--- old/libxkbfile-1.0.6/src/xkberrs.c 2009-01-30 00:19:44.000000000 +0100
+++ new/libxkbfile-1.0.7/src/xkberrs.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkberrs.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
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/libxkbfile-1.0.6/src/XKBfileInt.h new/libxkbfile-1.0.7/src/XKBfileInt.h
--- old/libxkbfile-1.0.6/src/XKBfileInt.h 2009-05-08 20:23:00.000000000 +0200
+++ new/libxkbfile-1.0.7/src/XKBfileInt.h 2010-10-07 06:13:15.000000000 +0200
@@ -1,7 +1,6 @@
#ifndef _XKBFILEINT_H_
#define _XKBFILEINT_H_ 1
-/* $Xorg: XKBfileInt.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -27,7 +26,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86$ */
#include "XKBfile.h"
#include <string.h>
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/libxkbfile-1.0.6/src/xkbmisc.c new/libxkbfile-1.0.7/src/xkbmisc.c
--- old/libxkbfile-1.0.6/src/xkbmisc.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkbmisc.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbmisc.c,v 1.4 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -51,7 +49,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
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/libxkbfile-1.0.6/src/xkbout.c new/libxkbfile-1.0.7/src/xkbout.c
--- old/libxkbfile-1.0.6/src/xkbout.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkbout.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -49,7 +47,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
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/libxkbfile-1.0.6/src/xkbtext.c new/libxkbfile-1.0.7/src/xkbtext.c
--- old/libxkbfile-1.0.6/src/xkbtext.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkbtext.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkbtext.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -50,7 +48,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
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/libxkbfile-1.0.6/src/xkmout.c new/libxkbfile-1.0.7/src/xkmout.c
--- old/libxkbfile-1.0.6/src/xkmout.c 2006-07-11 20:06:35.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkmout.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkmout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.5 2001/07/25 15:04:58 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
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/libxkbfile-1.0.6/src/xkmread.c new/libxkbfile-1.0.7/src/xkmread.c
--- old/libxkbfile-1.0.6/src/xkmread.c 2009-05-08 20:23:00.000000000 +0200
+++ new/libxkbfile-1.0.7/src/xkmread.c 2010-10-07 06:13:15.000000000 +0200
@@ -1,4 +1,3 @@
-/* $Xorg: xkmread.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */
/************************************************************
Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc.
@@ -24,7 +23,6 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
-/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
@@ -52,7 +50,6 @@
#else
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "misc.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libXv for openSUSE:Factory
checked in at Tue Nov 2 10:44:53 CET 2010.
--------
--- xorg-x11-libXv/xorg-x11-libXv.changes 2010-04-04 16:00:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libXv/xorg-x11-libXv.changes 2010-10-30 17:48:56.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Oct 30 15:47:53 UTC 2010 - sndirsch(a)novell.com
+
+- libXv 1.0.6
+ * This minor maintenance release provides the usual recent
+ collection of build configuration improvements and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXv-1.0.5.tar.bz2
New:
----
libXv-1.0.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libXv.spec ++++++
--- /var/tmp/diff_new_pack.UuDuou/_old 2010-11-02 10:43:14.000000000 +0100
+++ /var/tmp/diff_new_pack.UuDuou/_new 2010-11-02 10:43:14.000000000 +0100
@@ -19,11 +19,11 @@
Name: xorg-x11-libXv
-%define dirsuffix 1.0.5
+%define dirsuffix 1.0.6
BuildRequires: pkgconfig xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 4
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: xorg-x11-libs:/usr/X11R6/%{_lib}/libXv.so.1
++++++ libXv-1.0.5.tar.bz2 -> libXv-1.0.6.tar.bz2 ++++++
++++ 63119 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/libXv-1.0.5/ChangeLog new/libXv-1.0.6/ChangeLog
--- old/libXv-1.0.5/ChangeLog 2009-10-03 11:15:19.000000000 +0200
+++ new/libXv-1.0.6/ChangeLog 2010-10-30 02:53:52.000000000 +0200
@@ -1,3 +1,175 @@
+commit e34fff44ebc4f8c258df127f6f80d0a1aa86a25d
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 17:52:32 2010 -0700
+
+ libXv 1.0.6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 6e0da1da31552faaba26a351be0a4cf2d5964b05
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 17:51:53 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4c2bc9a94ee759423adbc4e7c99b9bf9fea692ec
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:30:04 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit ec92e24e86363fcbc14f8dce9739a430f68b998f
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Aug 18 17:29:15 2010 -0400
+
+ man: whitespace management
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 7bb70e6f8f394775d5d7ed7035a6d4b2accd2892
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Aug 18 17:23:31 2010 -0400
+
+ man: remove unrequired local fix for bug 5628
+
+ 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 <memsize(a)videotron.ca>
+
+commit 14cf5e3d19488f9a36824a01d4aba4a7f5ebc1cd
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Thu Jul 8 15:21:36 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
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit e106f955dfc23798975ef14b3d3400aff39eced9
+Author: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+Date: Thu Jul 1 07:07:12 2010 -0300
+
+ Purge macro NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo(a)yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti(a)nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 481033e52111a42ae80c2814a499a068d7dc4771
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit ea333fad90bce73c95a5ac310c127e22d6b41c6c
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 <memsize(a)videotron.ca>
+
+commit 917a09fe40630d9ba2ac7f2f48636989f3163580
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 20:55:17 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit f0225573605729797a0edd00276f4704f9cda3c2
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 f6ab500cf3d00bfa49070007c006e500253b6d84
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 fec734de503d63bb0abce9088be2e6655e82f800
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Oct 27 15:07:26 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 f0b191321146550b88a94233b9677e32044b6c0e
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 9ae8551458ee56b7ea19066023da64c7e24ea9f3
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+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 05974c72286a9556ebf5ff541967fa53f75a55a8
+Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
+Date: Wed Oct 21 12:47:26 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 <jeremyhu(a)freedesktop.org>
+
commit 5be9a0099a83d1acf464640e930518a4c46c0920
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Sat Oct 3 02:12:52 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXv-1.0.5/config.h.in new/libXv-1.0.6/config.h.in
--- old/libXv-1.0.5/config.h.in 2009-10-03 11:14:29.000000000 +0200
+++ new/libXv-1.0.6/config.h.in 2010-10-30 02:53:00.000000000 +0200
@@ -30,6 +30,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -45,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/libXv-1.0.5/configure.ac new/libXv-1.0.6/configure.ac
--- old/libXv-1.0.5/configure.ac 2009-10-03 10:55:17.000000000 +0200
+++ new/libXv-1.0.6/configure.ac 2010-10-30 02:52:19.000000000 +0200
@@ -21,22 +21,24 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
-AC_INIT(libXv, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXv)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_INIT([libXv], [1.0.6],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXv])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS, 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
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(XV, x11 xext xextproto videoproto)
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/libXv-1.0.5/include/X11/extensions/Xvlib.h new/libXv-1.0.6/include/X11/extensions/Xvlib.h
--- old/libXv-1.0.5/include/X11/extensions/Xvlib.h 2009-02-03 05:46:40.000000000 +0100
+++ new/libXv-1.0.6/include/X11/extensions/Xvlib.h 2010-10-07 06:16:59.000000000 +0200
@@ -21,7 +21,6 @@
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */
#ifndef XVLIB_H
#define XVLIB_H
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/libXv-1.0.5/INSTALL new/libXv-1.0.6/INSTALL
--- old/libXv-1.0.5/INSTALL 2006-07-11 20:06:00.000000000 +0200
+++ new/libXv-1.0.6/INSTALL 2010-10-30 02:53:52.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 `<wchar.h>' 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/libXv-1.0.5/Makefile.am new/libXv-1.0.6/Makefile.am
--- old/libXv-1.0.5/Makefile.am 2009-02-03 05:46:40.000000000 +0100
+++ new/libXv-1.0.6/Makefile.am 2010-04-10 02:47:03.000000000 +0200
@@ -24,14 +24,17 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xv.pc
-EXTRA_DIST = xv.pc.in 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/libXv-1.0.5/man/Makefile.am new/libXv-1.0.6/man/Makefile.am
--- old/libXv-1.0.5/man/Makefile.am 2009-10-03 10:52:45.000000000 +0200
+++ new/libXv-1.0.6/man/Makefile.am 2010-10-30 02:51:38.000000000 +0200
@@ -1,79 +1,64 @@
#
-# Copyright 2005 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) 2005, 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)
-libman_PRE = \
- Xv.man \
- XvCreateImage.man \
- XvFreeAdaptorInfo.man \
- XvFreeEncodingInfo.man \
- XvGetPortAttribute.man \
- XvGetStill.man \
- XvGetVideo.man \
- XvGrabPort.man \
- XvListImageFormats.man \
- XvPortNotify.man \
- XvPutImage.man \
- XvPutStill.man \
- XvPutVideo.man \
- XvQueryAdaptors.man \
- XvQueryBestSize.man \
- XvQueryEncodings.man \
- XvQueryExtension.man \
- XvQueryPortAttributes.man \
- XvSelectPortNotify.man \
- XvSelectVideoNotify.man \
- XvSetPortAttribute.man \
- XvShmCreateImage.man \
- XvShmPutImage.man \
- XvStopVideo.man \
- XvUngrabPort.man \
- XvVideoNotify.man
+libman_PRE = \
+ Xv.man \
+ XvCreateImage.man \
+ XvFreeAdaptorInfo.man \
+ XvFreeEncodingInfo.man \
+ XvGetPortAttribute.man \
+ XvGetStill.man \
+ XvGetVideo.man \
+ XvGrabPort.man \
+ XvListImageFormats.man \
+ XvPortNotify.man \
+ XvPutImage.man \
+ XvPutStill.man \
+ XvPutVideo.man \
+ XvQueryAdaptors.man \
+ XvQueryBestSize.man \
+ XvQueryEncodings.man \
+ XvQueryExtension.man \
+ XvQueryPortAttributes.man \
+ XvSelectPortNotify.man \
+ XvSelectVideoNotify.man \
+ XvSetPortAttribute.man \
+ XvShmCreateImage.man \
+ XvShmPutImage.man \
+ XvStopVideo.man \
+ XvUngrabPort.man \
+ XvVideoNotify.man
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
-
EXTRA_DIST = $(libman_PRE) xv-library-v2.2.txt
CLEANFILES = $(libman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__libmandirsuffix__/$(LIB_MAN_DIR_SUFFIX)/g' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(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/libXv-1.0.5/man/XvShmCreateImage.man new/libXv-1.0.6/man/XvShmCreateImage.man
--- old/libXv-1.0.5/man/XvShmCreateImage.man 2009-10-03 10:32:28.000000000 +0200
+++ new/libXv-1.0.6/man/XvShmCreateImage.man 2010-09-04 01:17:08.000000000 +0200
@@ -1 +1 @@
-.so man__libmandirsuffix__/XvCreateImage.__libmandirsuffix__
+.so man__libmansuffix__/XvCreateImage.__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/libXv-1.0.5/man/XvShmPutImage.man new/libXv-1.0.6/man/XvShmPutImage.man
--- old/libXv-1.0.5/man/XvShmPutImage.man 2009-10-03 10:32:28.000000000 +0200
+++ new/libXv-1.0.6/man/XvShmPutImage.man 2010-09-04 01:17:08.000000000 +0200
@@ -1 +1 @@
-.so man__libmandirsuffix__/XvPutImage.__libmandirsuffix__
+.so man__libmansuffix__/XvPutImage.__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/libXv-1.0.5/src/Xv.c new/libXv-1.0.6/src/Xv.c
--- old/libXv-1.0.5/src/Xv.c 2006-09-19 01:25:06.000000000 +0200
+++ new/libXv-1.0.6/src/Xv.c 2010-10-07 06:16:59.000000000 +0200
@@ -21,8 +21,6 @@
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xv/Xv.c,v 1.17 2003/04/28 16:56:27 dawes Exp $ */
-/* $XdotOrg: xc/lib/Xv/Xv.c,v 1.2 2004/04/23 18:43:55 eich Exp $ */
/*
** File:
**
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/libXv-1.0.5/src/Xvlibint.h new/libXv-1.0.6/src/Xvlibint.h
--- old/libXv-1.0.5/src/Xvlibint.h 2006-07-11 20:06:00.000000000 +0200
+++ new/libXv-1.0.6/src/Xvlibint.h 2010-10-07 06:16:59.000000000 +0200
@@ -21,7 +21,6 @@
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xv/Xvlibint.h,v 1.5 2001/07/25 15:04:53 dawes Exp $ */
#ifndef XVLIBINT_H
#define XVLIBINT_H
@@ -41,8 +40,6 @@
**
*/
-#define NEED_REPLIES
-
#include <X11/Xlibint.h>
#include <X11/extensions/Xvproto.h>
#include <X11/extensions/Xvlib.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libXmu for openSUSE:Factory
checked in at Tue Nov 2 10:43:03 CET 2010.
--------
--- xorg-x11-libXmu/xorg-x11-libXmu.changes 2010-04-04 15:45:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libXmu/xorg-x11-libXmu.changes 2010-10-30 17:03:40.000000000 +0200
@@ -1,0 +2,12 @@
+Sat Oct 30 14:59:19 UTC 2010 - sndirsch(a)novell.com
+
+- libXmu 1.1.0
+ * API documentation for this library has been added in this
+ release in the docs directory in DocBook format. If xmlto is
+ installed, it will be converted to supported formats and
+ installed in $(docdir) unless --disable-docs is passed to
+ configure.
+ This release also includes the usual recent set of build
+ configuration improvements and janitorial cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXmu-1.0.5.tar.bz2
New:
----
libXmu-1.1.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libXmu.spec ++++++
--- /var/tmp/diff_new_pack.qDdeUq/_old 2010-11-02 10:42:40.000000000 +0100
+++ /var/tmp/diff_new_pack.qDdeUq/_new 2010-11-02 10:42:40.000000000 +0100
@@ -19,11 +19,11 @@
Name: xorg-x11-libXmu
-%define dirsuffix 1.0.5
+%define dirsuffix 1.1.0
BuildRequires: pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXt-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 4
License: MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -88,6 +88,7 @@
%files devel
%defattr(-,root,root)
+%doc /usr/share/doc/*
%dir /usr/include/X11/Xmu
/usr/include/X11/Xmu/*.h
%{_libdir}/*.so
++++++ libXmu-1.0.5.tar.bz2 -> libXmu-1.1.0.tar.bz2 ++++++
++++ 70508 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-util-devel for openSUSE:Factory
checked in at Tue Nov 2 10:42:27 CET 2010.
--------
--- xorg-x11-util-devel/xorg-x11-util-devel.changes 2010-09-04 21:40:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-util-devel/xorg-x11-util-devel.changes 2010-10-31 03:29:14.000000000 +0100
@@ -1,0 +2,16 @@
+Sun Oct 31 02:27:40 UTC 2010 - sndirsch(a)novell.com
+
+- imake 1.0.4
+ * This release provides a random collection of build
+ improvements, fixes for Cygwin compatibility, and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
+Sat Oct 30 16:21:10 UTC 2010 - sndirsch(a)novell.com
+
+- makedepend 1.0.3
+ * This release fixes a bug if you have directories and files with
+ the same names (more likely with C++'s suffixless include
+ filenames, such as Qt's "QtCore").
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
imake-1.0.3.tar.bz2
makedepend-1.0.2.tar.bz2
New:
----
imake-1.0.4.tar.bz2
makedepend-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-util-devel.spec ++++++
--- /var/tmp/diff_new_pack.FF3XBa/_old 2010-11-02 10:41:56.000000000 +0100
+++ /var/tmp/diff_new_pack.FF3XBa/_new 2010-11-02 10:41:56.000000000 +0100
@@ -22,17 +22,17 @@
BuildRequires: pkgconfig xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 4
+Release: 5
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
Requires: xorg-x11-proto-devel
Summary: Include Files and Libraries mandatory for X11 Development
Source: gccmakedep-X11R7.1-1.0.2.tar.bz2
-Source1: imake-1.0.3.tar.bz2
+Source1: imake-1.0.4.tar.bz2
Source2: xorg-cf-files-1.0.3.tar.bz2
Source3: lndir-1.0.2.tar.bz2
-Source4: makedepend-1.0.2.tar.bz2
+Source4: makedepend-1.0.3.tar.bz2
Source5: xorg-sgml-doctools-1.5.tar.bz2
Patch1: xconf-sparc.diff
++++++ imake-1.0.3.tar.bz2 -> imake-1.0.4.tar.bz2 ++++++
++++ 4764 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/imake-1.0.3/ChangeLog new/imake-1.0.4/ChangeLog
--- old/imake-1.0.3/ChangeLog 2010-04-16 04:58:44.000000000 +0200
+++ new/imake-1.0.4/ChangeLog 2010-10-31 03:10:56.000000000 +0100
@@ -1,3 +1,123 @@
+commit bf237073d39629599cb77bf0144f862c175bb640
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Oct 30 19:10:35 2010 -0700
+
+ imake 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 29c3c8f2fc3859b1c8e1dd1f2327ab51c40fca21
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sat Oct 30 19:08:31 2010 -0700
+
+ 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 <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 3a3c6e584a1fee04a6bc4c11581c283d5fa8c603
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Oct 30 19:04:22 2010 -0700
+
+ Use autoconf standard HAVE_MKSTEMP instead of HAS_MKSTEMP
+
+ We no longer need to maintain compatibility with the monolith
+ Imakefile -D flags in the sources.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f6587b17a6aef0404853ad5113158fddf4a90219
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Oct 30 18:59:39 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC, AC_PROG_SED, & AC_PROG_INSTALL are provided by
+ XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit bdf937d11774595eefc2ded78dcdf52dfe420443
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Oct 30 18:57:15 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.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit ca3374aee64c71c810159839c9b54c84b2bced24
+Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+Date: Tue Apr 27 20:18:10 2010 -0500
+
+ Nuke RCS tags
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 01a05f973d52edc461c1100a939a70ea0ce9b048
+Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+Date: Tue Apr 27 20:38:15 2010 -0500
+
+ mkdirhier: use mkdir -p
+
+ The '-p' option to mkdir(1) is required by SUSv2/Unix98, so we should be
+ able to rely on it on all systems we support. Some parts need to be
+ left in place in order to not alter some of its ancient, shall we say,
+ quirks.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 098bf61eb89c3d93d2ed814d3e39e6412f6fcf9e
+Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+Date: Tue Apr 27 19:18:27 2010 -0500
+
+ Use standard .gitignore with custom section for imake
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+ Reviewed-by: Gaetan Nadon <gaetan.nadon(a)videotron.ca>
+
+commit 04da52fb5c4721c0218dbe6537c9ad0f7bd2ab04
+Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+Date: Tue Apr 27 19:14:35 2010 -0500
+
+ Use AC_PROG_SED to find sed
+
+ AC_PROG_SED sets SED as the path to a fully-functional 'sed' (which may
+ also be called 'gsed' if GNU sed is installed alongside a proprietary
+ version).
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 1127a5cb3166f4d5d0564732b3842fe81bf3e701
+Author: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+Date: Tue Apr 27 19:06:32 2010 -0500
+
+ Allow for EXEEXT in appman_DATA rule
+
+ As a result of commit 22578c3718e41da72c66ce6a4186ec7315d6e3ad:
+
+ make[1]: *** No rule to make target `imake.exe.1', needed by `all-am'.
+ make[1]: *** No rule to make target `revpath.exe.1', needed by `all-am'.
+
+ On PE/COFF platforms EXEEXT is set to ".exe" and is appended by automake
+ to all *_PROGRAMS. For portability this must be accounted for in any
+ custom rules which refer to any *_PROGRAMS.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz(a)users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
commit 48145e04d24b1c575a22bac69c3c3033f72322fc
Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
Date: Thu Apr 15 19:52:20 2010 -0700
@@ -107,7 +227,7 @@
Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
commit eb8e41c3b3f280c34947579a5ee9fa511aee9acf
-Merge: e215b32... 9653950...
+Merge: e215b32 9653950
Author: Jeremy C. Reed <reed(a)tx.reedmedia.net>
Date: Thu Feb 14 23:27:42 2008 -0600
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/imake-1.0.3/cleanlinks new/imake-1.0.4/cleanlinks
--- old/imake-1.0.3/cleanlinks 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/cleanlinks 2010-05-15 05:23:23.000000000 +0200
@@ -7,7 +7,6 @@
#
# Author: David Dawes <dawes(a)xfree86.org>
#
-# $XFree86: xc/config/util/cleanlinks.sh,v 1.2 2003/04/15 03:05:16 dawes Exp $
find . -type l -print |
(
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/imake-1.0.3/config.h.in new/imake-1.0.4/config.h.in
--- old/imake-1.0.3/config.h.in 2010-04-16 04:58:31.000000000 +0200
+++ new/imake-1.0.4/config.h.in 2010-10-31 03:10:53.000000000 +0100
@@ -1,14 +1,14 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Define to 1 if you have the "mkstemp" function. */
-#undef HAS_MKSTEMP
-
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
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/imake-1.0.3/configure.ac new/imake-1.0.4/configure.ac
--- old/imake-1.0.3/configure.ac 2010-04-16 04:57:16.000000000 +0200
+++ new/imake-1.0.4/configure.ac 2010-10-31 03:10:23.000000000 +0100
@@ -21,30 +21,26 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(imake, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([imake], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [imake])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
-
AC_PROG_CPP
-AC_PATH_PROG(SED, sed)
XORG_PROG_RAWCPP
CPP_PROGRAM=${RAWCPP}
AC_SUBST(CPP_PROGRAM)
-AC_CHECK_FUNC([mkstemp],
- AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))
+AC_CHECK_FUNCS([mkstemp])
AC_CHECK_PROG(HAS_PERL, perl, yes)
AM_CONDITIONAL([HAS_PERL], [test "x$HAS_PERL" = xyes])
@@ -129,6 +125,5 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(XPROTO, xproto)
-AC_SUBST(XPROTO_CFLAGS)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/imake.c new/imake-1.0.4/imake.c
--- old/imake-1.0.3/imake.c 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/imake.c 2010-10-31 03:03:26.000000000 +0100
@@ -7,8 +7,6 @@
* be passed to the template file. *
* *
***************************************************************************/
-/* $XFree86: xc/config/imake/imake.c,v 3.63tsi Exp $ */
-
/*
*
Copyright (c) 1985, 1986, 1987, 1998 The Open Group
@@ -397,11 +395,11 @@
if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
LogFatal("Cannot create temporary file %s.", tmpMakefile);
} else {
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
int fd;
#endif
tmpMakefile = Strdup(tmpMakefile);
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
if (mktemp(tmpMakefile) == NULL ||
(tmpfd = fopen(tmpMakefile, "w+")) == NULL) {
LogFatal("Cannot create temporary file %s.", tmpMakefile);
@@ -1771,11 +1769,11 @@
strcmp(ptoken, "pragma") &&
strcmp(ptoken, "undef")) {
if (outFile == NULL) {
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
int fd;
#endif
tmpImakefile = Strdup(tmpImakefile);
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
if (mktemp(tmpImakefile) == NULL ||
(outFile = fopen(tmpImakefile, "w+")) == NULL) {
LogFatal("Cannot open %s for write.",
@@ -1978,8 +1976,6 @@
#endif /* !SYSV */
initialized = TRUE;
fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
- fprintf (tmpfd, "# %s\n",
- "$Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $");
}
for (p1 = pline; p1 < end; p1++) {
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/imake-1.0.3/imake.man new/imake-1.0.4/imake.man
--- old/imake-1.0.3/imake.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/imake.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: imake.man,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $
.\" Copyright (c) 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: imake.man,v 1.8 2001/12/14 19:53:19 dawes Exp $
-.\"
.TH IMAKE 1 __xorgversion__
.SH NAME
imake \- C preprocessor interface to the make utility
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/imake-1.0.3/imakemdep.h new/imake-1.0.4/imakemdep.h
--- old/imake-1.0.3/imakemdep.h 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/imakemdep.h 2010-05-15 05:23:23.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: imakemdep.h,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */
-/* $XdotOrg: xc/config/imake/imakemdep.h,v 1.9 2005/03/02 11:20:29 gisburn Exp $ */
/*
Copyright (c) 1993, 1994, 1998 The Open Group
@@ -25,7 +23,6 @@
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */
/*
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/imake-1.0.3/Makefile.am new/imake-1.0.4/Makefile.am
--- old/imake-1.0.3/Makefile.am 2010-04-16 04:57:16.000000000 +0200
+++ new/imake-1.0.4/Makefile.am 2010-10-31 02:56:32.000000000 +0100
@@ -125,30 +125,13 @@
mkhtmlindex.man
# Only need to install man pages for programs/scripts being installed
-appman_needed_for = $(bin_PROGRAMS) $(bin_SCRIPTS)
-appman_DATA = $(appman_needed_for:%=%.@APP_MAN_SUFFIX@)
+appman_DATA = $(bin_PROGRAMS:%$(EXEEXT)=%.@APP_MAN_SUFFIX@) $(bin_SCRIPTS:%=%.@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += \
-e 's|__cpp__|$(RAWCPP)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/makeg new/imake-1.0.4/makeg
--- old/imake-1.0.3/makeg 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/makeg 2010-05-15 05:23:23.000000000 +0200
@@ -1,6 +1,5 @@
#! /bin/sh
# makeg - run "make" with options necessary to make a debuggable executable
-# $Xorg: makeg.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $
# set GDB=1 in your environment if using gdb on Solaris 2.
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/imake-1.0.3/makeg.man new/imake-1.0.4/makeg.man
--- old/imake-1.0.3/makeg.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/makeg.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: makeg.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
.\" Copyright (c) 1996, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,8 +23,6 @@
.\" from The Open Group.
.\"
.\"
-.\" $XFree86: xc/config/util/makeg.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
-.\"
.TH MAKEG 1 __xorgversion__
.SH NAME
makeg \- make a debuggable executable
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/imake-1.0.3/mdepend.cpp new/imake-1.0.4/mdepend.cpp
--- old/imake-1.0.3/mdepend.cpp 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mdepend.cpp 2010-05-15 05:23:23.000000000 +0200
@@ -1,8 +1,5 @@
XCOMM!/bin/sh
XCOMM
-XCOMM $Xorg: mdepend.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $
-XCOMM $XdotOrg: $
-XCOMM
XCOMM Do the equivalent of the 'makedepend' program, but do it right.
XCOMM
XCOMM Usage:
@@ -23,8 +20,6 @@
XCOMM USG users will probably have to change "silent" to "-s" instead of
XCOMM "-" (at least, that is what the documentation implies).
XCOMM
-XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.9 2001/04/26 20:55:10 dawes Exp $
-XCOMM
CC=PREPROC
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/imake-1.0.3/mergelib.cpp new/imake-1.0.4/mergelib.cpp
--- old/imake-1.0.3/mergelib.cpp 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mergelib.cpp 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,5 @@
XCOMM!/bin/sh
XCOMM
-XCOMM $Xorg: mergelib.cpp,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
-XCOMM
XCOMM Copyright (c) 1989, 1998 The Open Group
XCOMM
XCOMM Permission to use, copy, modify, distribute, and sell this software and
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/imake-1.0.3/mergelib.man new/imake-1.0.4/mergelib.man
--- old/imake-1.0.3/mergelib.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mergelib.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH MERGELIB 1 __xorgversion__
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/imake-1.0.3/mkdirhier new/imake-1.0.4/mkdirhier
--- old/imake-1.0.3/mkdirhier 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkdirhier 2010-05-15 05:23:23.000000000 +0200
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
# Courtesy of Paul Eggert
newline='
@@ -23,45 +22,12 @@
echo >&2 "mkdirhier: directory name contains a newline: \`\`$directory''"
status=1
continue;;
- ///*) prefix=/;; # See Posix 2.3 "path".
- //*) prefix=//;;
- /*) prefix=/;;
-*) prefix=./;;
*) prefix=
esac
- IFS=/
- set x $directory
- case $2 in
- */*) # IFS parsing is broken
- IFS=' '
- set x `echo $directory | tr / ' '`
- ;;
- esac
- IFS=$newline
- shift
+ mkdir -p $prefix$directory || status=$?
- for filename
- do
- path=$prefix$filename
- prefix=$path/
- shift
-
- test -d "$path" || {
- paths=$path
- for filename
- do
- if [ -n "$filename" -a "$filename" != "." ]; then
- path=$path/$filename
- paths=$paths$newline$path
- fi
- done
-
- mkdir $paths || status=$?
-
- break
- }
- done
done
exit $status
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mkdirhier.man new/imake-1.0.4/mkdirhier.man
--- old/imake-1.0.3/mkdirhier.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkdirhier.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
.\" Copyright (c) 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" dealing in this Software without prior written authorization from The
.\" Open Group.
.\"
-.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
-.\"
.TH MKDIRHIER 1 __xorgversion__
.SH NAME
mkdirhier \- makes a directory hierarchy
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/imake-1.0.3/mkhtmlindex.pl new/imake-1.0.4/mkhtmlindex.pl
--- old/imake-1.0.3/mkhtmlindex.pl 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkhtmlindex.pl 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,5 @@
#!/usr/bin/perl
#
-# $XFree86: xc/config/util/mkhtmlindex.pl,v 1.2 2001/03/15 19:02:31 dawes Exp $
-#
# Copyright © 2000,2001 by VA Linux Systems, Inc.
#
# Generate index files for HTML man pages.
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/imake-1.0.3/mkhtmlindex.sh new/imake-1.0.4/mkhtmlindex.sh
--- old/imake-1.0.3/mkhtmlindex.sh 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkhtmlindex.sh 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.3 2000/08/26 04:30:49 dawes Exp $
-#
# Copyright © 2000 by Precision Insight, Inc.
#
# Generate index files for the HTML man pages
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/imake-1.0.3/revpath.c new/imake-1.0.4/revpath.c
--- old/imake-1.0.3/revpath.c 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/revpath.c 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,6 @@
/*
* Copyright 1999 by The XFree86 Project, Inc.
*/
-/* $XFree86: xc/config/util/revpath.c,v 1.2 1999/02/01 11:55:49 dawes Exp $ */
/*
* Reverse a pathname. It returns a relative path that can be used to undo
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/imake-1.0.3/revpath.man new/imake-1.0.4/revpath.man
--- old/imake-1.0.3/revpath.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/revpath.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/config/util/revpath.man,v 1.1 1999/01/03 03:58:14 dawes Exp $
.TH REVPATH 1 __vendorversion__
.SH NAME
revpath \- generate a relative path that can be used to undo a change-directory
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/imake-1.0.3/xmkmf.cpp new/imake-1.0.4/xmkmf.cpp
--- old/imake-1.0.3/xmkmf.cpp 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/xmkmf.cpp 2010-05-15 05:23:23.000000000 +0200
@@ -1,10 +1,6 @@
XCOMM!/bin/sh
-XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.3 2000/11/06 21:57:10 dawes Exp $
-XCOMM
XCOMM make a Makefile from an Imakefile from inside or outside the sources
-XCOMM
-XCOMM $Xorg: xmkmf.cpp,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]"
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/imake-1.0.3/xmkmf.man new/imake-1.0.4/xmkmf.man
--- old/imake-1.0.3/xmkmf.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/xmkmf.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: xmkmf.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
.\" Copyright (c) 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" dealing in this Software without prior written authorization from The
.\" Open Group.
.\"
-.\" $XFree86: xc/config/util/xmkmf.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
-.\"
.TH XMKMF 1 __xorgversion__
.SH NAME
xmkmf \- create a Makefile from an Imakefile
++++++ makedepend-1.0.2.tar.bz2 -> makedepend-1.0.3.tar.bz2 ++++++
++++ 8725 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/makedepend-1.0.2/ChangeLog new/makedepend-1.0.3/ChangeLog
--- old/makedepend-1.0.2/ChangeLog 2009-10-11 07:09:15.000000000 +0200
+++ new/makedepend-1.0.3/ChangeLog 2010-10-30 07:45:59.000000000 +0200
@@ -1,3 +1,57 @@
+commit e67389ecc0c425bcfec0a3184ee48919e0e2c61a
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 22:45:35 2010 -0700
+
+ makedepend 1.0.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit bf25a6cb4888e5cf6827cd51cb7ee282cfb6cf47
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Oct 29 22:39:51 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
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 7963cc382a3a351410b1342a9783df3af8516944
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 58bd34e6c3662ef06e9ef0dd78d69f003df42bdc
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri May 14 21:14:44 2010 -0700
+
+ Convert testcase from bug 28045 into automake "make check" test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 8522c314da7537169996476fe5ba411f720a09fe
+Author: Martin Pärtel <lagitus(a)mbnet.fi>
+Date: Fri May 14 21:00:15 2010 -0700
+
+ Bug 28045 - makedepend fails on directory named like an include file
+
+ <https://bugs.freedesktop.org/show_bug.cgi?id=28045>
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
commit c976a7fc7c21772c00de9e61178cf467c6a10b57
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Sat Oct 10 22:08:09 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/configure.ac new/makedepend-1.0.3/configure.ac
--- old/makedepend-1.0.2/configure.ac 2009-10-11 07:07:56.000000000 +0200
+++ new/makedepend-1.0.3/configure.ac 2010-10-30 07:45:03.000000000 +0200
@@ -1,12 +1,13 @@
-AC_PREREQ([2.57])
-AC_INIT([makedepend], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([makedepend], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_CONFIG_HEADER([makedepend-config.h])
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
dnl Checks for programs.
AC_PROG_CC
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/makedepend-1.0.2/include.c new/makedepend-1.0.3/include.c
--- old/makedepend-1.0.2/include.c 2009-10-11 06:02:44.000000000 +0200
+++ new/makedepend-1.0.3/include.c 2010-05-15 05:50:46.000000000 +0200
@@ -264,7 +264,7 @@
if ((type == INCLUDEDOT) ||
(type == INCLUDENEXTDOT) ||
(*include == '/')) {
- if (stat(include, &st) == 0)
+ if (stat(include, &st) == 0 && !S_ISDIR(st.st_mode))
return newinclude(include, include);
if (show_where_not)
warning1("\tnot in %s\n", include);
@@ -286,7 +286,7 @@
strcpy(path + (p-file) + 1, include);
}
remove_dotdot(path);
- if (stat(path, &st) == 0)
+ if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode))
return newinclude(path, include);
if (show_where_not)
warning1("\tnot in %s\n", path);
@@ -304,7 +304,7 @@
for (; *pp; pp++) {
sprintf(path, "%s/%s", *pp, include);
remove_dotdot(path);
- if (stat(path, &st) == 0) {
+ if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) {
includedirsnext = pp + 1;
return newinclude(path, 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/makedepend-1.0.2/makedepend-config.h.in new/makedepend-1.0.3/makedepend-config.h.in
--- old/makedepend-1.0.2/makedepend-config.h.in 2009-10-11 07:08:40.000000000 +0200
+++ new/makedepend-1.0.3/makedepend-config.h.in 2010-10-30 07:45:59.000000000 +0200
@@ -48,6 +48,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/makedepend-1.0.2/Makefile.am new/makedepend-1.0.3/Makefile.am
--- old/makedepend-1.0.2/Makefile.am 2009-10-11 07:04:49.000000000 +0200
+++ new/makedepend-1.0.3/Makefile.am 2010-10-30 07:38:06.000000000 +0200
@@ -26,24 +26,8 @@
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += \
-e 's|__cpp__|$(RAWCPP)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
@@ -68,3 +52,23 @@
lint:
$(LINT) $(ALL_LINT_FLAGS) $(makedepend_SOURCES)
endif LINT
+
+### Test cases - mostly for bug fixes submitted with a test case so far
+TESTS =
+
+# Absolute path to srcdir & builddir top that test scripts can reference
+TEST_BUILDDIR_PATH = `cd $(top_builddir) && pwd`
+TEST_SRCDIR_PATH = `cd $(top_srcdir) && pwd`
+
+# Path to makedepend command being tested that can be found from test subdirs
+TESTS_ENVIRONMENT = MAKEDEPEND="$(TEST_BUILDDIR_PATH)/makedepend"
+
+# Path to writable testdirectory in build directory
+TESTS_ENVIRONMENT += test_builddir="$(TEST_BUILDDIR_PATH)/tests"
+
+# Path to testcase files in source directory
+TESTS_ENVIRONMENT += test_srcdir="$(TEST_SRCDIR_PATH)/tests"
+
+# Test for https://bugs.freedesktop.org/show_bug.cgi?id=28045
+TESTS += tests/28045/makedep.sh
+EXTRA_DIST += tests/28045/makedep.sh tests/28045/foo.cpp
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/makedepend-1.0.2/tests/28045/foo.cpp new/makedepend-1.0.3/tests/28045/foo.cpp
--- old/makedepend-1.0.2/tests/28045/foo.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/makedepend-1.0.3/tests/28045/foo.cpp 2010-05-09 23:59:22.000000000 +0200
@@ -0,0 +1,2 @@
+
+#include <one>
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/makedepend-1.0.2/tests/28045/makedep.sh new/makedepend-1.0.3/tests/28045/makedep.sh
--- old/makedepend-1.0.2/tests/28045/makedep.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/makedepend-1.0.3/tests/28045/makedep.sh 2010-05-15 06:12:22.000000000 +0200
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Test case from https://bugs.freedesktop.org/show_bug.cgi?id=28045
+# modified to work with automake test framework
+
+set -e
+
+if [ "x$MAKEDEPEND" == "x" ]; then
+ MAKEDEPEND=makedepend
+fi
+
+mkdir -p ${test_builddir}/28045
+cd ${test_builddir}/28045
+
+# Create test conditions:
+# - directory named "one"
+# - directory named "two" containing empty file named "one"
+mkdir one two
+touch two/one
+
+# Happens to work before fix for 28045
+$MAKEDEPEND -f- -- -Itwo -Ione -I. -- ${test_srcdir}/28045/foo.cpp > /dev/null
+
+# Happens to fail before fix for 28045
+$MAKEDEPEND -f- -- -I. -Ione -Itwo -- ${test_srcdir}/28045/foo.cpp > /dev/null
+
+# Clean up
+rm -rf one two
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libXpm for openSUSE:Factory
checked in at Tue Nov 2 10:41:44 CET 2010.
--------
--- xorg-x11-libXpm/xorg-x11-libXpm.changes 2010-04-04 15:47:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libXpm/xorg-x11-libXpm.changes 2010-10-30 17:47:05.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Oct 30 15:45:53 UTC 2010 - sndirsch(a)novell.com
+
+- libXpm 3.5.9
+ * This minor maintenance release provides a large collection of
+ build configuration improvements and other janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXpm-3.5.8.tar.bz2
New:
----
libXpm-3.5.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libXpm.spec ++++++
--- /var/tmp/diff_new_pack.vzyfJ4/_old 2010-11-02 10:37:15.000000000 +0100
+++ /var/tmp/diff_new_pack.vzyfJ4/_new 2010-11-02 10:37:15.000000000 +0100
@@ -19,11 +19,11 @@
Name: xorg-x11-libXpm
-%define dirsuffix 3.5.8
+%define dirsuffix 3.5.9
BuildRequires: pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXt-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 4
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
++++++ libXpm-3.5.8.tar.bz2 -> libXpm-3.5.9.tar.bz2 ++++++
++++ 67221 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libXt for openSUSE:Factory
checked in at Tue Nov 2 10:37:02 CET 2010.
--------
--- xorg-x11-libXt/xorg-x11-libXt.changes 2010-09-04 20:54:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libXt/xorg-x11-libXt.changes 2010-10-29 10:28:48.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 29 08:23:15 UTC 2010 - sndirsch(a)novell.com
+
+- libXt 1.0.9
+ * This release includes several bug fixes, as well as the usual
+ set of recent build configuration improvements & janitorial
+ cleanups.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXt-1.0.8.tar.bz2
New:
----
libXt-1.0.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libXt.spec ++++++
--- /var/tmp/diff_new_pack.T0Sogz/_old 2010-11-02 10:35:08.000000000 +0100
+++ /var/tmp/diff_new_pack.T0Sogz/_new 2010-11-02 10:35:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-libXt (Version 7.5_1.0.8)
+# spec file for package xorg-x11-libXt (Version 7.5_1.0.9)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: xorg-x11-libXt
-%define dirsuffix 1.0.8
+%define dirsuffix 1.0.9
BuildRequires: fdupes pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.5_%{dirsuffix}
++++++ libXt-1.0.8.tar.bz2 -> libXt-1.0.9.tar.bz2 ++++++
++++ 64537 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0