libice: Changes to 'debian-unstable'
.gitignore | 74
ChangeLog | 165
Makefile.am | 11
README | 4
configure.ac | 30
debian/changelog | 12
debian/control | 4
debian/libice-dev.install | 3
debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch | 32
debian/patches/series | 1
debian/rules | 3
doc/.gitignore | 6
doc/ICElib.xml | 4588 ++++++++++
doc/Makefile.am | 64
include/X11/ICE/ICE.h | 1
include/X11/ICE/ICEconn.h | 1
include/X11/ICE/ICElib.h | 2
include/X11/ICE/ICEmsg.h | 2
include/X11/ICE/ICEproto.h | 1
include/X11/ICE/ICEutil.h | 2
specs/.gitignore | 6
specs/Makefile.am | 64
specs/ice.xml | 2593 +++++
src/ICElibint.h | 2
src/Makefile.am | 7
src/accept.c | 1
src/authutil.c | 3
src/connect.c | 2
src/error.c | 3
src/getauth.c | 2
src/globals.h | 2
src/iceauth.c | 2
src/listen.c | 3
src/listenwk.c | 3
src/locking.c | 1
src/misc.c | 2
src/ping.c | 1
src/process.c | 2
src/protosetup.c | 2
src/register.c | 1
src/replywait.c | 1
src/setauth.c | 2
src/shutdown.c | 2
src/watch.c | 1
44 files changed, 7600 insertions(+), 114 deletions(-)
New commits:
commit 3a31fe724a05b39d0e83d7c6f4f194cd0dd39362
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:24:11 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 6b59714..dc29af7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libice (2:1.0.7-1) UNRELEASED; urgency=low
+libice (2:1.0.7-1) unstable; urgency=low
* New upstream release.
* Drop 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
@@ -8,7 +8,7 @@ libice (2:1.0.7-1) UNRELEASED; urgency=low
* Ship *.html, *.css, and *.txt from the doc directory.
* Switch from --list-missing to --fail-missing for additional safety.
- -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:24:07 +0100
libice (2:1.0.6-2) unstable; urgency=low
commit fe089eaf27817b72ec83e5e2509d54c9cda44f9e
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:22:16 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index 2616b75..6b59714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libice (2:1.0.7-1) UNRELEASED; urgency=low
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
* Kill *.xml in the doc directory, no point in shipping them.
* Ship *.html, *.css, and *.txt from the doc directory.
+ * Switch from --list-missing to --fail-missing for additional safety.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
diff --git a/debian/rules b/debian/rules
index eb7429f..3c8b0cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing --exclude=libICE.la
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=libICE.la
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
commit 01af34c3aa61300160635295ac0026c195e50bf0
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:22:05 2010 +0100
Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/changelog b/debian/changelog
index e0aeaea..2616b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libice (2:1.0.7-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
* Kill *.xml in the doc directory, no point in shipping them.
+ * Ship *.html, *.css, and *.txt from the doc directory.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
diff --git a/debian/libice-dev.install b/debian/libice-dev.install
index 7ca92b0..75a4362 100644
--- a/debian/libice-dev.install
+++ b/debian/libice-dev.install
@@ -2,3 +2,6 @@ usr/include/X11/*
usr/lib/libICE.a
usr/lib/libICE.so
usr/lib/pkgconfig/ice.pc
+usr/share/doc/libICE/*.html usr/share/doc/libice-dev/
+usr/share/doc/libICE/*.css usr/share/doc/libice-dev/
+usr/share/doc/libICE/*.txt usr/share/doc/libice-dev/
commit ae96c4d80e8d536f2a4b95bbbde764667d571456
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:21:46 2010 +0100
Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/changelog b/debian/changelog
index 4a196e1..e0aeaea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libice (2:1.0.7-1) UNRELEASED; urgency=low
* Drop 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
+ * Kill *.xml in the doc directory, no point in shipping them.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
diff --git a/debian/rules b/debian/rules
index 21fa264..eb7429f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,7 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ find debian/tmp/usr/share/doc/libICE/ -name '*.xml' -delete
# Build architecture-dependent files here.
binary-arch: build install
commit d984535df0d334e9183f7da5c33d758f96653f4a
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:18:02 2010 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
diff --git a/debian/changelog b/debian/changelog
index d6fb045..4a196e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libice (2:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
* Drop 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
* Bump xutils-dev build-dep for new macros.
+ * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
diff --git a/debian/control b/debian/control
index d44f9a6..c32faac 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+5),
+# doc:
+ xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libice
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libice.git
commit d19305b439b4b3de9fd4baa7103dddbf9371ac10
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:17:49 2010 +0100
Drop 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
diff --git a/debian/changelog b/debian/changelog
index 62a646c..d6fb045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libice (2:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Drop 0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
* Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
diff --git a/debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch b/debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
deleted file mode 100644
index eb8bf38..0000000
--- a/debian/patches/0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1967c04c021a4cfd7b3cdd4efdc13610b4385a65 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Tue, 11 May 2010 16:36:20 +0200
-Subject: [PATCH] Set the close-on-exec flag for listening sockets
-
-This prevents xsm from leaking file descriptors to the processes it
-starts.
-
-X.Org bug#22932 <http://bugs.freedesktop.org/show_bug.cgi?id=22932>
-
-Reported-by: Kalle Olavi Niemitalo <kon@iki.fi>
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- src/listen.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/listen.c b/src/listen.c
-index eb46f87..be28aef 100644
---- a/src/listen.c
-+++ b/src/listen.c
-@@ -76,6 +76,8 @@ IceListenForConnections (
-
- for (i = 0; i < transCount; i++)
- {
-+ _IceTransSetOption(transConns[i], TRANS_CLOSEONEXEC, 1);
-+
- networkId = _IceTransGetMyNetworkId (transConns[i]);
-
- if (networkId)
---
-1.7.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1c91e89..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Set-the-close-on-exec-flag-for-listening-sockets.patch
commit 5dd9ceaf0ec166e386098feb37e1f205218e39cc
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:15:50 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 9ddc6e5..62a646c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libice (2:1.0.7-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
diff --git a/debian/control b/debian/control
index 0901143..d44f9a6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
xtrans-dev (>= 1.0.1),
automake,
libtool,
- xutils-dev (>= 1:7.4+4)
+ xutils-dev (>= 1:7.5+5),
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libice
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libice.git
commit ce2b7d9898b12d9ab1af6af5f1010aa03b0082df
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:14:12 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 5bd0999..9dbdfbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,168 @@
+commit 9856f5679b2b2d458cf830c1e8fdd206c724dfc5
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Oct 19 11:19:08 2010 -0400
+
+ libICE 1.0.7
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 59a8d5609398824c81b72deb82735a55332ca239
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 17 21:26:31 2010 -0700
+
+ Fix include ordering, so -I../include precedes $CPPFLAGS which could
+ cause us to include installed rather than packaged headers.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4a6f7a357222b2c1fa289d6e7b5fcc8c361e20e9
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:01 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5bb806a65bf23a507b135abe1e4a8b3cabc7b8aa
+Author: Matt Dew <matt@osource.org>
+Date: Wed Jun 30 16:52:22 2010 -0400
+
+ specs: convert ICE doc/specs from xorg-docs module to DocBook XML
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9b54f509832c50c1fac0edc0cb78e1a3454a56dc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Jun 8 20:12:53 2010 -0700
+
+ Move ICE protocol & API specs from xorg-docs module
+
+ For now, just checked in and included in dist tarballs, not processed
+ into a usable format - same as it was in xorg-docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1967c04c021a4cfd7b3cdd4efdc13610b4385a65
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue May 11 16:36:20 2010 +0200
+
+ Set the close-on-exec flag for listening sockets
+
+ This prevents xsm from leaking file descriptors to the processes it
+ starts.
+
+ X.Org bug#22932 <http://bugs.freedesktop.org/show_bug.cgi?id=22932>
+
+ Reported-by: Kalle Olavi Niemitalo <kon@iki.fi>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit b6478dbedcca4d4cf44bd588c050bcc70c2f4963
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Apr 5 19:50:40 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 8e175ff18649bd30e862b6a6a5f82a4ed4d5241a
+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 09d61dc024d9846525e4c97d33cdf03c9f06c151
+Author: Gaetan Nadon <memsize@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@videotron.ca>
+
+commit 72b8a2d39a57eb0640929b9bb9f276c6032f8213
+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 68231f8574e197a12eff1ddde37166d101567269
+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 b5cfc1cdd367c93660259a86b3b6683c57e5d76a
+Author: Gaetan Nadon <memsize@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 5524fa4d543932e4565b2235515fef9a5d9a501d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 22:08:41 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 82ad2d2053af2ad37697793b9718721aa3ff80a0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:18 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 4b2289ad5481de7fa51941cf6c2ca7a2a3202690
+Author: Jeremy Huddleston <jeremyhu@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@freedesktop.org>
+
commit 94992c686a6850f2303aa78057a64a6369b64692
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 14:17:50 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index d771ad5..9ddc6e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libice (2:1.0.7-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:13:49 +0100
+
libice (2:1.0.6-2) unstable; urgency=low
[ Julien Cristau ]
commit 9856f5679b2b2d458cf830c1e8fdd206c724dfc5
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Oct 19 11:19:08 2010 -0400
libICE 1.0.7
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 7b5956e..172b885 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.60])
AC_INIT([libICE],
- [1.0.6],
+ [1.0.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libICE])
commit 59a8d5609398824c81b72deb82735a55332ca239
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Oct 17 21:26:31 2010 -0700
Fix include ordering, so -I../include precedes $CPPFLAGS which could
cause us to include installed rather than packaged headers.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 621a82d..a5dd7d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,8 @@
lib_LTLIBRARIES=libICE.la
+AM_CPPFLAGS = -I${top_srcdir}/include
+
AM_CFLAGS = \
- -I${top_srcdir}/include \
$(ICE_CFLAGS) \
$(XTRANS_CFLAGS) \
$(CWARNFLAGS) \
commit 4a6f7a357222b2c1fa289d6e7b5fcc8c361e20e9
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:01 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/ICE/ICE.h b/include/X11/ICE/ICE.h
index e2924f1..7560647 100644
--- a/include/X11/ICE/ICE.h
+++ b/include/X11/ICE/ICE.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICE.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/include/X11/ICE/ICEconn.h b/include/X11/ICE/ICEconn.h
index cdfacca..f169b6c 100644
--- a/include/X11/ICE/ICEconn.h
+++ b/include/X11/ICE/ICEconn.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICEconn.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/include/X11/ICE/ICElib.h b/include/X11/ICE/ICElib.h
index 5950ecd..ba42119 100644
--- a/include/X11/ICE/ICElib.h
+++ b/include/X11/ICE/ICElib.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICElib.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/ICElib.h,v 3.4 2001/12/14 19:53:35 dawes Exp $ */
#ifndef _ICELIB_H_
#define _ICELIB_H_
diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h
index 3329ee9..6a60f1c 100644
--- a/include/X11/ICE/ICEmsg.h
+++ b/include/X11/ICE/ICEmsg.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICEmsg.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _ICEMSG_H_
#define _ICEMSG_H_
diff --git a/include/X11/ICE/ICEproto.h b/include/X11/ICE/ICEproto.h
index 9ca7c44..1fcbe6b 100644
--- a/include/X11/ICE/ICEproto.h
+++ b/include/X11/ICE/ICEproto.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICEproto.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/include/X11/ICE/ICEutil.h b/include/X11/ICE/ICEutil.h
index 8651d94..2852931 100644
--- a/include/X11/ICE/ICEutil.h
+++ b/include/X11/ICE/ICEutil.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICEutil.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */
#ifndef _ICEUTIL_H_
#define _ICEUTIL_H_
diff --git a/src/ICElibint.h b/src/ICElibint.h
index 42983cc..3df59d6 100644
--- a/src/ICElibint.h
+++ b/src/ICElibint.h
@@ -1,4 +1,3 @@
-/* $Xorg: ICElibint.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.6 2001/12/14 19:53:35 dawes Exp $ */
#ifndef _ICELIBINT_H_
#define _ICELIBINT_H_
diff --git a/src/accept.c b/src/accept.c
index 150d8bd..6bc40ad 100644
--- a/src/accept.c
+++ b/src/accept.c
@@ -1,4 +1,3 @@
-/* $Xorg: accept.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/src/authutil.c b/src/authutil.c
index 2191f06..fd0a77d 100644
--- a/src/authutil.c
+++ b/src/authutil.c
@@ -1,5 +1,3 @@
-/* $Xorg: authutil.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
-/* $XdotOrg: xc/lib/ICE/authutil.c,v 1.3 2005/05/17 20:53:55 sandmann Exp $ */
/******************************************************************************
@@ -27,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: authutil.c,v 3.9 2002/05/31 18:45:41 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/connect.c b/src/connect.c
index f948a0a..2542a0c 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -1,4 +1,3 @@
-/* $Xorg: connect.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/connect.c,v 3.9 2001/12/14 19:53:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/error.c b/src/error.c
index 44b8853..5c9aa51 100644
--- a/src/error.c
+++ b/src/error.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: $ */
-/* $Xorg: error.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -27,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/error.c,v 1.5 2001/10/28 03:32:28 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/getauth.c b/src/getauth.c
index 0e86044..aa5d72d 100644
--- a/src/getauth.c
+++ b/src/getauth.c
@@ -1,4 +1,3 @@
-/* $Xorg: getauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/getauth.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/globals.h b/src/globals.h
index f3d0955..2102384 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1,4 +1,3 @@
-/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/globals.h,v 1.4 2001/12/14 19:53:35 dawes Exp $ */
#ifndef __UNIXOS2__
IceConn _IceConnectionObjs[256];
diff --git a/src/iceauth.c b/src/iceauth.c
index 40f1fff..7dc46da 100644
--- a/src/iceauth.c
+++ b/src/iceauth.c
@@ -1,4 +1,3 @@
-/* $Xorg: iceauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/iceauth.c,v 3.5 2001/12/14 19:53:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/listen.c b/src/listen.c
index be28aef..22602d4 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -1,4 +1,3 @@
-/* $Xorg: listen.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/src/listenwk.c b/src/listenwk.c
index f5061c4..7747af6 100644
--- a/src/listenwk.c
+++ b/src/listenwk.c
@@ -1,5 +1,3 @@
-/* $Xorg: listenwk.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */
-
/*
Copyright 1996, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/ICE/listenwk.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */
/* Author: Ralph Mor, X Consortium */
diff --git a/src/locking.c b/src/locking.c
index e504e3f..79a0a74 100644
--- a/src/locking.c
+++ b/src/locking.c
@@ -1,4 +1,3 @@
-/* $Xorg: locking.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/src/misc.c b/src/misc.c
index ea8bbde..890da9a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,4 +1,3 @@
-/* $Xorg: misc.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/misc.c,v 1.3 2001/01/17 19:41:29 dawes Exp $ */
#ifdef WIN32
#define _WILLWINSOCK_
diff --git a/src/ping.c b/src/ping.c
index 04fe735..93d82de 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -1,4 +1,3 @@
-/* $Xorg: ping.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/src/process.c b/src/process.c
index 7797641..583ea1d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,4 +1,3 @@
-/* $Xorg: process.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/process.c,v 3.9tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/protosetup.c b/src/protosetup.c
index c6f19e1..2aab6d9 100644
--- a/src/protosetup.c
+++ b/src/protosetup.c
@@ -1,4 +1,3 @@
-/* $Xorg: protosetup.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/protosetup.c,v 1.2 2001/10/28 03:32:28 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/register.c b/src/register.c
index ac04df5..5b67bf2 100644
--- a/src/register.c
+++ b/src/register.c
@@ -1,4 +1,3 @@
-/* $Xorg: register.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/src/replywait.c b/src/replywait.c
index 4e9ee16..e29f019 100644
--- a/src/replywait.c
+++ b/src/replywait.c
@@ -1,4 +1,3 @@
-/* $Xorg: replywait.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
diff --git a/src/setauth.c b/src/setauth.c
index e20af09..d190de5 100644
--- a/src/setauth.c
+++ b/src/setauth.c
@@ -1,4 +1,3 @@
-/* $Xorg: setauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/setauth.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/shutdown.c b/src/shutdown.c
index e928be2..da80e1f 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -1,4 +1,3 @@
-/* $Xorg: shutdown.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
@@ -26,7 +25,6 @@ in this Software without prior written authorization from The Open Group.
Author: Ralph Mor, X Consortium
******************************************************************************/
-/* $XFree86: xc/lib/ICE/shutdown.c,v 3.3 2001/08/01 00:44:37 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/watch.c b/src/watch.c
index 00897ee..b197a50 100644
--- a/src/watch.c
+++ b/src/watch.c
@@ -1,4 +1,3 @@
-/* $Xorg: watch.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */
/******************************************************************************
commit 5bb806a65bf23a507b135abe1e4a8b3cabc7b8aa
Author: Matt Dew <matt@osource.org>
Date: Wed Jun 30 16:52:22 2010 -0400
specs: convert ICE doc/specs from xorg-docs module to DocBook XML
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index c766add..c2110ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src doc
+SUBDIRS = doc specs src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = ice.pc
diff --git a/configure.ac b/configure.ac
index 1a53f2a..7b5956e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,11 +13,16 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h])
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require xorg-macros minimum of 1.10 for DocBook XML documentation
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.10 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
XORG_DEFAULT_OPTIONS
+XORG_ENABLE_DOCS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
# Checks for programs.
AC_PROG_LIBTOOL
@@ -47,5 +52,6 @@ LINT_FLAGS="${LINT_FLAGS} ${ICE_CFLAGS} ${XTRANS_CFLAGS}"
AC_OUTPUT([Makefile
doc/Makefile
+ specs/Makefile
src/Makefile
ice.pc])
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 0000000..12fe512
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,6 @@
+# Add & Override for this directory and it's subdirectories
+*.html
+*.ps
+*.pdf
+*.txt
+*.css
diff --git a/doc/ICElib.ms b/doc/ICElib.ms
deleted file mode 100644
index 0c35d60..0000000
--- a/doc/ICElib.ms
+++ /dev/null
@@ -1,3400 +0,0 @@
-.\" $Xorg: ICElib.ms,v 1.3 2000/08/17 19:42:09 cpqbld Exp $
-.\" $XdotOrg: xc/doc/specs/ICE/ICElib.ms,v 1.2 2004/04/23 18:42:16 eich Exp $
-.\"
-.\" Use tbl, -ms, and macros.t
-.\"
-.\" macro: start marker
-.de sM
-.ne 4
-.sp 1
-\\h'-0.3i'\\L'-1v'\\v'3p'\\l'1v'\\v'1v-3p'
-.sp -1
-..
-.\" macro: end marker
-.de eM
-.sp -1
-\\h'-0.3i'\\L'-1v'\\v'1v+4p'\\l'1v'\\v'-4p'
-.sp 1
-..
-.EH ''''
-.OH ''''
-.EF ''''
-.OF ''''
-.ad b
-.sp 10
Reply to: