.gitignore | 73 ++++++++++++++++--- COPYING | 20 +++++ ChangeLog | 148 ++++++++++++++++++++++++++++++++++++++++ INSTALL | 8 -- Makefile.am | 10 +- configure.ac | 15 ++-- debian/README.source | 2 debian/changelog | 9 ++ debian/control | 4 - debian/copyright | 21 +++++ debian/xsfbs/xsfbs.mk | 35 +++++---- include/X11/extensions/Xfixes.h | 38 +++++----- man/Makefile.am | 55 +++++--------- man/Xfixes.man | 3 src/Cursor.c | 38 +++++----- src/SaveSet.c | 1 src/Selection.c | 1 src/Xfixes.c | 2 src/Xfixesint.h | 1 19 files changed, 360 insertions(+), 124 deletions(-)
New commits: commit 6fe498a9a205a8447dd8494dc50bada74172df69 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 15:02:35 2010 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index d327b13..c647314 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -libxfixes (1:4.0.5-1) UNRELEASED; urgency=low +libxfixes (1:4.0.5-1) unstable; urgency=low * New upstream release. * Bump xutils-dev build-dep for xorg-macros 1.8. * Update debian/copyright from upstream COPYING. * Bump Standards-Version to 3.9.0. - -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 14:44:25 +0100 + -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 15:02:30 +0100 libxfixes (1:4.0.4-2) unstable; urgency=low commit 3b9798af77c00c955177e0ef438949edd3e6a937 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 15:02:29 2010 +0100 Bump Standards-Version to 3.9.0. diff --git a/debian/changelog b/debian/changelog index 3fccc5a..d327b13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libxfixes (1:4.0.5-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for xorg-macros 1.8. * Update debian/copyright from upstream COPYING. + * Bump Standards-Version to 3.9.0. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 14:44:25 +0100 diff --git a/debian/control b/debian/control index e269de0..7bbb57b 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5+4), -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfixes Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfixes.git commit 14517108dfe323b83bc5d4be0329a6ae49d16f1e Author: Julien Cristau <[email protected]> Date: Sun Jul 11 15:01:44 2010 +0100 Update debian/copyright from upstream COPYING. diff --git a/debian/changelog b/debian/changelog index 50de53e..3fccc5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxfixes (1:4.0.5-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for xorg-macros 1.8. + * Update debian/copyright from upstream COPYING. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 14:44:25 +0100 diff --git a/debian/copyright b/debian/copyright index c7d9ec1..5723143 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,7 @@ This package was downloaded from http://xorg.freedesktop.org/releases/individual/lib/ + Copyright © 2001,2003 Keith Packard Permission to use, copy, modify, distribute, and sell this software and its @@ -21,3 +22,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 (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"), +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. commit b28f85dd2baf4b9b13a4119c59771ce29e8c3b57 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:50:44 2010 +0100 Bump xutils-dev build-dep for xorg-macros 1.8. diff --git a/debian/changelog b/debian/changelog index df17974..50de53e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxfixes (1:4.0.5-1) UNRELEASED; urgency=low * New upstream release. + * Bump xutils-dev build-dep for xorg-macros 1.8. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 14:44:25 +0100 diff --git a/debian/control b/debian/control index e643fe5..e269de0 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: quilt, automake, libtool, - xutils-dev (>= 1:7.5~1) + xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfixes Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfixes.git commit ef706953b3fa42a45accd3ffa61d8f0353b71f21 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:44:51 2010 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 2da094c..fffbc65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,151 @@ +commit 01e803aebdfddfce6374b03e5f31723698aa0c00 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jun 9 20:18:25 2010 -0700 + + libXfixes 4.0.5 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7d08b9841ce01628881969b9cdd08d732c87aad7 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 8 19:14:44 2010 -0700 + + Fix .TH values in Xfixes.man + + Requires xorg-macros 1.8 in order to get the updated XORG_MANPAGE_SECTIONS + that sets $(SED) & $(MAN_SUBSTS) from configure for us. + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + +commit e81d298c3dd043ee2234156f81d75cac394ad896 +Author: Alan Coopersmith <[email protected]> +Date: Tue Jun 8 19:04:01 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit bdebfcf8096b7403c5e59501d73e5b73d2e65f15 +Author: Jamey Sharp <[email protected]> +Date: Fri Apr 9 17:26:31 2010 -0700 + + Always call SyncHandle after issuing an X request. + +commit e09464e0ec1f6994272f3ef324b7fa77329948d4 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 946578b59ced5d828b0ad62fe96fc6d9bb31008a +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit e3acd4a80b246166bb971095ff598944fb59281b +Author: Alan Coopersmith <[email protected]> +Date: Thu Jan 14 19:09:28 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 43397a8cb586caefc60787c98792ae2aae43fddf +Author: Alan Coopersmith <[email protected]> +Date: Thu Jan 14 19:07:17 2010 -0800 + + Purge CVS/RCS id tags + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit e27e229cf7f1809b1997dcafc147e512b0fb014d +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 14 15:54:31 2010 -0500 + + COPYING: add missing copyright notice. + + Refer to: Cursor.c + Copyright © 2006 Sun Microsystems + + Signed-off-by: Gaetan Nadon <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9e1da45e4cc425f1aa8bc7021645372cad93f029 +Author: Gaetan Nadon <[email protected]> +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 b228e13d654f07297cc40cabe81fdb50469c1e83 +Author: Gaetan Nadon <[email protected]> +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 12e260765e880ffe2e078e6eb399bd137116d2cc +Author: Gaetan Nadon <[email protected]> +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 82d17ac11ced59195eb160464b011546ca72a5c7 +Author: Gaetan Nadon <[email protected]> +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 55d7359a38e2e461a1320872bf955a298f06abd2 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 21 12:47:25 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <[email protected]> + commit ed2f91926bcef1610abe3c9cef61b1bb1c918ec8 Author: Alan Coopersmith <[email protected]> Date: Thu Oct 8 08:45:02 2009 -0700 diff --git a/debian/changelog b/debian/changelog index 079a459..df17974 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxfixes (1:4.0.5-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 14:44:25 +0100 + libxfixes (1:4.0.4-2) unstable; urgency=low [ Julien Cristau ] commit 01e803aebdfddfce6374b03e5f31723698aa0c00 Author: Alan Coopersmith <[email protected]> Date: Wed Jun 9 20:18:25 2010 -0700 libXfixes 4.0.5 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index fe3ea23..f6a8ac2 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,10 @@ dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n, dnl that 'revision' number appears in Xfixes.h and has to be manually dnl synchronized. dnl -AC_INIT(libXfixes, 4.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfixes) +AC_INIT(libXfixes, + 4.0.5, + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], + libXfixes) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 7d08b9841ce01628881969b9cdd08d732c87aad7 Author: Alan Coopersmith <[email protected]> Date: Tue Jun 8 19:14:44 2010 -0700 Fix .TH values in Xfixes.man Requires xorg-macros 1.8 in order to get the updated XORG_MANPAGE_SECTIONS that sets $(SED) & $(MAN_SUBSTS) from configure for us. Signed-off-by: Alan Coopersmith <[email protected]> Reviewed-by: Dan Nicholson <[email protected]> diff --git a/configure.ac b/configure.ac index 52d3b5b..fe3ea23 100644 --- a/configure.ac +++ b/configure.ac @@ -36,10 +36,10 @@ AC_INIT(libXfixes, 4.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require xorg-macros 1.8 or later 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) # Check for progs diff --git a/man/Makefile.am b/man/Makefile.am index e7bbe54..b54f92a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -31,15 +31,7 @@ EXTRA_DIST = $(libman_PRE) 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' +# String replacements for man pages now come from xorg-macros.m4 via configure SUFFIXES = .$(LIB_MAN_SUFFIX) .man diff --git a/man/Xfixes.man b/man/Xfixes.man index ddc6c46..075b78f 100644 --- a/man/Xfixes.man +++ b/man/Xfixes.man @@ -25,7 +25,7 @@ .ns .TP \\$1 .. -.TH XFIXES 3 "Version 1.0" "XFree86" +.TH XFIXES __libmansuffix__ __xorgversion__ .SH NAME XFixes \- Augmented versions of core protocol requests commit e81d298c3dd043ee2234156f81d75cac394ad896 Author: Alan Coopersmith <[email protected]> Date: Tue Jun 8 19:04:01 2010 -0700 Sun's copyrights now belong to Oracle Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index 06dfed9..66012a9 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 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/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h index 1ba11f5..0c00310 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.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/Makefile.am b/man/Makefile.am index 75174cd..e7bbe54 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright © 2005 Sun Microsystems, Inc. All rights reserved. +# 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"), diff --git a/src/Cursor.c b/src/Cursor.c index 286c847..edd179d 100644 --- a/src/Cursor.c +++ b/src/Cursor.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"), commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit bdebfcf8096b7403c5e59501d73e5b73d2e65f15 Author: Jamey Sharp <[email protected]> Date: Fri Apr 9 17:26:31 2010 -0700 Always call SyncHandle after issuing an X request. diff --git a/src/Xfixes.c b/src/Xfixes.c index 8817ee0..7d3af84 100644 --- a/src/Xfixes.c +++ b/src/Xfixes.c @@ -91,6 +91,7 @@ XFixesExtAddDisplay (XFixesExtInfo *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 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit e09464e0ec1f6994272f3ef324b7fa77329948d4 Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/configure.ac b/configure.ac index d435e85..52d3b5b 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 XFixes version. XFixesQueryVersion commit 946578b59ced5d828b0ad62fe96fc6d9bb31008a Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/Makefile.am b/Makefile.am index 1843abd..d6a90e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfixes.pc MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = xfixes.pc.in .PHONY: ChangeLog INSTALL commit e3acd4a80b246166bb971095ff598944fb59281b Author: Alan Coopersmith <[email protected]> Date: Thu Jan 14 19:09:28 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index ae1ce63..06dfed9 100644 --- a/COPYING +++ b/COPYING @@ -19,23 +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 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/Xfixes.h b/include/X11/extensions/Xfixes.h index b2cd583..1ba11f5 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.h @@ -1,25 +1,26 @@ /* + * 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 © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/man/Makefile.am b/man/Makefile.am index 3d95e5f..75174cd 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,28 +1,25 @@ # -# 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 © 2005 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, 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) diff --git a/src/Cursor.c b/src/Cursor.c index b1f9b9c..286c847 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -1,25 +1,26 @@ /* + * 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 © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its commit 43397a8cb586caefc60787c98792ae2aae43fddf Author: Alan Coopersmith <[email protected]> Date: Thu Jan 14 19:07:17 2010 -0800 Purge CVS/RCS id tags Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/include/X11/extensions/Xfixes.h b/include/X11/extensions/Xfixes.h index 873aab3..b2cd583 100644 --- a/include/X11/extensions/Xfixes.h +++ b/include/X11/extensions/Xfixes.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xfixes/Xfixes.h,v 1.1 2002/11/30 06:21:45 keithp Exp $ * * Copyright © 2006 Sun Microsystems * diff --git a/man/Xfixes.man b/man/Xfixes.man index 9722236..ddc6c46 100644 --- a/man/Xfixes.man +++ b/man/Xfixes.man @@ -1,5 +1,4 @@ .\" -.\" $XFree86: xc/lib/Xfixes/Xfixes.man,v 1.1 2002/11/30 06:21:45 keithp Exp $ .\" .\" Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. .\" diff --git a/src/Cursor.c b/src/Cursor.c index 5fd8efe..b1f9b9c 100644 --- a/src/Cursor.c +++ b/src/Cursor.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xfixes/Cursor.c,v 1.1 2002/11/30 06:21:44 keithp Exp $ * * Copyright © 2006 Sun Microsystems * diff --git a/src/SaveSet.c b/src/SaveSet.c index c5b73f9..c57ae73 100644 --- a/src/SaveSet.c +++ b/src/SaveSet.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xfixes/SaveSet.c,v 1.1 2002/11/30 18:41:33 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/Selection.c b/src/Selection.c index 888dc84..708d583 100644 --- a/src/Selection.c +++ b/src/Selection.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xfixes/Selection.c,v 1.1 2002/11/30 06:21:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/Xfixes.c b/src/Xfixes.c index b9b0fb6..8817ee0 100644 --- a/src/Xfixes.c +++ b/src/Xfixes.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xfixes/Xfixes.c,v 1.1 2002/11/30 06:21:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/Xfixesint.h b/src/Xfixesint.h index e227571..8f0c0b1 100644 --- a/src/Xfixesint.h +++ b/src/Xfixesint.h @@ -1,5 +1,4 @@ /* - * $XFree86: xc/lib/Xfixes/Xfixesint.h,v 1.1 2002/11/30 06:21:45 keithp Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * commit e27e229cf7f1809b1997dcafc147e512b0fb014d Author: Gaetan Nadon <[email protected]> Date: Thu Jan 14 15:54:31 2010 -0500 COPYING: add missing copyright notice. Refer to: Cursor.c Copyright © 2006 Sun Microsystems Signed-off-by: Gaetan Nadon <[email protected]> Reviewed-by: Peter Hutterer <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index e506314..ae1ce63 100644 --- a/COPYING +++ b/COPYING @@ -19,3 +19,23 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
