Hello community,
here is the log from the commit of package xorg-x11
checked in at Fri Feb 9 01:21:38 CET 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-02-01 10:47:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-02-06 22:32:28.597733000 +0100
@@ -1,0 +2,21 @@
+Tue Feb 6 22:29:38 CET 2007 - sndirsch@suse.de
+
+- updated xdm to release 1.1.4
+ * Reset username prompt to default string at start of PAM loop
+ (Bug #222857)
+ * X.Org Bug #8561: xdm painfully slow at cursor redraws
+ * Make sure windowPath is properly initialized & freed
+ * Rearrange checks for maximum username & password length
+ * config: quote cpp arguments (X.Org bug #9414)
+ * X.Org Bug 8014: xdm should set the WINDOWPATH environment
+ variable
+
+-------------------------------------------------------------------
+Mon Feb 5 23:35:18 CET 2007 - sndirsch@suse.de
+
+- updated xfontsel to release 1.0.2
+ * Bug 9519: Markup problems in xfontsel.1x
+- updated xlsfonts to release 1.0.2
+ * Bug 9519: Markup problems in xlsfonts.1x
+
+-------------------------------------------------------------------
Old:
----
xdm-1.1.3.tar.bz2
xfontsel-X11R7.0-1.0.1.tar.bz2
xlsfonts-X11R7.0-1.0.1.tar.bz2
New:
----
xdm-1.1.4.tar.bz2
xfontsel-1.0.2.tar.bz2
xlsfonts-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.Y21164/_old 2007-02-09 01:20:12.000000000 +0100
+++ /var/tmp/diff_new_pack.Y21164/_new 2007-02-09 01:20:12.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 44
+Release: 46
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -60,7 +60,7 @@
Source36: xcursorgen-X11R7.1-1.0.1.tar.bz2
Source37: xdbedizzy-1.0.2.tar.bz2
Source38: xditview-X11R7.0-1.0.1.tar.bz2
-Source39: xdm-1.1.3.tar.bz2
+Source39: xdm-1.1.4.tar.bz2
Source40: xdpyinfo-X11R7.0-1.0.1.tar.bz2
Source41: xdriinfo-X11R7.1-1.0.1.tar.bz2
Source42: xedit-X11R7.1-1.0.2.tar.bz2
@@ -69,7 +69,7 @@
Source45: xf86dga-1.0.2.tar.bz2
Source46: xfd-X11R7.0-1.0.1.tar.bz2
Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2
-Source48: xfontsel-X11R7.0-1.0.1.tar.bz2
+Source48: xfontsel-1.0.2.tar.bz2
Source49: xfs-1.0.4.tar.bz2
Source50: xfsinfo-X11R7.0-1.0.1.tar.bz2
Source51: xfwp-X11R7.0-1.0.1.tar.bz2
@@ -86,7 +86,7 @@
Source62: xlogo-X11R7.0-1.0.1.tar.bz2
Source63: xlsatoms-X11R7.0-1.0.1.tar.bz2
Source64: xlsclients-X11R7.0-1.0.1.tar.bz2
-Source65: xlsfonts-X11R7.0-1.0.1.tar.bz2
+Source65: xlsfonts-1.0.2.tar.bz2
Source66: xmag-X11R7.0-1.0.1.tar.bz2
Source67: xman-X11R7.1-1.0.2.tar.bz2
Source68: xmessage-X11R7.0-1.0.1.tar.bz2
@@ -444,6 +444,21 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Tue Feb 06 2007 - sndirsch@suse.de
+- updated xdm to release 1.1.4
+ * Reset username prompt to default string at start of PAM loop
+ (Bug #222857)
+ * X.Org Bug #8561: xdm painfully slow at cursor redraws
+ * Make sure windowPath is properly initialized & freed
+ * Rearrange checks for maximum username & password length
+ * config: quote cpp arguments (X.Org bug #9414)
+ * X.Org Bug 8014: xdm should set the WINDOWPATH environment
+ variable
+* Mon Feb 05 2007 - sndirsch@suse.de
+- updated xfontsel to release 1.0.2
+ * Bug 9519: Markup problems in xfontsel.1x
+- updated xlsfonts to release 1.0.2
+ * Bug 9519: Markup problems in xlsfonts.1x
* Thu Feb 01 2007 - sndirsch@suse.de
- /etc/X11/xdm/{Xsetup,Xstartup}
* start/kill xvkbd only when autologin is disabled (Bug #238604)
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.Y21164/_old 2007-02-09 01:20:15.000000000 +0100
+++ /var/tmp/diff_new_pack.Y21164/_new 2007-02-09 01:20:15.000000000 +0100
@@ -174,7 +174,7 @@
extern int auth_finalize ( void );
extern int process_command ( char *inputfilename, int lineno, int argc, char **argv );
--- programs/xdm/auth.c.orig 2005-11-09 10:41:27.000000000 +0100
-+++ xdm-1.1.3/auth.c 2005-11-11 11:33:00.000000000 +0100
++++ xdm-1.1.4/auth.c 2005-11-11 11:33:00.000000000 +0100
@@ -680,7 +680,7 @@
}
++++++ xdm-1.1.3.tar.bz2 -> xdm-1.1.4.tar.bz2 ++++++
++++ 19903 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/ChangeLog new/xdm-1.1.4/ChangeLog
--- old/xdm-1.1.3/ChangeLog 2006-12-16 00:40:25.000000000 +0100
+++ new/xdm-1.1.4/ChangeLog 2007-02-06 20:47:45.000000000 +0100
@@ -1,3 +1,65 @@
+commit 677d028e41e890103679eec92b58044420b9b4c5
+Author: Alan Coopersmith
+Date: Tue Feb 6 11:45:41 2007 -0800
+
+ Version bump: 1.1.4
+
+commit 6e2362e825dfec6df73f1338088a850225ed92d2
+Author: Alan Coopersmith
+Date: Tue Feb 6 11:34:30 2007 -0800
+
+ Rearrange checks for maximum username & password length
+
+ Give preference to standard definitions, use less hardcoded knowledge about
+ which platforms provide other definitions.
+
+commit f6ab9602b8418b035f12da171a7d6edfed464aee
+Author: Alan Coopersmith
+Date: Fri Feb 2 17:27:46 2007 -0800
+
+ Reset username prompt to default string at start of PAM loop
+
+ Fixes bug reported by Stefan Dirsch in
+ http://lists.freedesktop.org/archives/xorg/2007-February/021510.html
+
+commit 3f1611b69f6b24184aa4b07c796526f49fa0db5f
+Author: Alan Coopersmith
+Date: Fri Feb 2 13:20:52 2007 -0800
+
+ Make sure windowPath is properly initialized & freed
+
+commit 5f0f8c00f47e778c59ae22bf685c97756456b2cd
+Author: Samuel Thibault
+Date: Thu Feb 1 17:16:41 2007 -0800
+
+ Bug 8014: xdm should set the WINDOWPATH environment variable
+
+ X.Org Bug #8014: https://bugs.freedesktop.org/show_bug.cgi?id=8014
+ Patch #6702: https://bugs.freedesktop.org/attachment.cgi?id=6702
+
+commit 450e9eb2725be6ead1c6d3e5477b737ded04070b
+Author: Alan Coopersmith
+Date: Thu Feb 1 15:23:12 2007 -0800
+
+ Bug #8561: xdm painfully slow at cursor redraws
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=8561
+ Made code that waited for cursor redraws to appear onscreen conditional on
+ FORCE_CURSOR_FLASH #define, which is off by default.
+
+commit e4274acc8cb7354cf191f91a8ed2054cb7af9916
+Author: Alan Coopersmith
+Date: Tue Jan 2 14:40:15 2007 -0800
+
+ Add ChangeLog to MAINTAINERCLEANFILES
+
+commit 9554052c14fc09ed1894580620ca94428f38e59b
+Author: Daniel Stone
+Date: Thu Dec 21 14:58:03 2006 +0200
+
+ config: quote cpp arguments (bug #9414)
+ Quote all arguments given to cpp.
+
commit 0128497fac0794d947fa44b433550fe064905d8d
Author: Daniel Stone
Date: Sat Dec 16 01:38:30 2006 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/config/Makefile.am new/xdm-1.1.4/config/Makefile.am
--- old/xdm-1.1.3/config/Makefile.am 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/config/Makefile.am 2007-01-02 22:45:08.000000000 +0100
@@ -50,11 +50,12 @@
MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND)
#endif
-CPP_FILES_FLAGS = -DBINDIR=$(bindir) -DDEFAULTVT=$(DEFAULTVT) \
- -DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
- -DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
- -DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \
- -DSHELL_CMD=$(SHELL_CMD) $(MKTEMP_DEFINES)
+CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \
+ -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \
+ -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \
+ -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \
+ -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \
+ -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
Xservers.ws: $(srcdir)/Xservers.ws.cpp
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/config.h.in new/xdm-1.1.4/config.h.in
--- old/xdm-1.1.3/config.h.in 2006-12-16 00:39:04.000000000 +0100
+++ new/xdm-1.1.4/config.h.in 2007-02-06 20:47:12.000000000 +0100
@@ -117,6 +117,9 @@
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/configure.ac new/xdm-1.1.4/configure.ac
--- old/xdm-1.1.3/configure.ac 2006-12-16 00:38:24.000000000 +0100
+++ new/xdm-1.1.4/configure.ac 2007-02-06 20:45:23.000000000 +0100
@@ -24,7 +24,7 @@
dnl $XdotOrg: app/xdm/configure.ac,v 1.42 2006/06/03 01:01:21 alanc Exp $
AC_PREREQ([2.57])
-AC_INIT(xdm,[1.1.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.4],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/dm.c new/xdm-1.1.4/dm.c
--- old/xdm-1.1.3/dm.c 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/dm.c 2007-02-02 02:00:51.000000000 +0100
@@ -68,7 +68,9 @@
# include
# include
# include
+# include
# include
+# include
#ifndef F_TLOCK
#ifndef X_NOT_POSIX
@@ -622,6 +624,78 @@
ForEachDisplay (CheckDisplayStatus);
}
+static void
+SetWindowPath(struct display *d)
+{
+ /* setting WINDOWPATH for clients */
+ Atom prop;
+ Atom actualtype;
+ int actualformat;
+ unsigned long nitems;
+ unsigned long bytes_after;
+ unsigned char *buf;
+ const char *windowpath;
+ char *newwindowpath;
+ unsigned long num;
+ char nums[10];
+ int numn;
+
+ prop = XInternAtom(d->dpy, "XFree86_VT", False);
+ if (prop == None) {
+ fprintf(stderr, "no XFree86_VT atom\n");
+ return;
+ }
+ if (XGetWindowProperty(d->dpy, DefaultRootWindow(d->dpy), prop, 0, 1,
+ False, AnyPropertyType, &actualtype, &actualformat,
+ &nitems, &bytes_after, &buf)) {
+ fprintf(stderr, "no XFree86_VT property\n");
+ return;
+ }
+ if (nitems != 1) {
+ fprintf(stderr, "%lu items in XFree86_VT property!\n", nitems);
+ XFree(buf);
+ return;
+ }
+ switch (actualtype) {
+ case XA_CARDINAL:
+ case XA_INTEGER:
+ case XA_WINDOW:
+ switch (actualformat) {
+ case 8:
+ num = (*(uint8_t *)(void *)buf);
+ break;
+ case 16:
+ num = (*(uint16_t *)(void *)buf);
+ break;
+ case 32:
+ num = (*(uint32_t *)(void *)buf);
+ break;
+ default:
+ fprintf(stderr, "format %d in XFree86_VT property!\n", actualformat);
+ XFree(buf);
+ return;
+ }
+ break;
+ default:
+ fprintf(stderr, "type %lx in XFree86_VT property!\n", actualtype);
+ XFree(buf);
+ return;
+ }
+ XFree(buf);
+ windowpath = getenv("WINDOWPATH");
+ numn = snprintf(nums, sizeof(nums), "%lu", num);
+ if (!windowpath) {
+ newwindowpath = malloc(numn + 1);
+ sprintf(newwindowpath, "%s", nums);
+ } else {
+ newwindowpath = malloc(strlen(windowpath) + 1 + numn + 1);
+ sprintf(newwindowpath, "%s:%s", windowpath, nums);
+ }
+ if (d->windowPath)
+ free(d->windowPath);
+ d->windowPath = newwindowpath;
+}
+
void
StartDisplay (struct display *d)
{
@@ -677,6 +751,7 @@
SetAuthorization (d);
if (!WaitForServer (d))
exit (OPENFAILED_DISPLAY);
+ SetWindowPath(d);
#ifdef XDMCP
if (d->useChooser)
RunChooser (d);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/dm.h new/xdm-1.1.4/dm.h
--- old/xdm-1.1.3/dm.h 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/dm.h 2007-02-02 02:00:51.000000000 +0100
@@ -242,6 +242,8 @@
/* Hack for making "Willing to manage" configurable */
char *willing; /* "Willing to manage" program */
+ Display *dpy; /* Display */
+ char *windowPath; /* path to server "window" */
};
#ifdef XDMCP
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/dpylist.c new/xdm-1.1.4/dpylist.c
--- old/xdm-1.1.3/dpylist.c 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/dpylist.c 2007-02-02 22:17:52.000000000 +0100
@@ -172,6 +172,7 @@
IfFree (d->from);
XdmcpDisposeARRAY8 (&d->clientAddr);
#endif
+ IfFree (d->windowPath);
free ((char *) d);
break;
}
@@ -184,7 +185,7 @@
{
struct display *d;
- d = (struct display *) malloc (sizeof (struct display));
+ d = (struct display *) calloc (1, sizeof (struct display));
if (!d) {
LogOutOfMem ("NewDisplay");
return NULL;
@@ -261,6 +262,9 @@
d->xdmcpFd = -1;
#endif
d->version = 1; /* registered with The Open Group */
+ d->willing = NULL;
+ d->dpy = NULL;
+ d->windowPath = NULL;
displays = d;
return d;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/greeter/greet.c new/xdm-1.1.4/greeter/greet.c
--- old/xdm-1.1.3/greeter/greet.c 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/greeter/greet.c 2007-02-03 02:25:25.000000000 +0100
@@ -503,6 +503,7 @@
const char * login_prompt;
+ SetPrompt(login, 0, NULL, LOGIN_PROMPT_NOT_SHOWN, False);
login_prompt = GetPrompt(login, LOGIN_PROMPT_USERNAME);
SetPrompt(login, 1, NULL, LOGIN_PROMPT_NOT_SHOWN, False);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/greeter/Login.c new/xdm-1.1.4/greeter/Login.c
--- old/xdm-1.1.3/greeter/Login.c 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/greeter/Login.c 2007-02-02 00:15:45.000000000 +0100
@@ -448,10 +448,12 @@
int x, y;
int height, width;
+#ifdef FORCE_CURSOR_FLASH
static int lastx, lasty;
static struct timeval lastFlash;
struct timeval now, timeout;
int sinceLastFlash;
+#endif
if (w->login.state != PROMPTING) {
return;
@@ -504,7 +506,7 @@
x+2 , y - F_ASCENT(text)+height);
#endif /* XPM */
-
+#ifdef FORCE_CURSOR_FLASH
/* Force cursor to flash briefly to give user feedback */
#define FLASH_MILLIS 100000 /* 0.10 seconds */
#define MILLIS_PER_SEC 1000000
@@ -529,8 +531,9 @@
} else {
lastx = x; lasty = y;
}
- XFlush (XtDisplay(w));
X_GETTIMEOFDAY (&lastFlash);
+#endif /* FORCE_CURSOR_FLASH */
+ XFlush (XtDisplay(w));
}
static void
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/greeter/Login.h new/xdm-1.1.4/greeter/Login.h
--- old/xdm-1.1.3/greeter/Login.h 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/greeter/Login.h 2007-02-06 20:28:45.000000000 +0100
@@ -155,29 +155,38 @@
#ifdef __OpenBSD__
# include
-/* 2.8 (200012) doesn't have _PW_NAME_LEN */
-# if OpenBSD > 200012
-# include
-# define NAME_LEN (_PW_NAME_LEN + 2)
-# define PASSWORD_LEN (_PASSWORD_LEN + 2)
-# endif
#endif
+#include
+#include
+
#ifdef USE_PAM
# define NAME_LEN PAM_MAX_RESP_SIZE
# define PASSWORD_LEN PAM_MAX_RESP_SIZE
#endif
+/* Defined to be in by SUSv2 */
+#if !defined(PASSWORD_LEN) && defined(PASS_MAX)
+# define PASSWORD_LEN PASS_MAX
+#endif
+
+/* _PW_NAME_LEN is found in on OpenBSD > 2.8 (200012) */
+#if !defined(NAME_LEN) && defined(_PW_NAME_LEN)
+# define NAME_LEN (_PW_NAME_LEN + 2)
+#endif
+
+/* _PASSWORD_LEN appears to come from 4.4BSD-Lite */
+#if !defined(PASSWORD_LEN) && defined(_PASSWORD_LEN)
+# define PASSWORD_LEN (_PASSWORD_LEN + 2)
+#endif
+
+/* Fallbacks if no other definition found */
#ifndef NAME_LEN
# define NAME_LEN 32
#endif
#ifndef PASSWORD_LEN
-# ifdef PASS_MAX
-# define PASSWORD_LEN PASS_MAX
-# else
-# define PASSWORD_LEN 32
-# endif
+# define PASSWORD_LEN 32
#endif
typedef struct _LoginData {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/Makefile.am new/xdm-1.1.4/Makefile.am
--- old/xdm-1.1.3/Makefile.am 2006-12-06 18:01:40.000000000 +0100
+++ new/xdm-1.1.4/Makefile.am 2006-12-20 19:00:41.000000000 +0100
@@ -105,6 +105,7 @@
CLEANFILES = $(appman_DATA)
EXTRA_DIST = $(appman_PRE) ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
include $(top_srcdir)/cpprules.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/server.c new/xdm-1.1.4/server.c
--- old/xdm-1.1.3/server.c 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/server.c 2007-02-02 02:00:51.000000000 +0100
@@ -51,8 +51,6 @@
static int serverPause (unsigned t, pid_t serverPid);
-static Display *dpy;
-
/* ARGSUSED */
static SIGVAL
CatchUsr1 (int n)
@@ -304,7 +302,7 @@
Debug ("Before XOpenDisplay(%s)\n", d->name);
errno = 0;
(void) XSetIOErrorHandler (openErrorHandler);
- dpy = XOpenDisplay (d->name);
+ d->dpy = XOpenDisplay (d->name);
#ifdef STREAMSCONN
{
/* For some reason, the next XOpenDisplay we do is
@@ -320,13 +318,13 @@
(void) Signal (SIGALRM, SIG_DFL);
(void) XSetIOErrorHandler ((int (*)(Display *)) 0);
Debug ("After XOpenDisplay(%s)\n", d->name);
- if (dpy) {
+ if (d->dpy) {
#ifdef XDMCP
if (d->displayType.location == Foreign)
- GetRemoteAddress (d, ConnectionNumber (dpy));
+ GetRemoteAddress (d, ConnectionNumber (d->dpy));
#endif
- RegisterCloseOnFork (ConnectionNumber (dpy));
- (void) fcntl (ConnectionNumber (dpy), F_SETFD, 0);
+ RegisterCloseOnFork (ConnectionNumber (d->dpy));
+ (void) fcntl (ConnectionNumber (d->dpy), F_SETFD, 0);
return 1;
} else {
Debug ("OpenDisplay failed %d (%s) on \"%s\"\n",
@@ -349,8 +347,8 @@
void
ResetServer (struct display *d)
{
- if (dpy && d->displayType.origin != FromXDMCP)
- pseudoReset (dpy);
+ if (d->dpy && d->displayType.origin != FromXDMCP)
+ pseudoReset (d->dpy);
}
static Jmp_buf pingTime;
@@ -384,7 +382,7 @@
int oldAlarm;
static Display *aDpy;
- aDpy = (alternateDpy != NULL ? alternateDpy : dpy);
+ aDpy = (alternateDpy != NULL ? alternateDpy : d->dpy);
oldError = XSetIOErrorHandler (PingLostIOErr);
oldAlarm = alarm (0);
oldSig = Signal (SIGALRM, PingLostSig);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/session.c new/xdm-1.1.4/session.c
--- old/xdm-1.1.3/session.c 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/session.c 2007-02-02 02:00:51.000000000 +0100
@@ -769,6 +769,10 @@
}
#endif /* K5AUTH */
#endif /* !USE_PAM */
+
+ if (d->windowPath)
+ verify->userEnviron = setEnv(verify->userEnviron, "WINDOWPATH", d->windowPath);
+
if (passwd != NULL)
bzero(passwd, strlen(passwd));
@@ -961,6 +965,8 @@
env = setEnv (env, "SHELL", d->systemShell);
if (d->authFile)
env = setEnv (env, "XAUTHORITY", d->authFile);
+ if (d->windowPath)
+ env = setEnv (env, "WINDOWPATH", d->windowPath);
return env;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xdm-1.1.3/xdm.man.cpp new/xdm-1.1.4/xdm.man.cpp
--- old/xdm-1.1.3/xdm.man.cpp 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.4/xdm.man.cpp 2007-02-02 02:00:51.000000000 +0100
@@ -1092,6 +1092,7 @@
PATH the value of \fBDisplayManager.\fP\fIDISPLAY\fP\fB.systemPath\fP
SHELL the value of \fBDisplayManager.\fP\fIDISPLAY\fP\fB.systemShell\fP
XAUTHORITY may be set to an authority file
+ WINDOWPATH may be set to the "window path" leading to the X server
.fi
.PP
@@ -1146,6 +1147,7 @@
SHELL the user's default shell (from \fIgetpwnam\fP)
XAUTHORITY may be set to a non-standard authority file
KRB5CCNAME may be set to a Kerberos credentials cache name
+ WINDOWPATH may be set to the "window path" leading to the X server
.fi
.PP
++++++ xfontsel-X11R7.0-1.0.1.tar.bz2 -> xfontsel-1.0.2.tar.bz2 ++++++
++++ 12712 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/autogen.sh new/xfontsel-1.0.2/autogen.sh
--- old/xfontsel-X11R7.0-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xfontsel-1.0.2/autogen.sh 2006-07-11 04:52:48.000000000 +0200
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/ChangeLog new/xfontsel-1.0.2/ChangeLog
--- old/xfontsel-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:50.000000000 +0100
+++ new/xfontsel-1.0.2/ChangeLog 2007-02-01 22:04:45.000000000 +0100
@@ -1,31 +1,201 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b4d05bfdd02bb993fe27d79977be0d117f6869f5
+Author: Alan Coopersmith
+Date: Thu Feb 1 10:47:34 2007 -0800
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ca186c58baf13be19feb9c4ed63c73fcbc3c374e
+Author: Alan Coopersmith
+Date: Thu Feb 1 10:46:56 2007 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Fill in COPYING with copyright/license notices from source code files
-2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 67813a0abf40cf4e0a4c958b132a5679e734b14d
+Author: Alan Coopersmith
+Date: Thu Feb 1 10:44:42 2007 -0800
- * Makefile.am:
- * configure.ac:
- Change to use the app-defaults default dir configured in libXt.
+ renamed: .cvsignore -> .gitignore
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5c43b433c0f3042f24f41eb66d3453c72edd3698
+Author: Alan Coopersmith
+Date: Thu Feb 1 10:44:12 2007 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a109dc6867135b8dcdb4a32d016dba96fc42b1fa
+Author: Eric S. Raymond
+Date: Tue Jan 2 19:10:31 2007 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug 9519: Markup problems in xfontsel.1x
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=9519
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 8e06c5f5100b2dc533291e6d305aecedec86abae
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:50 2005 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Update package version for X11R7 release.
+commit 7d5a9e2c6197215076884f438d88bab886f4fcfc
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:44 2005 +0000
+
+ Stub COPYING files
+
+commit 2bcdd77cbd56b099d1f521671be1a5f69f81fe84
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:07 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit d235b45cc12cbf9c04cf79e525033a3b0205c53d
+Author: Kevin E Martin
+Date: Wed Dec 7 16:17:59 2005 +0000
+
+ Change to use the app-defaults default dir configured in libXt.
+
+commit 15308d1a18f86d783b2480b31ce168de3f9ca109
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:22 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 9d4606cf318bf4432068db87ee55572b2695d7ed
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:20 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 982954c1edb0505be600e6b034d75aaa3d334f24
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:42 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 1b58506131be085db5d35b6648d603385c7d8a37
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:00 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 3582308724b9ef06ad0283fab21c52ed2ab400c0
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:52 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 3187b3402cc0bd738bc74593fbf25892b69c2b23
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:54 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 63b7fa0f97e2f2da1817b8abd0a47d6bc5ee86f8
+Author: Alan Coopersmith
+Date: Tue Oct 18 00:32:54 2005 +0000
+
+ Change default install dir for app-default files from
+ $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+ the monolith & allow localization
+
+commit 27299597d3c7d2223de97a2fd510a33247795a8e
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:22 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 1f19bc1d0920fde791440d2a1b18ddb4c650a1d7
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:45 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 01e99cb7d65cb5159cb0b5d2f10ea304f837df42
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:29 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 327d6df6c97dd9d55e95dfabf002f78fe624e0ee
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:33 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit c3da8169ed2876732a86b7c1cb3d4e3cb6ba5046
+Author: Alan Coopersmith
+Date: Tue Jul 26 15:44:02 2005 +0000
+
+ Replace more GNU make-ism's with more portable macros
+
+commit 1234c030c16eb1e0d6f8a8655bc1b093e43ef288
+Author: Adam Jackson
+Date: Wed Jul 20 19:31:55 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit fb8c54ae47b8dd71f082fd0c4b705690c8aca524
+Author: Søren Sandmann Pedersen
+Date: Fri Jul 1 18:11:22 2005 +0000
+
+ Build system for xfontsel
+
+commit cad003acf8e3a2ae88b9e0fda9f6d0a070bbd3c5
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:47 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 5853543ca60db9bbb8db1b4b3d68fb30ada5a249
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:20 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 7ce32771cd493a3fa27d2b0c584a95a8da54a262
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:05 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 51284798e3b3af50838597e605a45e01d961d4ed
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:24 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d65fdc557636a5a4454a11c3a9a0a58d95ec9ce0
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:07 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 69ecccb0fa674314d8e72084dbaae3b248494d19
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:13 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit c9df46d65c9ba7c39c8c0fb355199ff3627ae76e
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit ec7cff5eb04007f30e0fa732bca8a55882f5482f
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:22 2003 +0000
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/compile new/xfontsel-1.0.2/compile
--- old/xfontsel-X11R7.0-1.0.1/compile 2005-12-21 08:27:29.000000000 +0100
+++ new/xfontsel-1.0.2/compile 2007-02-01 19:43:01.000000000 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -17,83 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/config.h.in new/xfontsel-1.0.2/config.h.in
--- old/xfontsel-X11R7.0-1.0.1/config.h.in 2005-12-21 08:27:28.000000000 +0100
+++ new/xfontsel-1.0.2/config.h.in 2007-02-01 19:48:08.000000000 +0100
@@ -18,5 +18,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Version number of package */
#undef VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/configure.ac new/xfontsel-1.0.2/configure.ac
--- old/xfontsel-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:50.000000000 +0100
+++ new/xfontsel-1.0.2/configure.ac 2007-02-01 19:47:18.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xfontsel,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfontsel)
+AC_INIT(xfontsel,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfontsel)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/COPYING new/xfontsel-1.0.2/COPYING
--- old/xfontsel-X11R7.0-1.0.1/COPYING 2005-12-19 17:22:44.000000000 +0100
+++ new/xfontsel-1.0.2/COPYING 2007-02-01 19:46:34.000000000 +0100
@@ -1,12 +1,44 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1985-1989, 1994 X Consortium
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+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
+X CONSORTIUM 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 X Consortium 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 X Consortium.
+
+
+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/Makefile.am new/xfontsel-1.0.2/Makefile.am
--- old/xfontsel-X11R7.0-1.0.1/Makefile.am 2005-12-07 17:17:59.000000000 +0100
+++ new/xfontsel-1.0.2/Makefile.am 2007-02-01 19:42:38.000000000 +0100
@@ -48,7 +48,7 @@
appdefault_DATA = $(APPDEFAULTFILES)
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
+EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) ChangeLog autogen.sh
CLEANFILES = $(APPDEFAULTFILES)
@@ -83,3 +83,10 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+MAINTAINERCLEANFILES=ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/missing new/xfontsel-1.0.2/missing
--- old/xfontsel-X11R7.0-1.0.1/missing 2005-12-21 08:27:29.000000000 +0100
+++ new/xfontsel-1.0.2/missing 2007-02-01 19:43:00.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xfontsel-X11R7.0-1.0.1/xfontsel.man new/xfontsel-1.0.2/xfontsel.man
--- old/xfontsel-X11R7.0-1.0.1/xfontsel.man 2004-04-23 21:54:47.000000000 +0200
+++ new/xfontsel-1.0.2/xfontsel.man 2007-01-03 04:08:08.000000000 +0100
@@ -219,11 +219,11 @@
The average-width menu is too large to be useful.
.SH COPYRIGHT
Copyright 1989, 1991, X Consortium
-.br
+.PP
See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions.
.SH AUTHOR
.PP
Ralph R. Swick, Digital Equipment Corporation/MIT Project Athena
-.br
+.PP
Mark Leisher added the support for the UTF-8 sample
text.
++++++ xlsfonts-X11R7.0-1.0.1.tar.bz2 -> xlsfonts-1.0.2.tar.bz2 ++++++
++++ 12318 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/autogen.sh new/xlsfonts-1.0.2/autogen.sh
--- old/xlsfonts-X11R7.0-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xlsfonts-1.0.2/autogen.sh 2006-07-11 04:53:33.000000000 +0200
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/ChangeLog new/xlsfonts-1.0.2/ChangeLog
--- old/xlsfonts-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:52.000000000 +0100
+++ new/xlsfonts-1.0.2/ChangeLog 2007-02-01 22:55:20.000000000 +0100
@@ -1,28 +1,258 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c06da04f53d4f85ff67c73db3a8f24750297f1d7
+Author: Alan Coopersmith
+Date: Thu Feb 1 13:53:37 2007 -0800
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 808126e79c99595e42147413898cf4180869cdcd
+Author: Alan Coopersmith
+Date: Thu Feb 1 13:53:01 2007 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Replace static ChangeLog with dist-hook to generate from git log
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f66e6d2d380457b1f8349eba3621bc3e96359a00
+Author: Alan Coopersmith
+Date: Thu Feb 1 13:25:32 2007 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ renamed: .cvsignore -> .gitignore
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e498d20b6de51fcb72899216553125b348103a87
+Author: Alan Coopersmith
+Date: Thu Feb 1 13:25:01 2007 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Use __xorgversion__ instead of manually set date in man page .TH line
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit d77488aa710457262bed09302efe8ead9c4e3c8e
+Author: Eric S. Raymond
+Date: Tue Jan 2 19:16:13 2007 -0800
- * configure.ac:
- Update package version number for RC1 release.
+ Bug 9519: Markup problems in xlsfonts.1x
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=9519
-2005-10-05 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a59972fe058d8e45f2550f65cf97b1be74fff833
+Author: Kevin E Martin
+Date: Wed Dec 21 02:29:52 2005 +0000
- * Makefile.am: Add sgml file to EXTRA_DIST
+ Update package version for X11R7 release.
+
+commit 8cf29f5e347cb3a8d39c82e8987b68860f69bf30
+Author: Adam Jackson
+Date: Mon Dec 19 16:22:45 2005 +0000
+
+ Stub COPYING files
+
+commit 41a956218a1a6527898141124278a46cd7bbb084
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:09 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 21f89da6a5068e9c006b051dcc736a8387805781
+Author: Kevin E Martin
+Date: Tue Dec 6 22:48:23 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 49d2ba57cada2d31438cf7f72ee3aed8e4e61230
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:26 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 48b3d44f852d2109656c887b64d29592b1d8d247
+Author: Alan Coopersmith
+Date: Mon Nov 28 22:01:44 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit b9a35789740814a127c698153144477966867cb7
+Author: Eric Anholt
+Date: Mon Nov 21 10:35:02 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 3cd1203fc8b834d2793b6577a705855c0f35a8b4
+Author: Eric Anholt
+Date: Sun Nov 20 22:08:54 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit a959f0c7eeece2e10520c0253fc6b72e8bf96c86
+Author: Kevin E Martin
+Date: Wed Oct 19 02:47:55 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b005ec81035d21ecceb436bf95ad10c618110e49
+Author: Alan Coopersmith
+Date: Mon Oct 17 23:56:24 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 01abfc66e7214ecb3e1e6000394ae80433033d86
+Author: Alan Coopersmith
+Date: Fri Oct 14 00:25:46 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit a14dadced2dc1724a9ca0916c9cb2c0f3c46f6c7
+Author: Kevin E Martin
+Date: Tue Oct 4 23:57:07 2005 +0000
+
+ Add sgml file to EXTRA_DIST
+
+commit 8c64f857aefde58e1554adaedb61b695d23c7482
+Author: Alan Coopersmith
+Date: Mon Aug 1 20:25:30 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 4d51bc1a902bfb321e82217ba7327a8d5284b2ee
+Author: Kevin E Martin
+Date: Fri Jul 29 21:22:36 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit c1eb6f0ceb21e9a541c560db2daa67952a528de2
+Author: Adam Jackson
+Date: Wed Jul 20 19:32:02 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit 8eab7c1c0df42316eca01fb7038efb2be1667b79
+Author: Søren Sandmann Pedersen
+Date: Tue Jul 5 22:51:10 2005 +0000
+
+ Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,
+ xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable
+ xaw_use_xprint symlink.sh: add some extra files for xgc, xinit,
+ xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c:
+ Conditionalize use of xprint
+
+commit 105875357c72e58dea0fa50c3746f8f62e2b4243
+Author: Roland Mainz
+Date: Mon Jan 3 01:06:35 2005 +0000
+
+ xc/lib/XprintAppUtil/xpapputil.c
+ xc/lib/XprintAppUtil/xpapputil.h
+ xc/lib/XprintUtil/xprintutil.c
+ xc/lib/XprintUtil/xprintutil.h
+ xc/programs/glxgears/glxgears.c
+ xc/programs/xdbedizzy/xdbedizzy.c
+ xc/programs/xedit/Xedit-xprint.ad
+ xc/programs/xedit/commands.c
+ xc/programs/xlogo/print.c
+ xc/programs/xlsfonts/xlsfonts.c
+ xc/programs/xlsfonts/xlsfonts.man
+ xc/programs/xlsfonts/xlsfonts.sgml
+ xc/programs/xman/Xman-xprint.ad
+ xc/programs/xman/handler.c
+ xc/programs/xman/print.c
+ xc/programs/xman/print.h
+ xc/programs/xmore/XMore.ad
+ xc/programs/xmore/print.c
+ xc/programs/xmore/print.h
+ xc/programs/xmore/printdialog.c
+ xc/programs/xmore/printdialog.h
+ xc/programs/xmore/printdialogprivates.h
+ xc/programs/xmore/xmore.c
+ xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
+ xc/programs/xphelloworld/xphelloworld/xphelloworld.c
+ xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
+ xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
+ xc/programs/xphelloworld/xpxthelloworld/xpxthelloworld.c
+ xc/programs/xplsprinters/xplsprinters.c
+ //bugs.freedesktop.org/show_bug.cgi?id=1706) attachment #1615
+ (https://bugs.freedesktop.org/attachment.cgi?id=1615): XprintUtils
+ 2004/Q3 update. This adds various new features to the XprintUtils
+ library including support for page resolutions where
+ X_resolution!=Y_resolution, listfonts-mode control and initial
+ framework for the COLORSPACE extension. Patch by Roland Mainz
+ and Julien Lafon .
+
+commit ae8577dff6379de49740660194e5e8d0b33bca58
+Author: Roland Mainz
+Date: Fri Oct 8 02:39:41 2004 +0000
+
+ Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1557 - Update
+ DocBook SGML+XML manual pages and docmentation and the in-tree copies
+ of the generated files (*.man, *.html) to get them properly working
+ with newer versions of the tools within the Xorg tree.
+
+commit 22ac7ab05c6917dbd36be4ea0429cef2a6e3fa0e
+Author: Roland Mainz
+Date: Thu Oct 7 03:53:20 2004 +0000
+
+ Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1551 - Convert
+ "xlsfonts" manual page to DocBook format (and document the new
+ functionality introduced with bug #1518).
+
+commit 856414eb1a5a20f379472b9eaa0f114c6c18d806
+Author: Roland Mainz
+Date: Wed Oct 6 19:29:59 2004 +0000
+
+ Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=1518 - Add filter
+ support to "xlsfonts" that it can filter builtin-, glyph- and/or other
+ kinds of printer fonts (controlled by the xp-listfonts-modes attribute
+ as described in the CDE DtPrint and Xprint specifications).
+
+commit 27d3336d79d9915a1b33be561e99bd24c3b474d8
+Author: Egbert Eich
+Date: Fri Apr 23 19:54:58 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 0f7f8ddb0865dadf679b7e1cc468f9ff09a62f75
+Author: Egbert Eich
+Date: Sun Mar 14 08:35:37 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 4da443b33a3738d75fc6923169e1381e1e28240e
+Author: Egbert Eich
+Date: Wed Mar 3 12:13:14 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 5a6a9478b80ebe07a7ff05dd19d464c667349325
+Author: Egbert Eich
+Date: Thu Feb 26 13:36:26 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 244f1d92d673144bd53805609f7f15744bc26c97
+Author: Egbert Eich
+Date: Thu Feb 26 09:24:14 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit ef18ebade29f85a228da73a3ad13fe800cb7b62b
+Author: Kaleb Keithley
+Date: Tue Nov 25 19:29:15 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 491b5e903ad3091687ae39159aba3e434476f8d4
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:49:23 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit eac4daf4fe3d99cc3a099067a62f791d33b8d2ca
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:54 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/compile new/xlsfonts-1.0.2/compile
--- old/xlsfonts-X11R7.0-1.0.1/compile 2005-12-21 08:30:07.000000000 +0100
+++ new/xlsfonts-1.0.2/compile 2007-02-01 22:44:56.000000000 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -17,83 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/config.h.in new/xlsfonts-1.0.2/config.h.in
--- old/xlsfonts-X11R7.0-1.0.1/config.h.in 2005-12-21 08:30:06.000000000 +0100
+++ new/xlsfonts-1.0.2/config.h.in 2007-02-01 22:55:20.000000000 +0100
@@ -18,5 +18,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Version number of package */
#undef VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/configure.ac new/xlsfonts-1.0.2/configure.ac
--- old/xlsfonts-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:52.000000000 +0100
+++ new/xlsfonts-1.0.2/configure.ac 2007-02-01 22:53:19.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xlsfonts,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlsfonts)
+AC_INIT(xlsfonts,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlsfonts)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/Makefile.am new/xlsfonts-1.0.2/Makefile.am
--- old/xlsfonts-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:23.000000000 +0100
+++ new/xlsfonts-1.0.2/Makefile.am 2007-02-01 22:43:44.000000000 +0100
@@ -32,7 +32,13 @@
appman_PRE = \
xlsfonts.man
-EXTRA_DIST = xlsfonts.sgml
+EXTRA_DIST = xlsfonts.sgml ChangeLog autogen.sh
+MAINTAINERCLEANFILES=ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
appmandir = $(APP_MAN_DIR)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/missing new/xlsfonts-1.0.2/missing
--- old/xlsfonts-X11R7.0-1.0.1/missing 2005-12-21 08:30:07.000000000 +0100
+++ new/xlsfonts-1.0.2/missing 2007-02-01 22:44:55.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xlsfonts-X11R7.0-1.0.1/xlsfonts.man new/xlsfonts-1.0.2/xlsfonts.man
--- old/xlsfonts-X11R7.0-1.0.1/xlsfonts.man 2005-01-03 02:06:35.000000000 +0100
+++ new/xlsfonts-1.0.2/xlsfonts.man 2007-02-01 22:24:18.000000000 +0100
@@ -1,23 +1,14 @@
.\" -*- coding: us-ascii -*-
-.TH xlsfonts __appmansuffix__ "25 October 2004"
+.TH xlsfonts __appmansuffix__ __xorgversion__
.SH NAME
xlsfonts \- server font list displayer for X
.SH SYNOPSIS
.ad l
-\fBxlsfonts\fR \kx
-.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
-'in \n(.iu+\nxu
+\fBxlsfonts\fR
[\fB\-display \fBhost:dpy\fR\fR] [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-fn \fBpattern\fR\fR]
-'in \n(.iu-\nxu
-.ad b
-.PP
-.ad l
-\fBxlsfonts\fR \kx
-.if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5)
-'in \n(.iu+\nxu
+.br
+\fBxlsfonts\fR
\fB\-printer \fBprintername\fR\fR [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-r \fBresolution\fR\fR] [\fB\-b\fR] [\fB\-B\fR] [\fB\-g\fR] [\fB\-G\fR] [\fB\-x \fBmode\fR\fR] [\fB\-X \fBmode\fR\fR] [\fB\-fn \fBpattern\fR\fR]
-'in \n(.iu-\nxu
-.ad b
.SH DESCRIPTION
xlsfonts lists the fonts that match the given pattern.
The wildcard character "*" may be used to match any sequence of characters
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org