[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xinit: Changes to 'debian-unstable'



 .gitignore                                          |    3 
 ChangeLog                                           |  181 +++++++++++++++++++-
 Makefile.am                                         |   15 -
 configure.ac                                        |   52 ++++-
 cpprules.in                                         |    8 
 debian/changelog                                    |   14 +
 debian/control                                      |    2 
 debian/patches/001_debian_xinitrc.diff              |    3 
 debian/patches/02_startx_hostname.diff              |   10 -
 debian/patches/03_debian_startx_manpage.diff        |   12 -
 debian/patches/04_startx_paths.diff                 |   24 +-
 debian/patches/05_use_bash.diff                     |   17 +
 debian/patches/06_move_serverauthfile_into_tmp.diff |    6 
 org.x.startx.plist.cpp                              |    4 
 privileged_startx/Makefile.am                       |    7 
 privileged_startx/client.c                          |    4 
 privileged_startx/org.x.privileged_startx.plist.cpp |    4 
 privileged_startx/privileged_startx_types.h         |    6 
 privileged_startx/server.c                          |    6 
 startx.cmd                                          |    3 
 startx.cpp                                          |   16 -
 startx.man                                          |   44 ++--
 xinit.c                                             |   58 +-----
 xinit.man                                           |   79 ++++----
 xinitrc.cmd                                         |    1 
 xinitrc.cpp                                         |    1 
 26 files changed, 397 insertions(+), 183 deletions(-)

New commits:
commit 0ac5c0450ca4419100dffefc716065bace9fa640
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 23:32:51 2009 +0100

    Prepare Changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 51ddbb9..80fbfd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xinit (1.2.0-1) UNRELEASED; urgency=low
+xinit (1.2.0-1) unstable; urgency=low
 
   [ Brice Goglin ]
   * New upstream release.
@@ -18,7 +18,7 @@ xinit (1.2.0-1) UNRELEASED; urgency=low
   [ Brice Goglin ]
   * 
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:31:46 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:32:47 +0100
 
 xinit (1.1.1-1) unstable; urgency=low
 

commit 4327922ad9eaa1bb2cacc4e2a07ecebf942b283f
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 23:32:45 2009 +0100

    Add bug closers

diff --git a/debian/changelog b/debian/changelog
index f1fe0f1..51ddbb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xinit (1.2.0-1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * New upstream release.
+    + Pass xinit error codes through startx, closes: #514922.
+    + Fix startx mis-parsing initial client and server arguments
+      which begin with / or ./, closes: #511717.
   * Add README.source, bump Standards-Version to 3.8.3.
   * Use updated xsfbs, closes: #538604.
   * Refresh patches.
@@ -12,7 +15,10 @@ xinit (1.2.0-1) UNRELEASED; urgency=low
   * 06_move_serverauthfile_into_tmp.diff: use mktemp --tmpdir to honour
     $TMPDIR (closes: #480958).
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:26:47 +0100
+  [ Brice Goglin ]
+  * 
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:31:46 +0100
 
 xinit (1.1.1-1) unstable; urgency=low
 

commit 4d21b511006bf784763653351a74e8af23e90d98
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 23:27:07 2009 +0100

    Refresh patches

diff --git a/debian/changelog b/debian/changelog
index 86ad37b..f1fe0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xinit (1.2.0-1) UNRELEASED; urgency=low
   * New upstream release.
   * Add README.source, bump Standards-Version to 3.8.3.
   * Use updated xsfbs, closes: #538604.
+  * Refresh patches.
 
   [ Julien Cristau ]
   * debian/local/xserverrc: pass our command line arguments to the X server
@@ -11,7 +12,7 @@ xinit (1.2.0-1) UNRELEASED; urgency=low
   * 06_move_serverauthfile_into_tmp.diff: use mktemp --tmpdir to honour
     $TMPDIR (closes: #480958).
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:18:57 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:26:47 +0100
 
 xinit (1.1.1-1) unstable; urgency=low
 
diff --git a/debian/patches/001_debian_xinitrc.diff b/debian/patches/001_debian_xinitrc.diff
index 122e633..c75311e 100644
--- a/debian/patches/001_debian_xinitrc.diff
+++ b/debian/patches/001_debian_xinitrc.diff
@@ -2,9 +2,8 @@ Index: xinit/xinitrc.cpp
 ===================================================================
 --- xinit.orig/xinitrc.cpp	2008-05-21 23:08:58.000000000 +0200
 +++ xinit/xinitrc.cpp	2008-05-21 23:19:30.000000000 +0200
-@@ -1,103 +1,9 @@
+@@ -1,102 +1,8 @@
  XCOMM!SHELL_CMD
- XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
  
 -userresources=$HOME/.Xresources
 -usermodmap=$HOME/.Xmodmap
diff --git a/debian/patches/02_startx_hostname.diff b/debian/patches/02_startx_hostname.diff
index fe59940..88b6fd3 100644
--- a/debian/patches/02_startx_hostname.diff
+++ b/debian/patches/02_startx_hostname.diff
@@ -1,8 +1,12 @@
+---
+ startx.cpp |   15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
 Index: xinit/startx.cpp
 ===================================================================
---- xinit.orig/startx.cpp	2008-05-21 23:20:24.000000000 +0200
-+++ xinit/startx.cpp	2008-05-21 23:20:26.000000000 +0200
-@@ -237,18 +237,17 @@
+--- xinit.orig/startx.cpp	2009-12-06 23:12:44.000000000 +0100
++++ xinit/startx.cpp	2009-12-06 23:23:41.000000000 +0100
+@@ -242,18 +242,17 @@
      removelist=
  
      XCOMM set up default Xauth info for this machine
diff --git a/debian/patches/03_debian_startx_manpage.diff b/debian/patches/03_debian_startx_manpage.diff
index bc8cbfe..0567647 100644
--- a/debian/patches/03_debian_startx_manpage.diff
+++ b/debian/patches/03_debian_startx_manpage.diff
@@ -1,10 +1,14 @@
 Fix the startx manpage to be more correct for our setup; this patch by Branden
 Robinson.
 
+---
+ startx.man |   54 ++++++++++++++++++++++--------------------------------
+ 1 file changed, 22 insertions(+), 32 deletions(-)
+
 Index: xinit/startx.man
 ===================================================================
---- xinit.orig/startx.man	2008-05-21 23:20:22.000000000 +0200
-+++ xinit/startx.man	2008-05-21 23:20:33.000000000 +0200
+--- xinit.orig/startx.man	2009-12-06 23:12:44.000000000 +0100
++++ xinit/startx.man	2009-12-06 23:25:48.000000000 +0100
 @@ -76,6 +76,28 @@
  .RE
  #ifdef __SCOMAN__
@@ -32,7 +36,7 @@ Index: xinit/startx.man
 +.IR xdm (1).
 +.PP
  To determine the client to run,
- .I startx
+ .B startx
  looks for the following files, in order:
 @@ -134,38 +156,6 @@
  files are found in the
@@ -43,7 +47,7 @@ Index: xinit/startx.man
 -.I .xinitrc
 -is typically a shell script which starts many clients according to the
 -user's preference.  When this shell script exits,
--.I startx
+-.B startx
 -kills the server and performs any other session shutdown needed.
 -Most of the clients started by
 -.I .xinitrc
diff --git a/debian/patches/04_startx_paths.diff b/debian/patches/04_startx_paths.diff
index 450a178..ab67b4f 100644
--- a/debian/patches/04_startx_paths.diff
+++ b/debian/patches/04_startx_paths.diff
@@ -1,8 +1,14 @@
+---
+ startx.cmd  |    4 ++--
+ startx.cpp  |    4 ++--
+ xinitrc.cmd |    6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
 Index: xinit/startx.cmd
 ===================================================================
---- xinit.orig/startx.cmd	2008-05-21 23:20:20.000000000 +0200
-+++ xinit/startx.cmd	2008-05-21 23:20:37.000000000 +0200
-@@ -31,8 +31,8 @@
+--- xinit.orig/startx.cmd	2009-12-06 23:12:44.000000000 +0100
++++ xinit/startx.cmd	2009-12-06 23:25:52.000000000 +0100
+@@ -30,8 +30,8 @@
  
  userclientrc = home'\xinitrc.cmd'
  userserverrc = home'\xservrc.cmd'
@@ -15,9 +21,9 @@ Index: xinit/startx.cmd
  
 Index: xinit/xinitrc.cmd
 ===================================================================
---- xinit.orig/xinitrc.cmd	2008-05-21 23:20:21.000000000 +0200
-+++ xinit/xinitrc.cmd	2008-05-21 23:20:37.000000000 +0200
-@@ -12,9 +12,9 @@
+--- xinit.orig/xinitrc.cmd	2009-12-06 23:12:44.000000000 +0100
++++ xinit/xinitrc.cmd	2009-12-06 23:25:52.000000000 +0100
+@@ -11,9 +11,9 @@
  
  userresources = home'\.Xresources'
  usermodmap    = home'\.Xmodmap'
@@ -32,9 +38,9 @@ Index: xinit/xinitrc.cmd
  /* merge in defaults */
 Index: xinit/startx.cpp
 ===================================================================
---- xinit.orig/startx.cpp	2008-05-21 23:20:26.000000000 +0200
-+++ xinit/startx.cpp	2008-05-21 23:20:37.000000000 +0200
-@@ -69,11 +69,11 @@
+--- xinit.orig/startx.cpp	2009-12-06 23:23:41.000000000 +0100
++++ xinit/startx.cpp	2009-12-06 23:25:52.000000000 +0100
+@@ -67,11 +67,11 @@
  scosysclientrc=XINITDIR/xinitrc
  #else
  userclientrc=$HOME/.xinitrc
diff --git a/debian/patches/05_use_bash.diff b/debian/patches/05_use_bash.diff
index aa4a546..a3e3c30 100644
--- a/debian/patches/05_use_bash.diff
+++ b/debian/patches/05_use_bash.diff
@@ -1,20 +1,25 @@
+---
+ startx.cpp  |    2 +-
+ xinitrc.cpp |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 Index: xinit/startx.cpp
 ===================================================================
---- xinit.orig/startx.cpp	2007-05-19 10:14:49.000000000 +0300
-+++ xinit/startx.cpp	2007-05-19 10:15:15.000000000 +0300
+--- xinit.orig/startx.cpp	2009-12-06 23:25:52.000000000 +0100
++++ xinit/startx.cpp	2009-12-06 23:26:32.000000000 +0100
 @@ -1,4 +1,4 @@
 -XCOMM!SHELL_CMD
 +XCOMM!/bin/bash
  
- XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $
  XCOMM
+ XCOMM This is just a sample implementation of a slightly less primitive
 Index: xinit/xinitrc.cpp
 ===================================================================
---- xinit.orig/xinitrc.cpp	2007-05-19 10:15:24.000000000 +0300
-+++ xinit/xinitrc.cpp	2007-05-19 10:15:35.000000000 +0300
+--- xinit.orig/xinitrc.cpp	2009-12-06 23:23:40.000000000 +0100
++++ xinit/xinitrc.cpp	2009-12-06 23:26:32.000000000 +0100
 @@ -1,4 +1,4 @@
 -XCOMM!SHELL_CMD
 +XCOMM!/bin/bash
- XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
  
  XCOMM /etc/X11/xinit/xinitrc
+ XCOMM
diff --git a/debian/patches/06_move_serverauthfile_into_tmp.diff b/debian/patches/06_move_serverauthfile_into_tmp.diff
index 7bd5366..d5e6e91 100644
--- a/debian/patches/06_move_serverauthfile_into_tmp.diff
+++ b/debian/patches/06_move_serverauthfile_into_tmp.diff
@@ -7,9 +7,9 @@ The trap patch didn't seem to work on reboot.
 
 Index: xinit/startx.cpp
 ===================================================================
---- xinit.orig/startx.cpp
-+++ xinit/startx.cpp
-@@ -273,7 +273,7 @@
+--- xinit.orig/startx.cpp	2009-12-06 23:26:32.000000000 +0100
++++ xinit/startx.cpp	2009-12-06 23:26:37.000000000 +0100
+@@ -271,7 +271,7 @@
      dummy=0
  
      XCOMM create a file with auth information for the server. ':0' is a dummy.

commit 0f9b03b1ae85edc16b94b2519fd9c0833e2ff393
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 23:13:38 2009 +0100

    Bump Standards-Version to 3.8.3

diff --git a/debian/changelog b/debian/changelog
index 2d22597..86ad37b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 xinit (1.2.0-1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
-  * Add README.source, bump Standards-Version to 3.8.2.
+  * New upstream release.
+  * Add README.source, bump Standards-Version to 3.8.3.
   * Use updated xsfbs, closes: #538604.
 
   [ Julien Cristau ]
@@ -10,7 +11,7 @@ xinit (1.2.0-1) UNRELEASED; urgency=low
   * 06_move_serverauthfile_into_tmp.diff: use mktemp --tmpdir to honour
     $TMPDIR (closes: #480958).
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:17:51 +0100
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:18:57 +0100
 
 xinit (1.1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fbadcc5..8b13dfa 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  quilt,
  automake,
  xutils-dev
-Standards-Version: 3.8.2
+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
 

commit ec726d7daf090d7e12898e0ce62dca0b34034d4c
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Dec 6 23:18:05 2009 +0100

    New upstream release

diff --git a/ChangeLog b/ChangeLog
index af10193..1e97dad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,182 @@
+commit d243b9943879ec2790d65785805aefdfbb64a378
+Author: Rémi Cardona <remi@gentoo.org>
+Date:   Sat Nov 14 14:51:59 2009 +0100
+
+    xinit 1.2.0
+    
+    Signed-off-by: Rémi Cardona <remi@gentoo.org>
+
+commit 561b6c70648b585e36241c898f0b2dbba3cb2d24
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Tue Oct 27 18:24:31 2009 -0700
+
+    Apple: Export X11_PREFS_DOMAIN for children (quartz-wm)
+
+commit 9b89862981070cf9e381512055a778f451c88905
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Oct 21 12:47:20 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 82747989c1332290fabec8b9da38aad05282301f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Oct 16 20:27:17 2009 -0700
+
+    Use platform-specific X server names in man pages for cygwin & darwin
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit c2a5751175b11d3206805468aae1ddecd02c4a98
+Author: Rémi Cardona <remi@gentoo.org>
+Date:   Sat Oct 3 11:50:12 2009 +0200
+
+    make XINITDIR configurable at build-time, default is unchanged
+    
+    Signed-off-by: Rémi Cardona <remi@gentoo.org>
+
+commit 2861f9cf845107870f9d5e9898e5cd4baba8d8f7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 3 15:28:27 2009 -0700
+
+    Strip RCS/CVS tags
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 536a3e66159bb4cbd75b861b9b942da5b1885a26
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 3 15:21:20 2009 -0700
+
+    Man page updates
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 2528d709b51bb1f2e8c32db3242c5af815c9b66f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 3 15:16:55 2009 -0700
+
+    Drop ancient SunWindows compatibility check
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit adda4c05eceddca7ecb4470d9804a0fa2da8c12c
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 3 15:15:38 2009 -0700
+
+    Drop ancient A/UX compatibility hack
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 817c2d6fe0bea3910d335a0f0ae6d69e358dd9da
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 3 15:06:23 2009 -0700
+
+    Purge ancient server names from help, add newer server names instead
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 3a59c294d30f5c68dc1411a1a7a274948e08d528
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 3 14:51:44 2009 -0700
+
+    Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 98c7700d5bff9e61a7f29d8a611edc8a34961e8e
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Fri Sep 4 00:36:18 2009 -0700
+
+    launchd: Update the DISPLAY envvar to not have a - ... call me paranoid, but I feel safer without it
+    
+    Also added some extra debugging fluff to distingush between two similar statements.
+
+commit 49b50db0cb1ecc5611a242d12b9ca05b961c91ac
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Sep 3 19:02:56 2009 -0700
+
+    launchd: Include LAUNCHD_ID_PREFIX in the socket name for reverse lookup to tell which launchd id owns $DISPLAY
+
+commit 78d181dc74ffb3e67ee0d90780b86e00e03073eb
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Sep 2 10:43:25 2009 -0700
+
+    launchd: Added --with-launchd-id-prefix option to set non-standard launchd id prefix (org.x is still default)
+
+commit 33c3dae16b632ab56b6b361273a48079eb0a41c4
+Author: Andres Salomon <dilinger@queued.net>
+Date:   Wed Feb 11 17:18:05 2009 -0500
+
+    app/xinit: make startx's $? a useful value
+    
+    When startx fails to start X, it's most likely xinit that failed.  xinit
+    returns a proper return code (1), but that gets clobbed in the startx
+    script by clean-up commands.  This patch saves $? from xinit and forces
+    startx to exit with that value.
+    
+    This way, if startx actually fails to start X, $? reflects that.
+    
+    Signed-off-by: Andres Salomon <dilinger@debian.org>
+
+commit 028b0839dc4079c8fe56b38a80be51dc8c89ea17
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date:   Fri Mar 6 17:03:30 2009 +0000
+
+    Cygwin can also have spaces in $HOME
+
+commit c30b10caedf7bdafb9abda914f80c90bfaccaec5
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Wed Jan 21 19:22:31 2009 -0200
+
+    Correct make distcheck for recent git versions.
+
+commit 57f917f8934d441ebb6501c4691a2b59fa217f3f
+Author: Robert Macomber <robert.macomber@bigfishgames.com>
+Date:   Fri Jan 16 01:27:50 2009 +0100
+
+    startx: fix misparsing of initial client and server arguments which begin with / or ./
+    
+    If you invoke startx with a client whose initial command-line arguments
+    begin with / or ./, it uses the last such argument as the base command
+    for the client.  E.g.:
+       startx /usr/bin/xterm /usr/bin/mutt
+    will use /usr/bin/mutt as the client to run instead of /usr/bin/xterm.
+    This is because of the way in which startx parses its arguments.  It's a
+    loop over a case with three clauses; the bug is in the first.  When it's
+    looking at one of startx's args it checks to see if $clientargs is empty
+    in order to see if it should set $client or add the argument to
+    $clientargs.  It should also check to see whether $client is set.
+    
+    There is a similar bug in parsing server args, where it checks to see if
+    $serverargs is empty to decide whether to set $server.
+    
+    Debian bug#511717 (http://bugs.debian.org/511717)
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit 7a5086259ca39cc4de6abcda3a3dc5d6c6b380b0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Dec 18 19:05:08 2008 -0800
+
+    Apple: Use MAC_OS_X_VERSION_MIN_REQUIRED instead of __MAC_OS_X_VERSION_MIN_REQUIRED
+
 commit 46d641fdd020d07a9b4bd0364cf126643342a7e3
 Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
 Date:   Wed Dec 17 15:19:38 2008 -0800
@@ -429,7 +608,7 @@ Date:   Mon Dec 3 19:57:26 2007 -0800
     Added some support for Xquartz on OS-X.
 
 commit e2963ff8acb7e20aab1f8e31a656f4553dda208a
-Merge: a7fda62... 0516336...
+Merge: a7fda62 0516336
 Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
 Date:   Fri Sep 28 22:26:26 2007 +0200
 
diff --git a/debian/changelog b/debian/changelog
index e4aa961..2d22597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xinit (1.1.1-2) UNRELEASED; urgency=low
+xinit (1.2.0-1) UNRELEASED; urgency=low
 
   [ Brice Goglin ]
   * Add README.source, bump Standards-Version to 3.8.2.
@@ -10,7 +10,7 @@ xinit (1.1.1-2) UNRELEASED; urgency=low
   * 06_move_serverauthfile_into_tmp.diff: use mktemp --tmpdir to honour
     $TMPDIR (closes: #480958).
 
- -- Brice Goglin <bgoglin@debian.org>  Sat, 01 Aug 2009 16:26:28 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 06 Dec 2009 23:17:51 +0100
 
 xinit (1.1.1-1) unstable; urgency=low
 

commit d243b9943879ec2790d65785805aefdfbb64a378
Author: Rémi Cardona <remi@gentoo.org>
Date:   Sat Nov 14 14:51:59 2009 +0100

    xinit 1.2.0
    
    Signed-off-by: Rémi Cardona <remi@gentoo.org>

diff --git a/configure.ac b/configure.ac
index af31d53..ede111e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
+AC_INIT(xinit,[1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 561b6c70648b585e36241c898f0b2dbba3cb2d24
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date:   Tue Oct 27 18:24:31 2009 -0700

    Apple: Export X11_PREFS_DOMAIN for children (quartz-wm)

diff --git a/startx.cpp b/startx.cpp
index 443d63b..810fd23 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -83,7 +83,7 @@ serverargs=""
 #ifdef __APPLE__
 
 if [ "x$X11_PREFS_DOMAIN" = x ] ; then
-    X11_PREFS_DOMAIN=LAUNCHD_ID_PREFIX".X11"
+    export X11_PREFS_DOMAIN=LAUNCHD_ID_PREFIX".X11"
 fi
 
 XCOMM Initialize defaults (this will cut down on "safe" error messages)

commit 9b89862981070cf9e381512055a778f451c88905
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date:   Wed Oct 21 12:47:20 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>

diff --git a/configure.ac b/configure.ac
index 419920f..af31d53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 AC_INIT(xinit,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinit)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS

commit 82747989c1332290fabec8b9da38aad05282301f
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Fri Oct 16 20:27:17 2009 -0700

    Use platform-specific X server names in man pages for cygwin & darwin
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
    Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>

diff --git a/configure.ac b/configure.ac
index 3e8ad50..419920f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,22 +170,34 @@ fi
 AC_SUBST(STARTX_COOKIE_FLAGS)
 
 # Additional substitutions in startx, xinitrc & man pages
+ARCHMANDEFS=""
+SHELL_CMD="/bin/sh"
+XSERVERNAME="Xorg"
+XCONFIGFILE="xorg.conf"
+XCONFIGFILEMAN='${XCONFIGFILE} (__filemansuffix__)'
 case $host_os in
+    cygwin*)
+	XSERVERNAME="XWin"
+	XCONFIGFILE="XWinrc"
+	;;
+    darwin*)
+	XSERVERNAME="Xquartz"
+	XCONFIGFILE="defaults"
+	XCONFIGFILEMAN='defaults (1)'
+	;;
     *solaris*)
 	SHELL_CMD="/bin/ksh"
-	ARCHMANDEFS=""
 	;;
     *sco*)
 	SHELL_CMD="/bin/ksh"
 	ARCHMANDEFS="-D__SCOMAN__"
 	;;
-    *)
-	SHELL_CMD="/bin/sh"
-	ARCHMANDEFS=""
-	;;
 esac
 AC_SUBST(SHELL_CMD)
 AC_SUBST(ARCHMANDEFS)
+AC_SUBST(XSERVERNAME)
+AC_SUBST(XCONFIGFILE)
+AC_SUBST(XCONFIGFILEMAN)
 
 AC_SUBST(XRDB)
 AC_SUBST(XMODMAP)
diff --git a/cpprules.in b/cpprules.in
index c04855b..18089de 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -23,7 +23,9 @@ MANDEFS =  \
 	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \
 	-D__libmansuffix__=$(LIB_MAN_SUFFIX) \
 	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
-	-D__XSERVERNAME__=Xorg -D__XCONFIGFILE__=xorg.conf \
+	-D__XSERVERNAME__='$(XSERVERNAME)' \
+	-D__XCONFIGFILE__='$(XCONFIGFILE)' \
+	-D__XCONFIGFILEMAN__='$(XCONFIGFILEMAN)' \
 	-D__xinitdir__=$(XINITDIR) \
 	-D__bindir__=$(bindir) \
 	-DSHELL_CMD=$(SHELL_CMD) $(ARCHMANDEFS)
diff --git a/startx.man b/startx.man
index e730272..a4dede0 100644
--- a/startx.man
+++ b/startx.man
@@ -63,9 +63,9 @@ display device presents, or take advantage of a different server layout, as
 permitted by the
 .BR __XSERVERNAME__ (__appmansuffix__)
 server and specified in the
-.BR __XCONFIGFILE__ (__filemansuffix__)
-file.  Some examples of specifying server arguments follow; consult the
-manual page for your X server to determine which arguments are legal.
+.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
@@ -217,5 +217,7 @@ Server to run if the user has no
 file.
 .SH "SEE ALSO"
 .BR xinit (__appmansuffix__),
+.BR X (__miscmansuffix__),
 .BR Xserver (__appmansuffix__),
-.BR __XSERVERNAME__ (__appmansuffix__)
+.BR __XSERVERNAME__ (__appmansuffix__),
+.BR __XCONFIGFILEMAN__
diff --git a/xinit.man b/xinit.man
index 538f926..31b93aa 100644
--- a/xinit.man
+++ b/xinit.man
@@ -192,6 +192,8 @@ server to run if \fI.xserverrc\fP does not exist
 .BR X (__miscmansuffix__),
 .BR startx (__appmansuffix__),
 .BR Xserver (__appmansuffix__),
+.BR __XSERVERNAME__ (__appmansuffix__),
+.BR __XCONFIGFILEMAN__,
 .BR xterm (__appmansuffix__)
 .SH AUTHOR
 Bob Scheifler, MIT Laboratory for Computer Science

commit c2a5751175b11d3206805468aae1ddecd02c4a98
Author: Rémi Cardona <remi@gentoo.org>
Date:   Sat Oct 3 11:50:12 2009 +0200

    make XINITDIR configurable at build-time, default is unchanged
    
    Signed-off-by: Rémi Cardona <remi@gentoo.org>

diff --git a/Makefile.am b/Makefile.am
index 1a75f75..6dab021 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,6 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-XINITDIR = $(libdir)/X11/xinit
-
 bin_PROGRAMS = xinit
 bin_SCRIPTS = startx
 
diff --git a/configure.ac b/configure.ac
index 485bd69..3e8ad50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ DEFAULT_XTERM=xterm
 DEFAULT_XSERVER=${bindir}/X
 DEFAULT_XAUTH=xauth
 DEFAULT_XINIT=xinit
+DEFAULT_XINITDIR=${libdir}/X11/xinit
 
 AC_ARG_WITH(xrdb,
 	 AS_HELP_STRING([--with-xrdb=XRDB], [Path to xrdb]),
@@ -98,6 +99,11 @@ AC_ARG_WITH(xinit,
 	[XINIT="$withval"],
 	[XINIT="$DEFAULT_XINIT"])
 
+AC_ARG_WITH(xinitdir,
+	 AS_HELP_STRING([--with-xinitdir=XINITDIR], [Path to xinitdir]),
+	[XINITDIR="$withval"],
+	[XINITDIR="$DEFAULT_XINITDIR"])
+
 AC_ARG_WITH(launchd,            AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
 AC_ARG_WITH(launchagents-dir,   AS_HELP_STRING([--with-launchagents-dir=PATH], [Path to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]),
                                 [ launchagentsdir="${withval}" ],
@@ -189,6 +195,7 @@ AC_SUBST(XTERM)
 AC_SUBST(XSERVER)
 AC_SUBST(XAUTH)
 AC_SUBST(XINIT)
+AC_SUBST(XINITDIR)
 
 AC_OUTPUT([Makefile])
 AC_OUTPUT([privileged_startx/Makefile])

commit 2861f9cf845107870f9d5e9898e5cd4baba8d8f7
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Sat Oct 3 15:28:27 2009 -0700

    Strip RCS/CVS tags
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/startx.cmd b/startx.cmd
index cd37ecb..950ab9d 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -1,6 +1,5 @@
 /* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $
- * 
+/*
  * This is just a sample implementation of a slightly less primitive 
  * interface than xinit.  It looks for user xinitrc.cmd and xservrc.cmd
  * files, then system xinitrc.cmd and xservrc.cmd files, else lets xinit choose
diff --git a/startx.cpp b/startx.cpp
index 664f120..443d63b 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -1,6 +1,5 @@
 XCOMM!SHELL_CMD
 
-XCOMM $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $
 XCOMM
 XCOMM This is just a sample implementation of a slightly less primitive
 XCOMM interface than xinit.  It looks for user .xinitrc and .xserverrc
@@ -11,7 +10,6 @@ XCOMM and pop a clock and serveral xterms.
 XCOMM
 XCOMM Site administrators are STRONGLY urged to write nicer versions.
 XCOMM
-XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
 
 unset DBUS_SESSION_BUS_ADDRESS
 unset SESSION_MANAGER
diff --git a/startx.man b/startx.man
index 73eab50..e730272 100644
--- a/startx.man
+++ b/startx.man
@@ -1,5 +1,4 @@
-.\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
-.\" $XdotOrg$
+.\"
 .\" Copyright 1993, 1998  The Open Group
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,7 +23,6 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $
 .\"
 .TH STARTX __appmansuffix__ __xorgversion__
 .SH NAME
diff --git a/xinit.c b/xinit.c
index d102307..6d354eb 100644
--- a/xinit.c
+++ b/xinit.c
@@ -1,6 +1,3 @@
-/* $Xorg: xinit.c,v 1.5 2001/02/09 02:05:49 xorgcvs Exp $ */
-/* $XdotOrg: $ */
-
 /*
 
 Copyright 1986, 1998  The Open Group
@@ -26,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/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/xinit.man b/xinit.man
index b9c1965..538f926 100644
--- a/xinit.man
+++ b/xinit.man
@@ -1,4 +1,4 @@
-.\" $Xorg: xinit.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
+.\"
 .\" Copyright 1988, 1998  The Open Group
 .\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +23,6 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xinit/xinit.man,v 3.9 2001/02/07 23:25:56 dawes Exp $
-.\"
 .TH XINIT __appmansuffix__ __xorgversion__
 .SH NAME
 xinit \- X Window System initializer
diff --git a/xinitrc.cmd b/xinitrc.cmd
index f40a7b7..623a159 100644
--- a/xinitrc.cmd
+++ b/xinitrc.cmd
@@ -1,5 +1,4 @@
 /* OS/2 REXX */
-/* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */
 '@echo off'
 env = 'OS2ENVIRONMENT'
 x11root = VALUE('X11ROOT',,env)
diff --git a/xinitrc.cpp b/xinitrc.cpp
index 5643340..379b1f3 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -1,5 +1,4 @@
 XCOMM!SHELL_CMD
-XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap

commit 536a3e66159bb4cbd75b861b9b942da5b1885a26
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Sat Oct 3 15:21:20 2009 -0700

    Man page updates
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/startx.man b/startx.man
index 33e731c..73eab50 100644
--- a/startx.man
+++ b/startx.man
@@ -26,7 +26,7 @@
 .\"
 .\" $XFree86: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $
 .\"
-.TH STARTX 1 __xorgversion__
+.TH STARTX __appmansuffix__ __xorgversion__
 .SH NAME
 startx \- initialize an X session
 .SH SYNOPSIS
@@ -45,14 +45,16 @@ startx \- initialize an X session
 .I options
 \&.\|.\|. ]
 .SH DESCRIPTION
-The \fIstartx\fP script is a front end to \fIxinit\fP that provides a
+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
-.IR xinit (1).
+.BR xinit (__appmansuffix__).
 The special argument
 .RB '--'
 marks the end of client arguments and the beginning of server options.
@@ -61,9 +63,9 @@ 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
-.IR __XSERVERNAME__ (1)
+.BR __XSERVERNAME__ (__appmansuffix__)
 server and specified in the
-.IR __XCONFIGFILE__ (__filemansuffix__)
+.BR __XCONFIGFILE__ (__filemansuffix__)
 file.  Some examples of specifying server arguments follow; consult the
 manual page for your X server to determine which arguments are legal.
 .RS
@@ -77,7 +79,7 @@ startx -- -layout Multihead
 #ifdef __SCOMAN__
 .PP
 To determine the client to run,
-.I startx
+.B startx
 looks for the following files, in order:
 .RS
 .PP
@@ -93,7 +95,7 @@ looks for the following files, in order:
 #else
 .PP
 To determine the client to run,
-.I startx
+.B startx
 first looks for a file called
 .I .xinitrc
 in the user's home directory.  If that is not found, it uses
@@ -105,10 +107,10 @@ library directory.
 #endif
 If command line client options are given, they override this
 behavior and revert to the
-.IR xinit (1)
+.BR xinit (__appmansuffix__)
 behavior.
 To determine the server to run,
-.I startx
+.B startx
 first looks for a file called
 .I .xserverrc
 in the user's home directory.  If that is not found, it uses
@@ -119,12 +121,12 @@ in the
 library directory.
 If command line server options are given, they override this


Reply to: