libsm: Changes to 'debian-unstable'
.gitignore | 73 -
COPYING | 21
ChangeLog | 443 ++++++
Makefile.am | 12
README | 5
configure.ac | 27
debian/changelog | 15
debian/control | 8
debian/libsm-dev.install | 3
debian/rules | 4
doc/.gitignore | 6
doc/Makefile.am | 64
doc/SMlib.xml | 3230 +++++++++++++++++++++++++++++++++++++++++++++++
doc/xsmp.xml | 2274 +++++++++++++++++++++++++++++++++
include/X11/SM/SM.h | 2
include/X11/SM/SMlib.h | 2
include/X11/SM/SMproto.h | 2
src/Makefile.am | 2
src/SMlibint.h | 3
src/sm_auth.c | 3
src/sm_error.c | 3
src/sm_genid.c | 27
src/sm_manager.c | 3
src/sm_misc.c | 2
src/sm_process.c | 3
25 files changed, 6171 insertions(+), 66 deletions(-)
New commits:
commit d912d6d20b618890c932f3f4fafbe4ba91767e9c
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:42:47 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 95a8830..c6e1f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libsm (2:1.2.0-1) UNRELEASED; urgency=low
+libsm (2:1.2.0-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -15,7 +15,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
* Switch from --list-missing to --fail-missing for additional safety.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:31:02 +0100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:42:36 +0100
libsm (2:1.1.1-1) unstable; urgency=low
commit 107c6314cc689d1c12c9c3c24030efff4821dd2a
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:41:09 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index f453047..95a8830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
* 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.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:31:02 +0100
diff --git a/debian/control b/debian/control
index 7e6ea7c..bc3ee91 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libsm
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit a287f6086d1ec418007e0d3bf74c52015f67044b
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:40:53 2010 +0100
Switch from --list-missing to --fail-missing for additional safety.
diff --git a/debian/changelog b/debian/changelog
index da7987b..f453047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
* Pass --with-xmlto and --without-fop, we want html and txt only.
* 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:31:02 +0100
diff --git a/debian/rules b/debian/rules
index 2a26d49..e0dc3d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,7 +89,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing --exclude=libSM.la
+ dh_install --sourcedir=debian/tmp --fail-missing --exclude=libSM.la
dh_installchangelogs ChangeLog
dh_link
dh_strip --dbg-package=$(PACKAGE)-dbg
commit 5db1e66d00dfeb6f36992d8f230bb1e90117812d
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:40:34 2010 +0100
Ship *.html, *.css, and *.txt from the doc directory.
diff --git a/debian/changelog b/debian/changelog
index 2dc7f70..da7987b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
* Pass --with-xmlto and --without-fop, we want html and txt only.
* 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:31:02 +0100
diff --git a/debian/libsm-dev.install b/debian/libsm-dev.install
index 90488cf..57831b9 100644
--- a/debian/libsm-dev.install
+++ b/debian/libsm-dev.install
@@ -2,3 +2,6 @@ usr/include/X11/*
usr/lib/libSM.a
usr/lib/libSM.so
usr/lib/pkgconfig/sm.pc
+usr/share/doc/libSM/*.html usr/share/doc/libsm-dev/
+usr/share/doc/libSM/*.css usr/share/doc/libsm-dev/
+usr/share/doc/libSM/*.txt usr/share/doc/libsm-dev/
commit 7d1b525507362c806cddc691738327015f85ea58
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:38:43 2010 +0100
Kill *.xml in the doc directory, no point in shipping them.
diff --git a/debian/changelog b/debian/changelog
index 9ec322a..2dc7f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
* Pass --with-xmlto and --without-fop, we want html and txt only.
+ * Kill *.xml in the doc directory, no point in shipping them.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:31:02 +0100
diff --git a/debian/rules b/debian/rules
index 810b4da..2a26d49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,7 @@ install: build
dh_installdirs
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ find debian/tmp/usr/share/doc/libSM/ -name '*.xml' -delete
# Build architecture-dependent files here.
binary-arch: build install
commit 7d9c8c619b87e32365c8affc21cfed74c6e698c3
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:35:34 2010 +0100
Pass --with-xmlto and --without-fop, we want html and txt only.
diff --git a/debian/changelog b/debian/changelog
index f0fdac0..9ec322a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
+ * Pass --with-xmlto and --without-fop, we want html and txt only.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:31:02 +0100
diff --git a/debian/rules b/debian/rules
index 69d1f5e..810b4da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@ build/config.status: autogen-stamp
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --with-xmlto --without-fop \
CFLAGS="$(CFLAGS)"
.PHONY: build
commit 80fb23e3b0165b13ddbdf0cb5dee8bdf5454a458
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:35:04 2010 +0100
Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
diff --git a/debian/changelog b/debian/changelog
index aada5cb..f0fdac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
* 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:31:02 +0100
diff --git a/debian/control b/debian/control
index 2c7fe88..7e6ea7c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,8 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5+5),
quilt,
+# doc:
+ xmlto, xorg-sgml-doctools (>= 1:1.5), w3m,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libsm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libsm.git
commit 92d8ad6c3ea12c61a2b084340635465f96458a8d
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:34:15 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index e10877e..aada5cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libsm (2:1.2.0-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release.
+ * Bump xutils-dev build-dep for new macros.
-- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:31:02 +0100
diff --git a/debian/control b/debian/control
index a8987a9..2c7fe88 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends:
uuid-dev,
automake,
libtool,
- xutils-dev (>= 1:7.4+4),
- quilt
+ xutils-dev (>= 1:7.5+5),
+ quilt,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libsm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libsm.git
commit 882f12a4d9c061eeecd7464153e59fd477eae4d8
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Nov 8 01:31:29 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index a294c24..fbac5dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,446 @@
+commit d2327760a52fdbcd3759211578e3663e00e4a31e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Oct 27 22:26:41 2010 -0700
+
+ libSM 1.2.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 784a330e337af16c1e385d0fbeee1e5369413656
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Oct 24 20:31:54 2010 -0700
+
+ SMlib.xml: Use <simplelist> instead of <synopsis> for lists of mask values
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 12af18dd9a731a816e7b074bbecaa5549bfdba31
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Oct 24 19:57:32 2010 -0700
+
+ SMlib.xml: Tag function names, parameters, constant values, etc.
+
+ Includes correcting <function> tags on things that aren't functions
+ as some stylesheets may add () after <function> tagged items so we
+ shouldn't use them for constants, variables, filenames, etc.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ed9331e10babdd70da51134f0eaee8625a469ffe
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Oct 24 18:54:05 2010 -0700
+
+ SMlib.xml: Line wrapping & other whitespace cleanup
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 763b01e8e69d6132b3b4b57263f19de9de985f99
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 23 00:47:27 2010 -0700
+
+ xsmp.xml: add internal cross-reference links
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 506af19b86af2a7960a3bb5cf72287349012c869
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 23 00:43:28 2010 -0700
+
+ xsmp.xml: Use <synopsis> and related markup for protocol message definition
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 75443d72b4944391b809f429cc4cef2ffb76f7bf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 23 00:10:01 2010 -0700
+
+ xsmp.xml: Use <errorname> instead of <function> for error names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2ed7704e7d4b0086edc8667a80780c6c51ba84cb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 22 23:52:15 2010 -0700
+
+ xsmp.xml: Restore note titles (example/rationale/advice)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 489566ca0e69ed6068fb4bdbaccd413ec2ee8319
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 22 23:39:54 2010 -0700
+
+ xsmp.xml: Clean up tables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c5b211d9a01438958546669f95a5215784348534
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 22 08:44:46 2010 -0700
+
+ xsmp.xml: Misc markup tag cleanups
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a18973e643b0916a2f4bf6fb8fc29508429635bb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 22 08:34:49 2010 -0700
+
+ Coalesce copyright notices in xml docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e3f357dbd39036766765e1de110a876adc2f8226
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 22 08:32:04 2010 -0700
+
+ xsmp.xml: Convert -> & <- to → & ←
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 29e2ac62cb6a152499d1b3f9fe871b1252f3c22f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 22 08:21:27 2010 -0700
+
+ xsmp.xml: Line wrapping & other whitespace cleanup
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c83363e83a937ba2ddd99e732bfde5f8d39bd648
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 23:48:42 2010 -0700
+
+ SMlib.xml: fix a couple parameter list entries
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 862e2b220bc928d6ab2f3bb6159bc4be03914979
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 23:43:49 2010 -0700
+
+ SMlib.xml: misc markup cleanups
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 0b15c3773db651863dc8374d45095bc5aa53d41d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 23:16:14 2010 -0700
+
+ SMlib.xml: fix typo: SmProc -> SmProp
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit cd4739acb0c6d1bca2d3a7adc5c52324928a5561
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 22:55:04 2010 -0700
+
+ SMlib.xml: add internal cross-reference links
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 33a86926ae3a7ddcea817eda8c4b1aac7c518d10
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 16:31:08 2010 -0700
+
+ SMlib.xml: Convert remaining `` quotes to “ style
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 5abbdcde8a9ed3e489e2f9e5b9161dc9ebc5801f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 16:29:21 2010 -0700
+
+ SMlib.xml: Convert remaining literallayout tags to synopsis tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 62bc296fefd0465c1f3eef283f3bf0a43d132ef9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 16:17:09 2010 -0700
+
+ SMlib.xml: Convert function prototypes to <funcprototype> tags
+
+ Provides automatic ansifaction & better formatted output
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ee77c1932c0cd2050371117c3724d66072cbdbee
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Oct 21 15:43:33 2010 -0700
+
+ SMlib.xml: Remove some nroff macros left in tables by mistake
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 24e9d8a2a35452c67ba2e2e34857ce3691d9a22d
+Author: Jesse Adkins <jesserayadkins@gmail.com>
+Date: Tue Sep 28 13:30:02 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e0be9c9dfb60f21edb37ff77d766395aa57a96e4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 27 20:31:28 2010 -0400
+
+ doc: remove trailing spaces in DocBook XML docs
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8c42c25b90b10b2c5f20c93ebd9cf1df622b009f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 25 21:43:08 2010 -0400
+
+ doc: replace groff input format with docbook xml format
+
+ Initial version of SMlib and xsmp docbook xml.
+ Requires util-macros 1.10
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fd37bd0ac012e15bffad7e83d36b87ee3941d6f5
+Author: Alexander Kabaev <kan@FreeBSD.org>
+Date: Wed May 26 13:28:03 2010 -0400
+
+ Fix off by one error in SmsGenerateClientID when uuid_create is used
+
+ Fix apparent typo in SmsGenerateClientID which always leaves the
+ first byte of allocated id string uninitialized. If that byte
+ happens to be 0, SmsGenerateClientId appears to return an empty
+ string to the caller, instead of proper GUID in text form.
+
+ Reviewed-by: James CLoos <cloos@jhcloos.com>
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit af7364c20d91615251b1ec2b19e0cb38e9094ba0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 22 07:42:30 2010 -0700
+
+ Update README now that docs are in this module, not xorg-docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7464514f60ff7754e5c1e91d6913000fb5d366c9
+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 39f4ed794168c824015754e451b4b191fddad643
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 16 19:57:27 2010 -0500
+
+ doc: use HAVE_GROFF_MS to skip doc when 's.tmac' macros missing
+
+ This conditional is defined in XORG_WITH_GROFF macro.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 64f201ae65de7024bce0a85d6380ac158a3b5852
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 16 14:41:22 2010 -0500
+
+ specs: change install cmd due to automake 1.11
+
+ docData_INSTALL is defined in 1.9 and 1.10 but not 1.11
+
+ Reported-by: Tobias Droste <tdroste@gmx.de>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 98f205119011c016ec902c69d882a26dd7185a43
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Feb 9 17:39:46 2010 -0500
+
+ doc: use $(mkdir_p) rather than $(MKDIR_P) due to automake 1.9.6
+
+ $(MKDIR_P) is not defined in automake 1.9.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c22a324b4c1e1ac38b1c04656ecdcf9127343e8d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Feb 1 14:58:21 2010 -0500
+
+ doc: install generated images in $docdir
+
+ The html installed doc is incomplete without the generated images.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 844a1de311492a7666c60f39c6cbe23a5c3f22da
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Jan 30 14:11:36 2010 -0500
+
+ doc: use new macros to control doc generation
+
+ Namely XORG_WITH_GROFF for the groff generation tool
+ XORG_ENABLE_DOCS for the generation of all docs
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 626788435d4a49eeea9fa2382f7ec554a0b92197
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jan 26 16:32:00 2010 -0500
+
+ doc: clean-up generated html images
+
+ Generate images in /images as is the convention
+ Provide a base file name for images rather than process ID
+ Remove images directory when running make clean
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b5af7f362e30b1bbde4eef4216385ae2b2ea1bee
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Thu Jan 14 21:00:53 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 0b2e5ca9da6b35f5cf98ac879601cf8083c72dde
+Author: Rémi Cardona <remi@gentoo.org>
+Date: Thu Dec 17 08:26:28 2009 +0100
+
+ require autoconf 2.60 because of $(docdir) use
+
+ Signed-off-by: Rémi Cardona <remi@gentoo.org>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+
+commit 7f92faa03910bf74fbebefb5d543c09958fb3b28
+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 802f5e2a67ef3d214a0560c36985f8fed3ab92f1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Nov 11 18:56:57 2009 -0500
+
+ Update .gitignore for the /doc directory #24239
+
+commit 7309ebe123d05955d81318bca5c58ee90b9887dd
+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 2fb04f8726ddf8ad0749a6b733ab87c5e1bc06dc
+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 e88afa3327621f8eb00d920c45536e08b7bc1898
+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 d4e3653ff1eed208ea6f35158ad03da7729622b9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Nov 16 14:57:19 2009 -0800
+
+ Revert "Fix memory leak for SM_DeleteProperties"
+
+ This reverts commit 58aa8879e10b12e478ab14b90afd1001b4abd316.
+
+ Fixes gnome-session crashes due to double frees, as reported in
+ http://bugs.freedesktop.org/show_bug.cgi?id=24964
+
+commit 41d5bb13119b36a7ce6a344372df1b788994e2c7
+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 58aa8879e10b12e478ab14b90afd1001b4abd316
+Author: Michael Jansen <kde@michael-jansen.biz>
+Date: Wed Oct 14 11:01:46 2009 -0700
+
+ Fix memory leak for SM_DeleteProperties
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 6d43663bf01e055cfe713dccac39b651a0ccfacf
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Oct 10 00:37:41 2009 -0700
+
+ Move session management protocol docs from xorg-docs here too
+
+ Since we don't have a smproto package, but ship the protocol headers
+ in this module, might as well keep the protocol docs with the headers
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit b1363f9fa47e1564aa5e4fe822bd6a04b5a44954
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Sat Oct 10 00:02:04 2009 -0700
+
+ Move docs from xorg-docs, use groff to format for installation
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit c8e29f4a18041c7a649f701a7cfdd37080d7c6f6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Oct 9 23:28:11 2009 -0700
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 7fc343e70202279fd3daa3adf789ca35b0ec8891
+Author: Rémi Cardona <remi@gentoo.org>
+Date: Fri Aug 14 11:20:34 2009 +0200
+
+ require libICE >= 1.0.5
+
+ During the ansification (commit 896aeb5dd128), 2 extern decls for
+ _IcePaMagicCookie1Proc and _IcePoMagicCookie1Proc were dropped from
+ sm_client.c and sm_manager.c. Both decls were added between libICE 1.0.4
+ and 1.0.5.
+
+ Signed-off-by: Rémi Cardona <remi@gentoo.org>
+
commit 82bbf42a2ba0401a8346505b1292ddb7b58f4507
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Aug 7 14:19:50 2009 +0200
diff --git a/debian/changelog b/debian/changelog
index 351c6e7..e10877e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-libsm (2:1.1.1-2) UNRELEASED; urgency=low
+libsm (2:1.2.0-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
good reason. Thanks, Colin Watson!
* Remove myself from Uploaders
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Jan 2010 16:47:41 +0000
+ [ Cyril Brulebois ]
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 08 Nov 2010 01:31:02 +0100
libsm (2:1.1.1-1) unstable; urgency=low
commit d2327760a52fdbcd3759211578e3663e00e4a31e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Oct 27 22:26:41 2010 -0700
libSM 1.2.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index fd6b045..54aabdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.60)
AC_INIT([libSM],
- 1.1.1,
+ [1.2.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libSM)
commit 784a330e337af16c1e385d0fbeee1e5369413656
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 20:31:54 2010 -0700
SMlib.xml: Use <simplelist> instead of <synopsis> for lists of mask values
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/doc/SMlib.xml b/doc/SMlib.xml
index a82f209..fd84f1a 100644
--- a/doc/SMlib.xml
+++ b/doc/SMlib.xml
@@ -444,12 +444,12 @@ backwards compatibility in future versions of the library.
The following values may be ORed together to obtain a
<parameter>mask</parameter> value:
-<synopsis>
-<constant>SmcSaveYourselfProcMask</constant>
-<constant>SmcDieProcMask</constant>
-<constant>SmcSaveCompleteProcMask</constant>
-<constant>SmcShutdownCancelledProcMask</constant>
-</synopsis>
+ <simplelist type='vert'>
+ <member><constant>SmcSaveYourselfProcMask</constant></member>
+ <member><constant>SmcDieProcMask</constant></member>
+ <member><constant>SmcSaveCompleteProcMask</constant></member>
+ <member><constant>SmcShutdownCancelledProcMask</constant></member>
+ </simplelist>
</para>
<para>
@@ -843,12 +843,12 @@ use <function>SmcModifyCallbacks</function>
When specifying a value for the <parameter>mask</parameter> argument,
the following values may be ORed together:
-<synopsis>
-<constant>SmcSaveYourselfProcMask</constant>
-<constant>SmcDieProcMask</constant>
-<constant>SmcSaveCompleteProcMask</constant>
-<constant>SmcShutdownCancelledProcMask</constant>
-</synopsis>
+ <simplelist type='vert'>
+ <member><constant>SmcSaveYourselfProcMask</constant></member>
+ <member><constant>SmcDieProcMask</constant></member>
+ <member><constant>SmcSaveCompleteProcMask</constant></member>
+ <member><constant>SmcShutdownCancelledProcMask</constant></member>
+ </simplelist>
</para>
</sect1>
@@ -1624,18 +1624,18 @@ of the library.
<para>
The following values may be ORed together to obtain a mask value:
-<synopsis>
-<constant>SmsRegisterClientProcMask</constant>
-<constant>SmsInteractRequestProcMask</constant>
-<constant>SmsInteractDoneProcMask</constant>
-<constant>SmsSaveYourselfRequestProcMask</constant>
-<constant>SmsSaveYourselfP2RequestProcMask</constant>
-<constant>SmsSaveYourselfDoneProcMask</constant>
-<constant>SmsCloseConnectionProcMask</constant>
-<constant>SmsSetPropertiesProcMask</constant>
-<constant>SmsDeletePropertiesProcMask</constant>
-<constant>SmsGetPropertiesProcMask</constant>
-</synopsis>
+ <simplelist type='vert'>
+ <member><constant>SmsRegisterClientProcMask</constant></member>
+ <member><constant>SmsInteractRequestProcMask</constant></member>
+ <member><constant>SmsInteractDoneProcMask</constant></member>
+ <member><constant>SmsSaveYourselfRequestProcMask</constant></member>
+ <member><constant>SmsSaveYourselfP2RequestProcMask</constant></member>
+ <member><constant>SmsSaveYourselfDoneProcMask</constant></member>
+ <member><constant>SmsCloseConnectionProcMask</constant></member>
+ <member><constant>SmsSetPropertiesProcMask</constant></member>
+ <member><constant>SmsDeletePropertiesProcMask</constant></member>
+ <member><constant>SmsGetPropertiesProcMask</constant></member>
+ </simplelist>
</para>
<para>
commit 12af18dd9a731a816e7b074bbecaa5549bfdba31
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Oct 24 19:57:32 2010 -0700
SMlib.xml: Tag function names, parameters, constant values, etc.
Includes correcting <function> tags on things that aren't functions
as some stylesheets may add () after <function> tagged items so we
shouldn't use them for constants, variables, filenames, etc.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/doc/SMlib.xml b/doc/SMlib.xml
index d49983c..a82f209 100644
--- a/doc/SMlib.xml
+++ b/doc/SMlib.xml
@@ -131,12 +131,12 @@ a <firstterm>client-ID</firstterm> that uniquely identifies them in
the session. The session manager maintains a list of properties for
each client in the session. These properties describe the client's
environment and, most importantly, describe how the client can be
-restarted (via an <function>SmRestartCommand</function>. Clients are
+restarted (via an <property>SmRestartCommand</property>). Clients are
expected to save their state in such a way as to allow multiple
instantiations of themselves to be managed independently. For
example, clients may use their client-ID as part of a filename in
which to store the state for a particular instantiation. The
-client-ID should be saved as part of the <function>SmRestartCommand</function>
+client-ID should be saved as part of the <property>SmRestartCommand</property>
so that the client will retain the same ID after it is restarted.
</para>
@@ -224,16 +224,17 @@ standard.
<para>
Applications (both session managers and clients) should include the
-header file <<symbol role='Pn'>X11/SM/SMlib.h</symbol>>. This
-header file defines all of the SMlib data structures and function
-prototypes. <function>SMlib.h</function> includes the header file
-<<symbol role='Pn'>X11/SM/SM.h</symbol>>, which defines all of
-the SMlib constants.
+header file <<filename class='headerfile'>X11/SM/SMlib.h</filename>>.
+This header file defines all of the SMlib data structures and function
+prototypes. <filename class='headerfile'>SMlib.h</filename> includes the
+header file <<filename class='headerfile'>X11/SM/SM.h</filename>>,
+which defines all of the SMlib constants.
</para>
<para>
Because SMlib is dependent on ICE, applications should link against
-SMlib and ICElib by using <function>-lSM</function> <function>-lICE</function>
+SMlib and ICElib by using
+<quote><option>-lSM</option> <option>-lICE</option></quote>.
</para>
</chapter>
@@ -288,8 +289,9 @@ use <function>SmcOpenConnection</function>
<varlistentry>
<term><parameter>context</parameter></term>
<listitem><para>
-A pointer to an opaque object or NULL. Used to determine if an ICE
-connection can be shared (see <link linkend='context_sharing'>below</link>).
+A pointer to an opaque object or <constant>NULL</constant>. Used to determine
+if an ICE connection can be shared
+(see <link linkend='context_sharing'>below</link>).
</para></listitem>
</varlistentry>
<varlistentry>
@@ -302,7 +304,7 @@ The highest major version of the XSMP the application supports.
<term><parameter>xsmp_minor_rev</parameter></term>
<listitem><para>
The highest minor version of the XSMP the application supports (for
-the specified xsmp_major_rev).
+the specified <parameter>xsmp_major_rev</parameter>).
</para></listitem>
</varlistentry>
<varlistentry>
@@ -326,22 +328,23 @@ messages from the session manager.
</varlistentry>
<varlistentry>
<term><parameter>error_length</parameter></term>
- <listitem><para>Length of the error_string_ret argument passed in.</para></listitem>
+ <listitem><para>Length of the <parameter>error_string_ret</parameter> argument passed in.</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>error_string_ret</parameter></term>
<listitem><para>
Returns a null-terminated error message, if any.
-The error_string_ret argument points to user supplied memory.
-No more than error_length bytes are used.
+The <parameter>error_string_ret</parameter> argument points to user supplied
+memory. No more than <parameter>error_length</parameter> bytes are used.
</para></listitem>
</varlistentry>
</variablelist>
<para>
-The network_ids_list argument is a null-terminated string containing
-a list of network IDs for the session manager, separated by commas.
-If network_ids_list is NULL, the value of
+The <parameter>network_ids_list</parameter> argument is a
+null-terminated string containing a list of network IDs for the session
+manager, separated by commas. If <parameter>network_ids_list</parameter>
+is <constant>NULL</constant>, the value of
the <envar>SESSION_MANAGER</envar> environment variable will be used.
Each network ID has the following format:
@@ -379,22 +382,24 @@ an attempt will be made using the second network ID, and so on.
<para>
After the connection is established, <function>SmcOpenConnection</function>
registers the client with the session manager. If the client is being
-restarted from a previous session, previous_id should contain a null
-terminated string representing the client ID from the previous
-session. If the client is first joining the session, previous_id
-should be set to NULL. If previous_id is specified but is determined
+restarted from a previous session, <parameter>previous_id</parameter>
+should contain a null terminated string representing the client ID from the
+previous session. If the client is first joining the session,
+<parameter>previous_id</parameter> should be set to <constant>NULL</constant>.
+If <parameter>previous_id</parameter> is specified but is determined
to be invalid by the session manager, SMlib will re-register the
-client with previous_id set to NULL.
+client with <parameter>previous_id</parameter> set to <constant>NULL</constant>.
</para>
<para>
If <function>SmcOpenConnection</function> succeeds, it returns an
opaque connection pointer of type <function>SmcConn</function> and the
-client_id_ret argument contains the client ID to be used for this
-session. The client_id_ret should be freed with a call
-to <function>free</function> when no longer needed. On
-failure, <function>SmcOpenConnection</function> returns NULL, and the
-reason for failure is returned in error_string_ret.
+<parameter>client_id_ret</parameter> argument contains the client ID to be
+used for this session. The <parameter>client_id_ret</parameter> should be
+freed with a call to <function>free</function> when no longer needed. On
+failure, <function>SmcOpenConnection</function> returns
+<constant>NULL</constant>, and the reason for failure is returned in
+<parameter>error_string_ret</parameter>.
</para>
<para>
Reply to: