libxcomposite: Changes to 'debian-unstable'
.gitignore | 78 +++++++++++++---
COPYING | 20 ++++
ChangeLog | 166 ++++++++++++++++++++++++++++++++++++
INSTALL | 8 -
Makefile.am | 9 +
configure.ac | 26 +++--
debian/changelog | 10 ++
debian/control | 5 -
debian/copyright | 35 +++----
include/X11/extensions/Xcomposite.h | 36 ++++---
man/.gitignore | 3
man/Makefile.am | 2
man/Xcomposite.xml | 44 ++++-----
src/Xcomposite.c | 39 ++++----
src/xcompositeint.h | 36 ++++---
15 files changed, 379 insertions(+), 138 deletions(-)
New commits:
commit 400dfa68ffffdf603ea6fc1179e90eaba713334f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 11 13:48:26 2010 +0100
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 0fc84ae..275de26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
+libxcomposite (1:0.4.2-1) unstable; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
@@ -6,7 +6,7 @@ libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
* Drop pre-dependency on x11-common, only needed for upgrades from sarge.
* Bump Standards-Version to 3.9.0.
- -- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:39:32 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:48:21 +0100
libxcomposite (1:0.4.1-2) unstable; urgency=low
commit ede9bb7a09faf316d83ab5b03a785ea813cd9e98
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 11 13:46:30 2010 +0100
Bump Standards-Version to 3.9.0.
diff --git a/debian/changelog b/debian/changelog
index 21a8453..0fc84ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for xorg-macros 1.6.
* Drop pre-dependency on x11-common, only needed for upgrades from sarge.
+ * Bump Standards-Version to 3.9.0.
-- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:39:32 +0100
diff --git a/debian/control b/debian/control
index 17f0811..addee9f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+3),
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcomposite
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcomposite.git
commit 43489f4dd0812d3ee1c81f3222c85d85853d8b4d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 11 13:46:07 2010 +0100
Drop pre-dependency on x11-common, only needed for upgrades from sarge.
diff --git a/debian/changelog b/debian/changelog
index 9e90681..21a8453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
* Bump xutils-dev build-dep for xorg-macros 1.6.
+ * Drop pre-dependency on x11-common, only needed for upgrades from sarge.
-- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:39:32 +0100
diff --git a/debian/control b/debian/control
index 61c622c..17f0811 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,6 @@ Package: libxcomposite-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends}, libxcomposite1 (= ${binary:Version}), libx11-dev, libxfixes-dev, x11proto-composite-dev (>= 1:0.4), x11proto-core-dev, libxext-dev
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Composite extension library (development headers)
libXcomposite provides an X Window System client interface to the Composite
extension to the X protocol.
commit a9eecc01e8ae70fc7befc805a8a9b8fee92d92d6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 11 13:45:16 2010 +0100
Bump xutils-dev build-dep for xorg-macros 1.6.
diff --git a/debian/changelog b/debian/changelog
index 449a7f6..9e90681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
* New upstream release.
* Update debian/copyright from upstream COPYING.
+ * Bump xutils-dev build-dep for xorg-macros 1.6.
-- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:39:32 +0100
diff --git a/debian/control b/debian/control
index 5680fb5..61c622c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
xmlto,
automake,
libtool,
- xutils-dev (>= 1:7.5~1)
+ xutils-dev (>= 1:7.5+3),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxcomposite
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxcomposite.git
commit 891b150a1819bc93dc6401ab6e99bf1334ad09ac
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 11 13:42:48 2010 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 97226e3..449a7f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Update debian/copyright from upstream COPYING.
-- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:39:32 +0100
diff --git a/debian/copyright b/debian/copyright
index 87c46bb..1ec72ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,6 @@ This package was downloaded from
http://xorg.freedesktop.org/releases/individual/lib/
Copyright © 2001,2003 Keith Packard
-Copyright © 2003 Noah Levitt
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -22,23 +21,23 @@ 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 © 2006 Sun Microsystems
+Copyright (c) 2006, 2007, Oracle and/or its affiliates. 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, and that the name of Sun Microsystems not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Sun Microsystems makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
+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:
-SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SUN MICROSYSTEMS 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.
+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.
commit b123fa6042fe9c9f336dbea82f283b34a3539e33
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 11 13:39:53 2010 +0100
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 486f0ce..1dc4bf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,169 @@
+commit 01c4691e18b536de6585a0e93e05e2831cf2be34
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 17:05:02 2010 -0700
+
+ libXcomposite 0.4.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 657550b7572551225ea2c9c60f42827a5209a205
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 16:59:52 2010 -0700
+
+ Sun's copyrights now belong to Oracle
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7cc9ace428dabaeeabc8bcb8843ee89bec447a9a
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Fri Apr 9 17:24:57 2010 -0700
+
+ Always call SyncHandle after issuing an X request.
+
+commit e52f8171000f2b67bb1b774ba94acb68a471a91b
+Author: Gaetan Nadon <memsize@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@videotron.ca>
+
+commit f361cfd41f36dc60ad9c4832978391f3ce8951e6
+Author: Gaetan Nadon <memsize@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@videotron.ca>
+
+commit 588e33d6037166da5a02e8ad73438544dca90e1a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Mar 11 10:06:56 2010 -0500
+
+ doc: specify 0.0.20 as the minimum version for xmlto
+
+ Older versions do not have fop backend.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2002631bd71ba970d77f9b5c8f886c3bf1349e45
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 21 20:03:42 2010 -0500
+
+ man: allow installing prebuilt man pages from tarball
+
+ The man pages source may be supplied in the tarball or built
+ from git. The makefile needs to take that into consideration
+ and adjust the targets accordingly.
+
+ This prevents the regular make target to fail when the source
+ is not available and the xmlto is not available.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 213cf861e8a29c6f991828beb6656239206c9947
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Jan 18 16:02:41 2010 -0500
+
+ config: replace custom code with reusable macro XORG_WITH_XMLTO
+
+ XORG_WITH_XMLTO provides additional functions like a configure
+ option which allow platform builders to control the usage of
+ the xmlto program.
+
+ This is a requirement from platforms that do not have such doc tool.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fa2155fa64cf7b43ee40064cb53b05388885c1dc
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 14 19:15:00 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 7c61042d94edc1ecf8276961f28189caffa7b17a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 14 15:52:08 2010 -0500
+
+ COPYING: add missing copyright notices
+
+ Refer to: Xcomposite.c
+ Copyright © 2006 Sun Microsystems
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 0d78a27bf7c644a6e700290c1861a11ff4a1662b
+Author: Gaetan Nadon <memsize@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 92843f46c21c6fd0c5f82727f0d281dcf6debfe4
+Author: Gaetan Nadon <memsize@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 e1d89e11c0f24c6c0d5048e8910091f9b5a997e4
+Author: Gaetan Nadon <memsize@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 b741fca01ebe60a5b73bcebe237efc4aeff3fa0c
+Author: Gaetan Nadon <memsize@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 57cce60b16cfd2fb63c2e045817c2c05a2a603dc
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date: Wed Oct 21 12:47:24 2009 -0700
+
+ This is not a GNU project, so declare it foreign.
+
+ On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
+ > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
+ > > I noticed an INSTALL file in xlsclients and libXvMC today, and it
+ > > was quite annoying to work around since 'autoreconf -fvi' replaces
+ > > it and git wants to commit it. Should these files even be in git?
+ > > Can I nuke them for the betterment of humanity and since they get
+ > > created by autoreconf anyways?
+ >
+ > See https://bugs.freedesktop.org/show_bug.cgi?id=24206
+
+ As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
+ AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
+ of the INSTALL file. It is also part of the 24206 solution.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
commit 90c243accfb2dc3d4d85dd57d8aca518dab98842
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 00:28:45 2009 -0700
diff --git a/debian/changelog b/debian/changelog
index 8bc5391..97226e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxcomposite (1:0.4.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:39:32 +0100
+
libxcomposite (1:0.4.1-2) unstable; urgency=low
[ Julien Cristau ]
commit 01c4691e18b536de6585a0e93e05e2831cf2be34
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 8 17:05:02 2010 -0700
libXcomposite 0.4.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index fe39239..3f44a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,10 @@ dnl protocol, so Xcomposite version l.n.m corresponds to protocol version l.n
dnl that 'revision' number appears in Xcomposite.h and has to be manually
dnl synchronized.
dnl
-AC_INIT(libXcomposite, 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
+AC_INIT(libXcomposite,
+ 0.4.2,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libXcomposite)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 657550b7572551225ea2c9c60f42827a5209a205
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 8 16:59:52 2010 -0700
Sun's copyrights now belong to Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index 8c3b97e..0033809 100644
--- a/COPYING
+++ b/COPYING
@@ -19,7 +19,7 @@ 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 © 2006, 2007 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/include/X11/extensions/Xcomposite.h b/include/X11/extensions/Xcomposite.h
index 90a9686..9e4fcb1 100644
--- a/include/X11/extensions/Xcomposite.h
+++ b/include/X11/extensions/Xcomposite.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, 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"),
diff --git a/man/Xcomposite.xml b/man/Xcomposite.xml
index 1c063b3..a1ef1c9 100644
--- a/man/Xcomposite.xml
+++ b/man/Xcomposite.xml
@@ -7,7 +7,7 @@
Conversion to DocBook/XML API documentation is:
- Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index 0765975..eaa1790 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, 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"),
diff --git a/src/xcompositeint.h b/src/xcompositeint.h
index c0f2ecd..57e876d 100644
--- a/src/xcompositeint.h
+++ b/src/xcompositeint.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2006, 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"),
commit 7cc9ace428dabaeeabc8bcb8843ee89bec447a9a
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 9 17:24:57 2010 -0700
Always call SyncHandle after issuing an X request.
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index 93dee58..0765975 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -138,6 +138,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
UnlockDisplay (dpy);
+ SyncHandle ();
} else {
/* The server doesn't have this extension.
* Use a private Xlib-internal extension to hang the close_display
commit e52f8171000f2b67bb1b774ba94acb68a471a91b
Author: Gaetan Nadon <memsize@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@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 3adf63a..fe39239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
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 XComposite version. XCompositeQueryVersion
commit f361cfd41f36dc60ad9c4832978391f3ce8951e6
Author: Gaetan Nadon <memsize@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@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 6268dbe..f794763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcomposite.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = xcomposite.pc.in
.PHONY: ChangeLog INSTALL
commit 588e33d6037166da5a02e8ad73438544dca90e1a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Mar 11 10:06:56 2010 -0500
doc: specify 0.0.20 as the minimum version for xmlto
Older versions do not have fop backend.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index f5aced9..3adf63a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,8 @@ AM_MAINTAINER_MODE
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.5 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.5)
+ [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.6)
AM_CONFIG_HEADER(config.h)
# Check for progs
@@ -47,7 +47,7 @@ AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
-XORG_WITH_XMLTO
+XORG_WITH_XMLTO(0.0.20)
# Determine if the source for man pages is available
# It may already be present (tarball) or can be generated using xmlto
commit 2002631bd71ba970d77f9b5c8f886c3bf1349e45
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 21 20:03:42 2010 -0500
man: allow installing prebuilt man pages from tarball
The man pages source may be supplied in the tarball or built
from git. The makefile needs to take that into consideration
and adjust the targets accordingly.
This prevents the regular make target to fail when the source
is not available and the xmlto is not available.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 54ea754..f5aced9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,11 @@ AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
XORG_WITH_XMLTO
+# Determine if the source for man pages is available
+# It may already be present (tarball) or can be generated using xmlto
+AM_CONDITIONAL([INSTALL_MANPAGES],
+ [test -f "$srcdir/man/Xcomposite.man" || test "x$have_xmlto" = xyes])
+
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
diff --git a/man/Makefile.am b/man/Makefile.am
index 13a75c5..54eb624 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,8 +21,10 @@ Xcomposite_man_aliases = \
Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+if INSTALL_MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xcomposite_shadowmen)
+endif
EXTRA_DIST = $(libman_PRE) $(libman_xml)
commit 213cf861e8a29c6f991828beb6656239206c9947
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jan 18 16:02:41 2010 -0500
config: replace custom code with reusable macro XORG_WITH_XMLTO
XORG_WITH_XMLTO provides additional functions like a configure
option which allow platform builders to control the usage of
the xmlto program.
This is a requirement from platforms that do not have such doc tool.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 8722157..54ea754 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,10 +36,10 @@ AC_INIT(libXcomposite, 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?produc
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
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.5 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.5)
AM_CONFIG_HEADER(config.h)
# Check for progs
@@ -47,13 +47,7 @@ AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
-
-AC_ARG_VAR([XMLTO], [Path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
-if test "x$XMLTO" = "x" -a ! -f $srcdir/man/Xcomposite.man ; then
- AC_MSG_WARN([xmlto not found - cannot create man pages without it])
-fi
+XORG_WITH_XMLTO
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
commit fa2155fa64cf7b43ee40064cb53b05388885c1dc
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 19:15:00 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/COPYING b/COPYING
index f5fba59..8c3b97e 100644
--- a/COPYING
+++ b/COPYING
@@ -19,22 +19,23 @@ 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 © 2006 Sun Microsystems
+Copyright © 2006, 2007 Sun Microsystems, Inc. All rights reserved.
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Sun Microsystems not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Sun Microsystems makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
+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:
-SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SUN MICROSYSTEMS 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.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/include/X11/extensions/Xcomposite.h b/include/X11/extensions/Xcomposite.h
index b97e390..90a9686 100644
--- a/include/X11/extensions/Xcomposite.h
+++ b/include/X11/extensions/Xcomposite.h
@@ -1,24 +1,26 @@
/*
- * Copyright © 2006 Sun Microsystems
+ * Copyright © 2006 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, and that the name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
+ * 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:
*
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * 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.
+ */
+/*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/man/Xcomposite.xml b/man/Xcomposite.xml
index d753776..1c063b3 100644
--- a/man/Xcomposite.xml
+++ b/man/Xcomposite.xml
@@ -8,31 +8,25 @@
Conversion to DocBook/XML API documentation is:
Copyright 2007 Sun Microsystems, Inc. All rights reserved.
-
+
Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies of
- the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
-->
<title>X Composite Extension Library</title>
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index b5637b0..93dee58 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -1,26 +1,26 @@
/*
- * $Id$
+ * Copyright © 2006 Sun Microsystems, Inc. All rights reserved.
*
- * Copyright © 2006 Sun Microsystems
+ * 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:
*
- * 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 Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * 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.
+ */
+/*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/src/xcompositeint.h b/src/xcompositeint.h
index 7f0f868..c0f2ecd 100644
--- a/src/xcompositeint.h
+++ b/src/xcompositeint.h
@@ -1,24 +1,26 @@
/*
- * Copyright © 2006 Sun Microsystems
+ * Copyright © 2006 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, and that the name of Sun Microsystems not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Sun Microsystems makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
+ * 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:
*
- * SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL SUN MICROSYSTEMS 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.
+ * 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.
+ */
+/*
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 7c61042d94edc1ecf8276961f28189caffa7b17a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 14 15:52:08 2010 -0500
COPYING: add missing copyright notices
Refer to: Xcomposite.c
Copyright © 2006 Sun Microsystems
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/COPYING b/COPYING
index e506314..f5fba59 100644
--- a/COPYING
+++ b/COPYING
@@ -19,3 +19,22 @@ 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 © 2006 Sun Microsystems
+
+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 Sun Microsystems not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. Sun Microsystems makes no
+representations about the suitability of this software for any purpose. It
+is provided "as is" without express or implied warranty.
+
+SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL SUN MICROSYSTEMS 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.
commit 0d78a27bf7c644a6e700290c1861a11ff4a1662b
Author: Gaetan Nadon <memsize@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.
Reply to: