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

x11-xserver-utils: Changes to 'debian-unstable'



 debian/changelog                                          |   43 
 debian/control                                            |   10 
 debian/copyright                                          |  447 
 debian/copyright.head                                     |    6 
 debian/patches/01_sessreg_implement_hostname_hashing.diff |   12 
 debian/patches/03_iceauth_manpage_commands.patch          |  103 
 debian/patches/series                                     |    1 
 debian/rules                                              |   11 
 iceauth/COPYING                                           |   26 
 iceauth/ChangeLog                                         |  134 
 iceauth/INSTALL                                           |  291 
 iceauth/Makefile.am                                       |   31 
 iceauth/Makefile.in                                       |   62 
 iceauth/aclocal.m4                                        |  851 +
 iceauth/config.guess                                      |  210 
 iceauth/config.h.in                                       |    3 
 iceauth/config.sub                                        |  115 
 iceauth/configure                                         | 3967 +++-----
 iceauth/configure.ac                                      |   15 
 iceauth/iceauth.c                                         |    3 
 iceauth/iceauth.h                                         |    4 
 iceauth/iceauth.man                                       |    3 
 iceauth/process.c                                         |    4 
 rgb/COPYING                                               |   42 
 rgb/ChangeLog                                             |  143 
 rgb/INSTALL                                               |  291 
 rgb/Makefile.am                                           |  103 
 rgb/Makefile.in                                           |  607 -
 rgb/README                                                |   31 
 rgb/aclocal.m4                                            | 1360 ++
 rgb/config.guess                                          |  257 
 rgb/config.h.in                                           |    3 
 rgb/config.sub                                            |  161 
 rgb/configure                                             | 6676 +++++++-------
 rgb/configure.ac                                          |   62 
 rgb/depcomp                                               |  116 
 rgb/install-sh                                            |  231 
 rgb/man/Makefile.am                                       |   41 
 rgb/man/Makefile.in                                       |  445 
 rgb/man/rgb.man                                           |   85 
 rgb/man/showrgb.man                                       |   45 
 rgb/missing                                               |   49 
 rgb/rgb.man                                               |   91 
 rgb/showrgb.c                                             |    3 
 rgb/showrgb.man                                           |   45 
 xcmsdb/COPYING                                            |   47 
 xcmsdb/ChangeLog                                          |  105 
 xcmsdb/INSTALL                                            |  291 
 xcmsdb/Makefile.am                                        |   30 
 xcmsdb/Makefile.in                                        |   63 
 xcmsdb/aclocal.m4                                         |  833 +
 xcmsdb/config.guess                                       |  210 
 xcmsdb/config.h.in                                        |    3 
 xcmsdb/config.sub                                         |  115 
 xcmsdb/configure                                          | 3932 +++-----
 xcmsdb/configure.ac                                       |   20 
 xgamma/ChangeLog                                          |  107 
 xgamma/INSTALL                                            |  291 
 xgamma/Makefile.am                                        |   31 
 xgamma/Makefile.in                                        |   62 
 xgamma/aclocal.m4                                         |  863 +
 xgamma/config.guess                                       |  210 
 xgamma/config.h.in                                        |    3 
 xgamma/config.sub                                         |  115 
 xgamma/configure                                          | 3936 +++-----
 xgamma/configure.ac                                       |   26 
 xgamma/xgamma.c                                           |    1 
 xgamma/xgamma.man                                         |    2 
 xhost/COPYING                                             |   22 
 xhost/ChangeLog                                           |  146 
 xhost/INSTALL                                             |  291 
 xhost/Makefile.am                                         |   30 
 xhost/Makefile.in                                         |   59 
 xhost/aclocal.m4                                          |  896 +
 xhost/config.guess                                        |  210 
 xhost/config.h.in                                         |    3 
 xhost/config.sub                                          |  115 
 xhost/configure                                           | 4875 ++++------
 xhost/configure.ac                                        |   18 
 xhost/xhost.c                                             |   26 
 xhost/xhost.man                                           |   32 
 xmodmap/COPYING                                           |   51 
 xmodmap/ChangeLog                                         |  183 
 xmodmap/INSTALL                                           |   17 
 xmodmap/Makefile.am                                       |   48 
 xmodmap/Makefile.in                                       |  352 
 xmodmap/aclocal.m4                                        |  833 +
 xmodmap/config.guess                                      |  210 
 xmodmap/config.h.in                                       |    3 
 xmodmap/config.sub                                        |  115 
 xmodmap/configure                                         | 4247 ++++----
 xmodmap/configure.ac                                      |   28 
 xmodmap/exec.c                                            |   44 
 xmodmap/man/Makefile.am                                   |   40 
 xmodmap/man/Makefile.in                                   |  441 
 xmodmap/man/xmodmap.man                                   |  339 
 xmodmap/xmodmap.man                                       |  312 
 xrandr/ChangeLog                                          |   72 
 xrandr/Makefile.am                                        |   22 
 xrandr/Makefile.in                                        |   25 
 xrandr/aclocal.m4                                         | 2313 ++--
 xrandr/config.guess                                       |   11 
 xrandr/config.sub                                         |   61 
 xrandr/configure                                          | 1219 --
 xrandr/configure.ac                                       |   18 
 xrandr/xrandr.c                                           |    5 
 xrandr/xrandr.man                                         |    2 
 xrdb/ChangeLog                                            |  225 
 xrdb/INSTALL                                              |  291 
 xrdb/Makefile.am                                          |   39 
 xrdb/Makefile.in                                          |  350 
 xrdb/aclocal.m4                                           | 1177 +-
 xrdb/config.guess                                         |  196 
 xrdb/config.h.in                                          |   42 
 xrdb/config.sub                                           |   43 
 xrdb/configure                                            | 5407 +++++------
 xrdb/configure.ac                                         |   36 
 xrdb/man/Makefile.am                                      |   12 
 xrdb/man/Makefile.in                                      |  415 
 xrdb/man/xrdb.man                                         |  302 
 xrdb/xrdb.c                                               |  188 
 xrdb/xrdb.man                                             |  306 
 xrefresh/ChangeLog                                        |  115 
 xrefresh/INSTALL                                          |  291 
 xrefresh/Makefile.am                                      |   30 
 xrefresh/Makefile.in                                      |   62 
 xrefresh/aclocal.m4                                       |  863 +
 xrefresh/config.guess                                     |  210 
 xrefresh/config.h.in                                      |    3 
 xrefresh/config.sub                                       |  115 
 xrefresh/configure                                        | 3936 +++-----
 xrefresh/configure.ac                                     |   26 
 xrefresh/xrefresh.c                                       |    4 
 xrefresh/xrefresh.man                                     |    5 
 xset/ChangeLog                                            |  256 
 xset/INSTALL                                              |  291 
 xset/Makefile.am                                          |   36 
 xset/Makefile.in                                          |   69 
 xset/aclocal.m4                                           |  863 +
 xset/config.guess                                         |  210 
 xset/config.h.in                                          |    6 
 xset/config.sub                                           |  115 
 xset/configure                                            | 4691 ++++-----
 xset/configure.ac                                         |   74 
 xset/xset.c                                               |   54 
 xset/xset.man                                             |   69 
 xsetroot/ChangeLog                                        |  138 
 xsetroot/INSTALL                                          |  143 
 xsetroot/Makefile.am                                      |   31 
 xsetroot/Makefile.in                                      |   62 
 xsetroot/aclocal.m4                                       |  851 +
 xsetroot/config.guess                                     |  210 
 xsetroot/config.h.in                                      |    3 
 xsetroot/config.sub                                       |  115 
 xsetroot/configure                                        | 4042 +++-----
 xsetroot/configure.ac                                     |   20 
 xsetroot/xsetroot.c                                       |   29 
 xsetroot/xsetroot.man                                     |    9 
 xstdcmap/COPYING                                          |   25 
 xstdcmap/ChangeLog                                        |  322 
 xstdcmap/INSTALL                                          |  143 
 xstdcmap/Makefile.am                                      |   36 
 xstdcmap/Makefile.in                                      |  419 
 xstdcmap/README                                           |   28 
 xstdcmap/aclocal.m4                                       | 2464 +++--
 xstdcmap/compile                                          |  142 
 xstdcmap/config.guess                                     |  279 
 xstdcmap/config.h.in                                      |   33 
 xstdcmap/config.sub                                       |  201 
 xstdcmap/configure                                        | 5504 ++++++-----
 xstdcmap/configure.ac                                     |   20 
 xstdcmap/depcomp                                          |  172 
 xstdcmap/install-sh                                       |  517 -
 xstdcmap/missing                                          |  104 
 xstdcmap/mkinstalldirs                                    |  158 
 175 files changed, 46683 insertions(+), 37229 deletions(-)

New commits:
commit a976b76500dafd6274b40bc255f93064b66f7559
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 10 18:20:29 2011 +0100

    Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index f22e632..9f37d5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
+x11-xserver-utils (7.6+1) unstable; urgency=low
 
   [ David Nusinow ]
   * Add 03_iceauth_manpage_commands.patch. Documents iceauth commands more
@@ -13,8 +13,9 @@ x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
     work!
   * Bump Standards-Version to 3.9.1.
   * Refresh patches.
+  * Upload to unstable.
 
- -- Cyril Brulebois <kibi@debian.org>  Fri, 12 Nov 2010 19:28:04 +0100
+ -- Julien Cristau <jcristau@debian.org>  Thu, 10 Feb 2011 18:20:20 +0100
 
 x11-xserver-utils (7.6~1) experimental; urgency=low
 

commit e85625e9e717afc2a3e401e57a0da026bc51cb40
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 10 18:19:43 2011 +0100

    Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index c0aa044..f22e632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
   * Remove Brice Goglin and David Nusinow from Uploaders.  Thanks for your
     work!
   * Bump Standards-Version to 3.9.1.
+  * Refresh patches.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 12 Nov 2010 19:28:04 +0100
 
diff --git a/debian/patches/01_sessreg_implement_hostname_hashing.diff b/debian/patches/01_sessreg_implement_hostname_hashing.diff
index 887a54c..5338fa5 100644
--- a/debian/patches/01_sessreg_implement_hostname_hashing.diff
+++ b/debian/patches/01_sessreg_implement_hostname_hashing.diff
@@ -17,11 +17,11 @@ Not submitted to XFree86.
  sessreg/sessreg.c |  164 ++++++++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 152 insertions(+), 12 deletions(-)
 
-Index: a/sessreg/sessreg.c
+Index: x11-xserver-utils/sessreg/sessreg.c
 ===================================================================
---- a/sessreg/sessreg.c.orig	2009-12-06 13:02:16.000000000 +0100
-+++ b/sessreg/sessreg.c	2009-12-06 13:30:49.000000000 +0100
-@@ -97,6 +97,18 @@
+--- x11-xserver-utils.orig/sessreg/sessreg.c
++++ x11-xserver-utils/sessreg/sessreg.c
+@@ -93,6 +93,18 @@ static void set_utmpx (struct utmpx *u,
  		       const char *host, Time_t date, int addp);
  #endif
  
@@ -40,7 +40,7 @@ Index: a/sessreg/sessreg.c
  static int wflag, uflag, lflag;
  static char *wtmp_file, *utmp_file, *line;
  #ifdef USE_UTMPX
-@@ -385,21 +397,23 @@
+@@ -404,21 +416,23 @@ set_utmp (struct utmp *u, char *line, ch
  		bzero (u->ut_name, sizeof (u->ut_name));
  #ifdef SYSV
  	if (line) {
@@ -76,7 +76,7 @@ Index: a/sessreg/sessreg.c
  		bzero (u->ut_id, sizeof (u->ut_id));
  	if (addp) {
  		u->ut_pid = getppid ();
-@@ -638,3 +652,129 @@
+@@ -662,3 +676,129 @@ findslot (char *line_name, char *host_na
  		return freeslot;
  }
  #endif
diff --git a/debian/patches/03_iceauth_manpage_commands.patch b/debian/patches/03_iceauth_manpage_commands.patch
index a54509a..2b5ef6d 100644
--- a/debian/patches/03_iceauth_manpage_commands.patch
+++ b/debian/patches/03_iceauth_manpage_commands.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] Make iceauth manpage describe commands. (fd.o bug#2354)
  iceauth.man |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 files changed, 85 insertions(+), 1 deletions(-)
 
-diff --git a/iceauth/iceauth.man b/iceauth/iceauth.man
-index 6a8d32f..c967eb4 100644
---- a/iceauth/iceauth.man
-+++ b/iceauth/iceauth.man
-@@ -39,5 +39,89 @@ used to extract authorization records from one machine and merge them in on
+Index: x11-xserver-utils/iceauth/iceauth.man
+===================================================================
+--- x11-xserver-utils.orig/iceauth/iceauth.man
++++ x11-xserver-utils/iceauth/iceauth.man
+@@ -36,5 +36,89 @@ used to extract authorization records fr
  another (as is the case when using remote logins or granting access to
  other users).  Commands (described below) may be entered interactively,
  on the \fIiceauth\fP command line, or in scripts.
@@ -101,6 +101,3 @@ index 6a8d32f..c967eb4 100644
 +.PP
  .SH AUTHOR
  Ralph Mor, X Consortium
--- 
-1.5.6.5
-

commit 27531fa4acfecf003c01ffeab45f2ae666999661
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 10 18:18:52 2011 +0100

    Drop broken hunk from 03_iceauth_manpage_commands.patch

diff --git a/debian/patches/03_iceauth_manpage_commands.patch b/debian/patches/03_iceauth_manpage_commands.patch
index 2d692d4..a54509a 100644
--- a/debian/patches/03_iceauth_manpage_commands.patch
+++ b/debian/patches/03_iceauth_manpage_commands.patch
@@ -11,12 +11,6 @@ diff --git a/iceauth/iceauth.man b/iceauth/iceauth.man
 index 6a8d32f..c967eb4 100644
 --- a/iceauth/iceauth.man
 +++ b/iceauth/iceauth.man
-@@ -1,4 +1,4 @@
--.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
-+m.\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
- .\" Copyright 1994, 1998  The Open Group
- .\" 
- .\" Permission to use, copy, modify, distribute, and sell this software and its
 @@ -39,5 +39,89 @@ used to extract authorization records from one machine and merge them in on
  another (as is the case when using remote logins or granting access to
  other users).  Commands (described below) may be entered interactively,

commit 98065913b85c8205040de6e0b5dca684b2a0886c
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 10 18:15:12 2011 +0100

    Bump Standards-Version to 3.9.1.

diff --git a/debian/changelog b/debian/changelog
index be7e874..c0aa044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
   * xrdb 1.0.8.
   * Remove Brice Goglin and David Nusinow from Uploaders.  Thanks for your
     work!
+  * Bump Standards-Version to 3.9.1.
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 12 Nov 2010 19:28:04 +0100
 
diff --git a/debian/control b/debian/control
index d853f25..97cbac2 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.0.0),
 # xsetroot: libxmuu-dev, libx11-dev, xbitmaps, libxcursor-dev
 # xstdcmap: libxmu-dev, libx11-dev
 # xvidtune: libxaw7-dev, libxxf86vm-dev, libxt-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xserver-utils
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xserver-utils.git
 

commit 4b12edf4454e14f7388ab9491a71810af0cd5c80
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 10 18:14:14 2011 +0100

    Remove Brice Goglin and David Nusinow from Uploaders.
    
    Thanks for your work!

diff --git a/debian/changelog b/debian/changelog
index 3847acb..be7e874 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * xrdb 1.0.8.
+  * Remove Brice Goglin and David Nusinow from Uploaders.  Thanks for your
+    work!
 
  -- Cyril Brulebois <kibi@debian.org>  Fri, 12 Nov 2010 19:28:04 +0100
 
diff --git a/debian/control b/debian/control
index ec98970..d853f25 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11-xserver-utils
 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, libx11-dev (>= 2:1.0.0),
  libxaw7-dev (>= 1:1.0.1), libxext-dev (>= 1:1.0.0),
  libxi-dev (>= 1:1.0.0-3), libxmuu-dev (>= 1:1.0.1),

commit 26ad1e1e34110d34693893d8117897842929b3b8
Author: Julien Cristau <jcristau@debian.org>
Date:   Thu Feb 10 18:12:20 2011 +0100

    xrdb 1.0.8.

diff --git a/debian/changelog b/debian/changelog
index 66c70c6..3847acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ x11-xserver-utils (7.6~2) UNRELEASED; urgency=low
   [ Cyril Brulebois ]
   * Make update-copyright target .PHONY
 
+  [ Julien Cristau ]
+  * xrdb 1.0.8.
+
  -- Cyril Brulebois <kibi@debian.org>  Fri, 12 Nov 2010 19:28:04 +0100
 
 x11-xserver-utils (7.6~1) experimental; urgency=low
diff --git a/xrdb/ChangeLog b/xrdb/ChangeLog
index cc748ed..7a18aa0 100644
--- a/xrdb/ChangeLog
+++ b/xrdb/ChangeLog
@@ -1,3 +1,98 @@
+commit ce9709b2811eb06bc7e03d26599c40b60effd0f8
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Wed Feb 2 15:30:45 2011 -0800
+
+    xrdb 1.0.8
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 649faef32416e6d87ec2dcad5b0142d3b7ff04d7
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Wed Feb 2 11:30:36 2011 -0800
+
+    Properly honor -nocpp
+    
+    Previously, if the user passed -nocpp and there was a cpp present,
+    cpp would be used.  This patch fixes that case.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8a59f14ff4a87b96ce763dd6565d776f8ac3b087
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Jan 19 10:06:56 2011 -0500
+
+    config: move man pages into their own directory
+    
+    Use services provided by XORG_MANPAGE_SECTIONS.
+    Use standard Makefile for man pages.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bc64aa2a2481130a02bfe41523863b7006d0c3a9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Jan 13 11:15:48 2011 -0500
+
+    man: remove trailing spaces and tabs
+    
+    Using s/[ \t]*$//
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 64c9786971d2473d0334bbdbe1a5f79f29eb988f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Jan 12 15:29:50 2011 -0500
+
+    config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+    
+    This silences an Automake warning.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 117021570515fa985670f78d27376d636ed5490f
+Author: Ulrich Mueller <ulm@gentoo.org>
+Date:   Wed Jan 5 13:31:36 2011 -0800
+
+    Call C preprocessor with -P option due to changed behaviour in GCC 4.5
+    
+    http://bugs.freedesktop.org/show_bug.cgi?id=32701
+    http://bugs.gentoo.org/show_bug.cgi?id=347758
+    
+    Signed-off-by: Ulrich Mueller <ulm@gentoo.org>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 44c65a03644b1c297ee84ff1aa4b7790caa5da0b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jan 4 20:29:09 2011 -0800
+
+    Merge usage() printf() strings/calls into a single string/call
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 82babf3ecfd6eb1ef65a150fb0c453e7bfd61616
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jan 4 20:20:11 2011 -0800
+
+    Replace complex malloc calculations with asprintf()
+    
+    Includes simple local implemenation of asprintf if configure doesn't
+    find one in system libraries.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+    Reviewed-by: Guillem Jover <guillem@hadrons.org>
+
+commit b9aa83d7868e8813098bbc62adf82a79dc62e14e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jan 4 19:50:06 2011 -0800
+
+    Convert HAS_MKSTEMP to autoconf standard HAVE_MKSTEMP
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+    Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
 commit 6606863fc8467bcbc829cea63764be0d283c4b8a
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Wed Nov 10 19:32:04 2010 -0800
diff --git a/xrdb/Makefile.am b/xrdb/Makefile.am
index 8cbacce..251261b 100644
--- a/xrdb/Makefile.am
+++ b/xrdb/Makefile.am
@@ -19,6 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
+SUBDIRS = man
 bin_PROGRAMS = xrdb
 
 AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS)
@@ -27,16 +28,7 @@ xrdb_LDADD = $(XRDB_LIBS)
 xrdb_SOURCES =	\
         xrdb.c
 
-appman_PRE = \
-        xrdb.man
-
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST = $(appman_PRE) 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
 
 .PHONY: ChangeLog INSTALL
 
@@ -48,8 +40,4 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
-# 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/xrdb/Makefile.in b/xrdb/Makefile.in
index 695731e..56e8237 100644
--- a/xrdb/Makefile.in
+++ b/xrdb/Makefile.in
@@ -36,7 +36,6 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -72,7 +71,7 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_xrdb_OBJECTS = xrdb.$(OBJEXT)
 xrdb_OBJECTS = $(am_xrdb_OBJECTS)
@@ -100,30 +99,21 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(xrdb_SOURCES)
 DIST_SOURCES = $(xrdb_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(appman_DATA)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -131,6 +121,31 @@ am__remove_distdir = \
   { test ! -d "$(distdir)" \
     || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
          && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
@@ -195,6 +210,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -253,25 +270,18 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+SUBDIRS = man
 AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS)
 xrdb_LDADD = $(XRDB_LIBS)
 xrdb_SOURCES = \
         xrdb.c
 
-appman_PRE = \
-        xrdb.man
-
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE) 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
 all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
+.SUFFIXES: .c .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -387,26 +397,76 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-install-appmanDATA: $(appman_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
-	@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
-	done
 
-uninstall-appmanDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appmandir)" && rm -f $$files
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -418,10 +478,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	set x; \
 	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -440,7 +513,7 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  fi; \
 	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -492,6 +565,34 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
@@ -611,21 +712,22 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
+check: check-recursive
+all-am: Makefile $(PROGRAMS) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -634,7 +736,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -644,96 +745,97 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
-install-data-am: install-appmanDATA
+install-data-am:
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS
 
-.MAKE: all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-binPROGRAMS \
+	clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
 	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
 	dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-hdr distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-appmanDATA \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-appmanDATA \
-	uninstall-binPROGRAMS
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \


Reply to: