xinit: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 289 ++++++++++++
Makefile.am | 31 -
README | 26 +
configure.ac | 44 +
cpprules.in | 22
debian/changelog | 11
debian/control | 18
debian/patches/03_debian_startx_manpage.diff | 4
launchd/Makefile.am | 3
launchd/console_redirect.c | 418 ++++++++++++++++++
launchd/console_redirect.h | 44 +
launchd/privileged_startx/.gitignore | 9
launchd/privileged_startx/10-tmpdirs.cpp | 46 +
launchd/privileged_startx/20-font_cache.cpp | 35 +
launchd/privileged_startx/Makefile.am | 82 +++
launchd/privileged_startx/client.c | 66 ++
launchd/privileged_startx/privileged_startx.c | 63 ++
launchd/privileged_startx/privileged_startx.defs | 40 +
launchd/privileged_startx/privileged_startx.plist.cpp | 28 +
launchd/privileged_startx/privileged_startx_types.h | 10
launchd/privileged_startx/server.c | 320 +++++++++++++
launchd/user_startx/.gitignore | 2
launchd/user_startx/Makefile.am | 49 ++
launchd/user_startx/launchd_startx.c | 64 ++
launchd/user_startx/startx.plist.cpp | 25 +
man/Makefile.am | 20
man/startx.man | 224 +++++++++
man/xinit.man | 199 ++++++++
org.x.startx.plist.cpp | 24 -
privileged_startx/.gitignore | 9
privileged_startx/10-tmpdirs.cpp | 37 -
privileged_startx/20-font_cache.cpp | 35 -
privileged_startx/Makefile.am | 80 ---
privileged_startx/client.c | 62 --
privileged_startx/org.x.privileged_startx.plist.cpp | 28 -
privileged_startx/privileged_startx.c | 59 --
privileged_startx/privileged_startx.defs | 40 -
privileged_startx/privileged_startx_types.h | 10
privileged_startx/server.c | 306 -------------
startx.cpp | 8
startx.man | 223 ---------
xinit.c | 5
xinit.man | 199 --------
44 files changed, 2126 insertions(+), 1192 deletions(-)
New commits:
commit b97eec0b26ce4d15e6367dde3d3891b693697764
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:47:03 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 92e4fa0..3330cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xinit (1.3.1-1) UNRELEASED; urgency=low
+xinit (1.3.1-1) unstable; urgency=low
* New upstream release.
* Update Uploaders list. Thanks, David & Brice!
@@ -7,7 +7,7 @@ xinit (1.3.1-1) UNRELEASED; urgency=low
* Update 03_debian_startx_manpage.diff, startx.man moved below man/.
* Bump Standards-Version to 3.9.2 (no changes).
- -- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
+ -- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:47:00 +0200
xinit (1.3.0-1) unstable; urgency=low
commit 254f63a4898cb7c3242285206035f19ffdec94b4
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:46:59 2011 +0200
Bump Standards-Version to 3.9.2 (no changes).
diff --git a/debian/changelog b/debian/changelog
index bf32be8..92e4fa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xinit (1.3.1-1) UNRELEASED; urgency=low
* Wrap Depends/Recommends.
* Get rid of obsolete Replaces on xbase-clients from before lenny.
* Update 03_debian_startx_manpage.diff, startx.man moved below man/.
+ * Bump Standards-Version to 3.9.2 (no changes).
-- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
diff --git a/debian/control b/debian/control
index a72e697..93d4132 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
quilt,
automake,
xutils-dev,
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xinit
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xinit.git
commit f45a7782188e2c70c98eb20c774d4b018304ae9b
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:39:54 2011 +0200
Update 03_debian_startx_manpage.diff, startx.man moved below man/.
diff --git a/debian/changelog b/debian/changelog
index 59c7129..bf32be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xinit (1.3.1-1) UNRELEASED; urgency=low
* Update Uploaders list. Thanks, David & Brice!
* Wrap Depends/Recommends.
* Get rid of obsolete Replaces on xbase-clients from before lenny.
+ * Update 03_debian_startx_manpage.diff, startx.man moved below man/.
-- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
diff --git a/debian/patches/03_debian_startx_manpage.diff b/debian/patches/03_debian_startx_manpage.diff
index 32c0030..cb7454b 100644
--- a/debian/patches/03_debian_startx_manpage.diff
+++ b/debian/patches/03_debian_startx_manpage.diff
@@ -5,8 +5,8 @@ Robinson.
startx.man | 54 ++++++++++++++++++++++--------------------------------
1 file changed, 22 insertions(+), 32 deletions(-)
---- a/startx.man
-+++ b/startx.man
+--- a/man/startx.man
++++ b/man/startx.man
@@ -76,6 +76,28 @@ startx -- -layout Multihead
.RE
#ifdef __SCOMAN__
commit f4a7f42c52e401cfcecd5c416ff9bcc40ddb2a73
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:37:48 2011 +0200
Get rid of obsolete Replaces on xbase-clients from before lenny.
diff --git a/debian/changelog b/debian/changelog
index 500769e..59c7129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xinit (1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
* Update Uploaders list. Thanks, David & Brice!
* Wrap Depends/Recommends.
+ * Get rid of obsolete Replaces on xbase-clients from before lenny.
-- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
diff --git a/debian/control b/debian/control
index 3666151..a72e697 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Depends:
Recommends:
xserver-xorg | xserver,
xterm | x-session-manager | x-window-manager | x-terminal-emulator,
-Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X server initialisation tool
xinit and startx are programs which facilitate starting an X server, and
loading a base X session.
commit 14050f2ddee98a5ed1ede24aaf9b574db1ca110a
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:37:05 2011 +0200
Wrap Depends/Recommends.
diff --git a/debian/changelog b/debian/changelog
index 3320e59..500769e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xinit (1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
* Update Uploaders list. Thanks, David & Brice!
+ * Wrap Depends/Recommends.
-- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
diff --git a/debian/control b/debian/control
index 8d586d2..3666151 100644
--- a/debian/control
+++ b/debian/control
@@ -9,15 +9,22 @@ Build-Depends:
libx11-dev (>= 2:1.0.0),
quilt,
automake,
- xutils-dev
+ xutils-dev,
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xinit
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xinit.git
Package: xinit
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, coreutils (>= 7.4-1), x11-common, xauth
-Recommends: xserver-xorg | xserver, xterm | x-session-manager | x-window-manager | x-terminal-emulator
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ coreutils (>= 7.4-1),
+ x11-common,
+ xauth,
+Recommends:
+ xserver-xorg | xserver,
+ xterm | x-session-manager | x-window-manager | x-terminal-emulator,
Replaces: xbase-clients (<= 1:7.2.ds2-3)
Description: X server initialisation tool
xinit and startx are programs which facilitate starting an X server, and
commit 0f5669fc956e08b476891fe36cc3d0d831923ad4
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:36:17 2011 +0200
Update Uploaders list. Thanks, David & Brice!
diff --git a/debian/changelog b/debian/changelog
index 871eeb6..3320e59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xinit (1.3.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Update Uploaders list. Thanks, David & Brice!
-- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
diff --git a/debian/control b/debian/control
index f84c9ae..8d586d2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xinit
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>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit d799623f1fcac62616bbca66731fd6956d3b6201
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Jul 25 10:33:51 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 47e3a86..23f7228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,292 @@
+commit 6543a881708a2a410b51bb5644d9123c847a2908
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Jul 24 17:15:10 2011 -0700
+
+ configure.ac: Bump version to 1.3.1
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b0b9c21b752faab43241665f8fd12e10973e739c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 17 13:49:11 2011 -0400
+
+ DIST_SUBDIRS is not required when using AM_CONDITIONALs
+
+ LAUNCHD is an Automake conditional which means that Automake will
+ traverse the launchd directory when running the dist target.
+ http://www.gnu.org/software/automake/manual/automake.html
+
+ One less variables to maintain.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 120a58116f2e3a223dbb78e0b33d3755eeb8ad5a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 17 13:39:27 2011 -0400
+
+ Move man pages in the man directory
+
+ Now that the cpp tool is no longer needed, normalize the man pages build.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a81fab654085239ffcc4981b6bdab9fc18ec3d08
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 17 11:15:12 2011 -0400
+
+ Use XORG_MANPAGE_SECTIONS rather than cpprules.in to build man pages
+
+ As for all other manpages, use sed rather than the C preprocessor
+ from the Imake days.
+
+ Use SCOMAN Automake variable and groff .if for conditional text
+ We can therefore remove ARCHMANDEFS
+ Remove man page related code from cpprules.in
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8e6cc68283518bba2820ff0d919aee9d49e3eb59
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat May 14 14:11:13 2011 -0700
+
+ launchd: Fix an array-index-out-of-bounds crasher
+
+ Found-by: GuardMalloc
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3b53d7aecb2f3a729c57f2831a3d4b6e1ff1901f
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu May 12 20:27:55 2011 -0700
+
+ launchd: Update console redirection to work with libdispatch
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit e6187b0d47722ec364372926d78dfe4e5637bd6c
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu May 12 20:08:09 2011 -0700
+
+ launchd Set the correct id for privileged_startx
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit a8de1219942e78db2cd193ffe745535d3c2d84b0
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed May 11 17:29:25 2011 -0700
+
+ configure.ac: Fix support for the deprecated --with-launchd-id-prefix
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 2771fbf28d6ee6cce09df0f245322d60e21795af
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed May 11 00:32:51 2011 -0700
+
+ launchd: syslog: Use facility org.x rather than user
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4ca120d2d2a73d8a1595f15e04fc365a4ae20e78
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed May 11 00:29:03 2011 -0700
+
+ launchd: include config.h
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit c8b40e87f69f5be881725388418d703116af8e5f
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed May 11 00:24:45 2011 -0700
+
+ Rename launchd-id-prefix to bundle-id-prefix
+
+ It's used many other places than just for launchd.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 50f1172349dc900da4016c243734ae50691eab6c
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Apr 27 18:10:45 2011 -0700
+
+ launchd: Silence clang static analyzer
+
+ ../console_redirect.c:67:5: warning: Value stored to 'n' is never read
+ n = kevent(kq, ev, 2, NULL, 0, NULL);
+ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 1 warning generated.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 2f15ccc30479d98012e3ddd595fa13c2f58d4a87
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Wed Apr 27 18:08:50 2011 -0700
+
+ privileged_startx: Prefer /usr/bin/mktemp
+
+ This will avoid accidentally tripping over an incompatible,
+ user-provided GNU flavor mktemp.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4d0f9d2290bde45c0e844ce40f1caa7fb4baae0f
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Apr 26 23:15:13 2011 -0700
+
+ launchd: Brownbag fix string compare
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 933f0b2980b375cadc58b2ef5669bc34475a7be6
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Apr 26 13:34:57 2011 -0700
+
+ launchd: console_redirect: Actually read and log the remaining data when we get EV_EOF
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 0881b1f2082b26995c24212e1e54ac4391d23fcd
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Apr 26 13:04:21 2011 -0700
+
+ launchd: Remove dead EXTRA_DIST
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 2dd7a4b5ac19c0b2be5cc078756d43e42f39231c
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Tue Apr 26 13:01:24 2011 -0700
+
+ launchd: Fix make dist
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 5f5390886004f785b4338fcff27f287c9aa6cd8c
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Apr 25 23:09:03 2011 -0700
+
+ launchd: Enable stdout/stderr redirection to ASL
+
+ Don't rely on launchd to do our logging for us.
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Daniel A. Steffen <dsteffen@apple.com>
+
+commit c6a7f895c8c90b85ed4fd08927c47b0d17ed067a
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Apr 25 22:26:02 2011 -0700
+
+ launchd: Log messages to ASL rather than fprintf
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 567f59d3f8189b92bc46e2af1260f9340f462bdb
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Apr 25 22:17:25 2011 -0700
+
+ launchd: Reorganized layout of launchd sources
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 75a969b884296439fb84ca2be8f77d718d7da1e6
+Author: Cyril Brulebois <kibi@debian.org>
+Date: Sun Mar 6 01:59:13 2011 +0100
+
+ Fix minor typos in startx's comments.
+
+ Signed-off-by: Cyril Brulebois <kibi@debian.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2d88aba7a84d153c2fc3226eece751395990edc7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jan 28 18:50:20 2011 -0800
+
+ Merge adjacent if (timeout) blocks
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Dirk Wallenstein <halsmit@t-online.de>
+
+commit 622a5500e8b19d603592bb1e871633323a3c09da
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 13 11:15:47 2011 -0500
+
+ man: remove trailing spaces and tabs
+
+ Using s/[ \t]*$//
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7119d9109ac7fc85b8e97af83aa6d98f9941a998
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 15:33:42 2011 -0500
+
+ config: remove the workaround for the deprecated AC_HELP_STRING
+
+ With Autoconf version 2.60, AS_HELP_STRING is always available.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f4d2e3972e8f1c14cefa649e2da9bb83a06363c6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 15:12:08 2011 -0500
+
+ config: remove unrequired AC_SUBST([*_LIBS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7264d4132b8520069f6f8855cc3847805057d39b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 12 13:33:48 2011 -0500
+
+ config: remove unrequired AC_SUBST([*_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b2b1cc02fdb141cae7ee18034a6ab5d571b7eb6b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jan 7 19:21:20 2011 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e6e427bbf6f3c9472dcbff1028fded459c803d6e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Jan 7 19:19:22 2011 -0800
+
+ config: Replace obsolete usage of AC_OUTPUT with AC_CONFIG_FILES
+
+ Stops configure from running the output generation routines twice
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6e44c0f269a5f2dced84e7ab3c496605d827ec11
+Author: Tom Doherty <tom@singlesecond.com>
+Date: Mon Nov 22 21:27:13 2010 +0100
+
+ Minor typo.
+
+ Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c371f43b69b223ba68e00125e6aa56621a23109b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 17:16:16 2010 -0700
+
+ Add usual set of URLs to README
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit cc92823c61f9f4d31a25d107017198d1e16d4fcf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 16:44:22 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index f8d2239..871eeb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xinit (1.3.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 25 Jul 2011 10:33:22 +0200
+
xinit (1.3.0-1) unstable; urgency=low
* New upstream release.
commit 6543a881708a2a410b51bb5644d9123c847a2908
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Jul 24 17:15:10 2011 -0700
configure.ac: Bump version to 1.3.1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
diff --git a/configure.ac b/configure.ac
index 9aa2f2e..4e808ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([xinit], [1.3.0],
+AC_INIT([xinit], [1.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit b0b9c21b752faab43241665f8fd12e10973e739c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jun 17 13:49:11 2011 -0400
DIST_SUBDIRS is not required when using AM_CONDITIONALs
LAUNCHD is an Automake conditional which means that Automake will
traverse the launchd directory when running the dist target.
http://www.gnu.org/software/automake/manual/automake.html
One less variables to maintain.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index c179fa9..3867bea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,11 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
+if LAUNCHD
+SUBDIRS += launchd
+endif
+
bin_PROGRAMS = xinit
bin_SCRIPTS = startx
@@ -50,13 +55,6 @@ CPP_FILES_FLAGS = \
-D__bindir__="$(bindir)" \
-DBUNDLE_ID_PREFIX="$(bundleidprefix)"
-SUBDIRS = man
-if LAUNCHD
-SUBDIRS += launchd
-endif
-
-DIST_SUBDIRS = launchd man
-
xinitrc_DATA = xinitrc
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit 120a58116f2e3a223dbb78e0b33d3755eeb8ad5a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jun 17 13:39:27 2011 -0400
Move man pages in the man directory
Now that the cpp tool is no longer needed, normalize the man pages build.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 6c4ef24..c179fa9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,25 +29,8 @@ xinit_LDADD = $(XINIT_LIBS)
xinit_SOURCES = \
xinit.c
-appmandir = $(APP_MAN_DIR)
-appman_PRE = startx.man xinit.man
-appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
- -e 's|__XCONFIGFILE__|$(XCONFIGFILE)|g' \
- -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \
- -e 's|__xinitdir__|$(XINITDIR)|g' \
- -e 's|__bindir__|$(bindir)|g' \
- -e 's|__libdir__|$(libdir)|g' \
- -e 's|__SCOMAN__|$(SCOMAN)|g'
-
include $(top_srcdir)/cpprules.in
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
xinitrcdir = $(XINITDIR)
PROGCPPDEFS = \
@@ -67,18 +50,19 @@ CPP_FILES_FLAGS = \
-D__bindir__="$(bindir)" \
-DBUNDLE_ID_PREFIX="$(bundleidprefix)"
+SUBDIRS = man
if LAUNCHD
-SUBDIRS = launchd
+SUBDIRS += launchd
endif
-DIST_SUBDIRS = launchd
+DIST_SUBDIRS = launchd man
xinitrc_DATA = xinitrc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = xinitrc startx $(appman_DATA) $(launchagents_DATA)
+CLEANFILES = xinitrc startx $(launchagents_DATA)
-EXTRA_DIST = xinitrc.cpp startx.cpp $(appman_PRE) \
+EXTRA_DIST = xinitrc.cpp startx.cpp \
autogen.sh
.PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index dbd17de..9aa2f2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,8 +204,9 @@ AC_SUBST(XAUTH)
AC_SUBST(XINIT)
AC_SUBST(XINITDIR)
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([launchd/Makefile])
-AC_CONFIG_FILES([launchd/privileged_startx/Makefile])
-AC_CONFIG_FILES([launchd/user_startx/Makefile])
+AC_CONFIG_FILES([Makefile
+ man/Makefile
+ launchd/Makefile
+ launchd/privileged_startx/Makefile
+ launchd/user_startx/Makefile])
AC_OUTPUT
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..074bc36
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,20 @@
+
+appmandir = $(APP_MAN_DIR)
+appman_PRE = startx.man xinit.man
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
+ -e 's|__XCONFIGFILE__|$(XCONFIGFILE)|g' \
+ -e 's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' \
+ -e 's|__xinitdir__|$(XINITDIR)|g' \
+ -e 's|__bindir__|$(bindir)|g' \
+ -e 's|__libdir__|$(libdir)|g' \
+ -e 's|__SCOMAN__|$(SCOMAN)|g'
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/man/startx.man b/man/startx.man
new file mode 100644
index 0000000..0405be0
--- /dev/null
+++ b/man/startx.man
@@ -0,0 +1,224 @@
+.\"
+.\" Copyright 1993, 1998 The Open Group
+.\"
+.\" 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 Open Group 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 Open Group.
+.\"
+.\"
+.TH STARTX __appmansuffix__ __xorgversion__
+.SH NAME
+startx \- initialize an X session
+.SH SYNOPSIS
+.B startx
+[ [
+.I client
+]
+.I options
+\&\.\|.\|. ] [
+.B \-\^\-
+[
+.I server
+] [
+.I display
+]
+.I options
+\&.\|.\|. ]
+.SH DESCRIPTION
+The \fBstartx\fP script is a front end to
+.BR xinit (__appmansuffix__)
+that provides a
+somewhat nicer user interface for running a single session of the X
+Window System. It is often run with no arguments.
+.PP
+Arguments immediately following the
+.I startx
+command are used to start a client in the same manner as
+.BR xinit (__appmansuffix__).
+The special argument
+.RB '--'
+marks the end of client arguments and the beginning of server options.
+It may be convenient to specify server options with startx to change on a
+per-session basis the
+default color depth, the server's notion of the number of dots-per-inch the
+display device presents, or take advantage of a different server layout, as
+permitted by the
+.BR __XSERVERNAME__ (__appmansuffix__)
+server and specified in the
+.BR __XCONFIGFILEMAN__
+configuration. Some examples of specifying server arguments follow; consult
+the manual page for your X server to determine which arguments are legal.
+.RS
+.PP
+startx -- -depth 16
+.PP
+startx -- -dpi 100
+.PP
+startx -- -layout Multihead
+.RE
+.if '__SCOMAN__'' .ig
+.PP
+To determine the client to run,
+.B startx
+looks for the following files, in order:
+.RS
+.PP
+.I $(HOME)/.startxrc
+.PP
+.I __libdir__/sys.startxrc
+.PP
+.I $(HOME)/.xinitrc
+.PP
+.I __xinitdir__/xinitrc
+.RE
+.PP
+..
+.if !'x.__SCOMAN__'x.' .ig
+.PP
+To determine the client to run,
+.B startx
+first looks for a file called
+.I .xinitrc
+in the user's home directory. If that is not found, it uses
+the file
+.I xinitrc
+in the
+.I xinit
+library directory.
+..
+If command line client options are given, they override this
+behavior and revert to the
+.BR xinit (__appmansuffix__)
+behavior.
+To determine the server to run,
+.B startx
+first looks for a file called
+.I .xserverrc
+in the user's home directory. If that is not found, it uses
+the file
+.I xserverrc
+in the
+.I xinit
+library directory.
+If command line server options are given, they override this
+behavior and revert to the
+.BR xinit (__appmansuffix__)
+behavior. Users rarely need to provide a
+.I .xserverrc
+file.
+See the
+.BR xinit (__appmansuffix__)
+manual page for more details on the arguments.
+.PP
+The system-wide
+.I xinitrc
+and
+.I xserverrc
+files are found in the
+.I __xinitdir__
+directory.
+.PP
+The
+.I .xinitrc
+is typically a shell script which starts many clients according to the
+user's preference. When this shell script exits,
+.B startx
+kills the server and performs any other session shutdown needed.
+Most of the clients started by
+.I .xinitrc
+should be run in the background. The last client should run in the
+foreground; when it exits, the session will exit. People often choose
+a session manager, window manager, or \fIxterm\fP as the ''magic'' client.
+.SH EXAMPLE
+.PP
+Below is a sample \fI\.xinitrc\fP that starts several applications and
+leaves the window manager running as the ''last'' application. Assuming that
+the window manager has been configured properly, the user
+then chooses the ''Exit'' menu item to shut down X.
+.sp
+.in +4
+.nf
+xrdb \-load $HOME/.Xresources
+xsetroot \-solid gray &
+xbiff \-geometry \-430+5 &
+oclock \-geometry 75x75\-0\-0 &
+xload \-geometry \-80\-0 &
+xterm \-geometry +0+60 \-ls &
+xterm \-geometry +0\-100 &
+xconsole \-geometry \-0+0 \-fn 5x7 &
+exec twm
+.fi
+.in -4
+.SH "ENVIRONMENT VARIABLES"
+.TP 25
+DISPLAY
+This variable gets set to the name of the display to which clients should
+connect. Note that this gets
+.IR set ,
+not read.
+.TP 25
+XAUTHORITY
+This variable, if not already defined, gets set to
+.IR $(HOME)/.Xauthority .
+This is to prevent the X server, if not given the
+.I \-auth
+argument, from automatically setting up insecure host-based authentication
+for the local host. See the
+.BR Xserver (__appmansuffix__)
+and
+.IR Xsecurity (__miscmansuffix__)
+manual pages for more information on X client/server authentication.
+.SH FILES
+.if '__SCOMAN__'' .ig
+.TP 25
+.I $(HOME)/.startxrc
+Client to run. Typically a shell script which runs many programs in
+the background.
+.TP 25
+.I __libdir__/sys.startxrc
+Client to use if the user has no
+.I .startxrc
+file.
+..
+.TP 25
+.I $(HOME)/.xinitrc
+Client to run. Typically a shell script which runs many programs in
+the background.
+.TP 25
+.I $(HOME)/.xserverrc
+Server to run. The default is
+.IR X .
+.TP 25
+.I __xinitdir__/xinitrc
+Client to run if the user has no
+.I .xinitrc
+file.
+.TP 25
+.I __xinitdir__/xserverrc
+Server to run if the user has no
+.I .xserverrc
+file.
+.SH "SEE ALSO"
+.BR xinit (__appmansuffix__),
+.BR X (__miscmansuffix__),
+.BR Xserver (__appmansuffix__),
+.BR __XSERVERNAME__ (__appmansuffix__),
+.BR __XCONFIGFILEMAN__
diff --git a/man/xinit.man b/man/xinit.man
new file mode 100644
index 0000000..31b93aa
--- /dev/null
+++ b/man/xinit.man
@@ -0,0 +1,199 @@
+.\"
+.\" Copyright 1988, 1998 The Open Group
+.\"
+.\" 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.
Reply to: