Mailinglist Archive: opensuse-commit (918 mails)
| < Previous | Next > |
commit xorg-x11
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 02 Feb 2007 15:59:30 +0100
- Message-id: <20070202145931.3A652678183@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package xorg-x11
checked in at Fri Feb 2 15:59:30 CET 2007.
--------
--- xorg-x11/xorg-x11.changes 2007-01-24 05:45:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2007-02-01 10:47:51.090574000 +0100
@@ -1,0 +2,23 @@
+Thu Feb 1 10:47:09 CET 2007 - sndirsch@xxxxxxx
+
+- /etc/X11/xdm/{Xsetup,Xstartup}
+ * start/kill xvkbd only when autologin is disabled (Bug #238604)
+
+-------------------------------------------------------------------
+Mon Jan 29 15:36:43 CET 2007 - sndirsch@xxxxxxx
+
+- updated mkcomposecache to release 1.2
+ * Bump to 1.2.
+ * Autogen ChangeLog.
+ * Unset XMODIFIERS in mkcomposecache.
+ * Log if XOpenIM() fails.
+ * mkallcomposecache.sh is more verbose now on Xvfb errors.
+ * Including old and new font paths in default.
+
+-------------------------------------------------------------------
+Mon Jan 29 12:13:00 CET 2007 - sndirsch@xxxxxxx
+
+- updated xpr to release 1.0.2
+ * Bug 9518: Markup problems on the xdpr.1 page
+
+-------------------------------------------------------------------
Old:
----
mkcomposecache-1.1.tar.bz2
xpr-X11R7.0-1.0.1.tar.bz2
New:
----
mkcomposecache-1.2.tar.bz2
xpr-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.wi5281/_old 2007-02-02 15:58:28.000000000 +0100
+++ /var/tmp/diff_new_pack.wi5281/_new 2007-02-02 15:58:28.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: 43
+Release: 44
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -95,7 +95,7 @@
Source71: xmore-X11R7.0-1.0.1.tar.bz2
Source72: xphelloworld-X11R7.0-1.0.1.tar.bz2
Source73: xplsprinters-X11R7.0-1.0.1.tar.bz2
-Source74: xpr-X11R7.0-1.0.1.tar.bz2
+Source74: xpr-1.0.2.tar.bz2
Source75: xprehashprinterlist-X11R7.0-1.0.1.tar.bz2
Source76: xprop-1.0.2.tar.bz2
Source77: xrandr-X11R7.1-1.0.2.tar.bz2
@@ -114,7 +114,7 @@
Source90: xwd-X11R7.0-1.0.1.tar.bz2
Source91: xwininfo-X11R7.1-1.0.2.tar.bz2
Source92: xwud-X11R7.0-1.0.1.tar.bz2
-Source93: mkcomposecache-1.1.tar.bz2
+Source93: mkcomposecache-1.2.tar.bz2
Source94: rendercheck-1.2.tar.bz2
Source200: misc.tar.bz2
Source201: twm.tar.bz2
@@ -444,6 +444,20 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Thu Feb 01 2007 - sndirsch@xxxxxxx
+- /etc/X11/xdm/{Xsetup,Xstartup}
+ * start/kill xvkbd only when autologin is disabled (Bug #238604)
+* Mon Jan 29 2007 - sndirsch@xxxxxxx
+- updated mkcomposecache to release 1.2
+ * Bump to 1.2.
+ * Autogen ChangeLog.
+ * Unset XMODIFIERS in mkcomposecache.
+ * Log if XOpenIM() fails.
+ * mkallcomposecache.sh is more verbose now on Xvfb errors.
+ * Including old and new font paths in default.
+* Mon Jan 29 2007 - sndirsch@xxxxxxx
+- updated xpr to release 1.0.2
+ * Bug 9518: Markup problems on the xdpr.1 page
* Wed Jan 24 2007 - sndirsch@xxxxxxx
- updated bitmap to release 1.0.3
* Trivial manpage formatting cleanup release for X11R7.2.
++++++ mkcomposecache-1.1.tar.bz2 -> mkcomposecache-1.2.tar.bz2 ++++++
++++ 6756 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/mkcomposecache-1.1/ChangeLog new/mkcomposecache-1.2/ChangeLog
--- old/mkcomposecache-1.1/ChangeLog 2006-06-30 16:01:25.000000000 +0200
+++ new/mkcomposecache-1.2/ChangeLog 2007-01-29 12:56:08.000000000 +0100
@@ -1,18 +1,30 @@
-2006-06-30 Matthias Hopf <mhopf@xxxxxxx>
+commit af537f0acbc1bf9db54c10df24246a84bf092277
+Author: Matthias Hopf <mhopf@xxxxxxx>
+Date: Mon Jan 29 12:52:27 2007 +0100
- * configure.ac:
- Bump to 1.1
- * mkallcomposecaches.sh:
- Set default cache path to /var/cache/libx11/compose.
- Invocation parameters changed.
- Improved customizability a lot.
- More tests & verification.
- Being more verbose now.
- Works for root now.
- General cleanup.
- Should work out-of-the-box on 64bit machines now.
+ Bump to 1.2.
+ Autogen ChangeLog.
+ Unset XMODIFIERS in mkcomposecache.
+ Log if XOpenIM() fails.
+ mkallcomposecache.sh is more verbose now on Xvfb errors.
+ Including old and new font paths in default.
-2006-06-29 Matthias Hopf <mhopf@xxxxxxx>
+commit 2d7f5a205743698b729be7ad28c116046cbccb73
+Author: Matthias Hopf <mhopf@xxxxxxx>
+Date: Mon Jul 3 16:57:39 2006 +0200
- * Initial checkin.
+ Bump to 1.1
+ Set default cache path to /var/cache/libx11/compose.
+ Invocation parameters changed.
+ Improved customizability a lot.
+ More tests & verification.
+ Being more verbose now.
+ Works for root now.
+ General cleanup.
+ Should work out-of-the-box on 64bit machines now.
+commit 49de3bc3734a6784d8dd0e1061996e3cf0cbc8ed
+Author: Matthias Hopf <mhopf@xxxxxxx>
+Date: Mon Jul 3 16:55:51 2006 +0200
+
+ Initial checkin.
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/mkcomposecache-1.1/config.h.in new/mkcomposecache-1.2/config.h.in
--- old/mkcomposecache-1.1/config.h.in 1970-01-01 01:00:00.000000000 +0100
+++ new/mkcomposecache-1.2/config.h.in 2007-01-29 12:56:03.000000000 +0100
@@ -0,0 +1,64 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `unsetenv' function. */
+#undef HAVE_UNSETENV
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* 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/mkcomposecache-1.1/configure.ac new/mkcomposecache-1.2/configure.ac
--- old/mkcomposecache-1.1/configure.ac 2006-06-30 15:49:42.000000000 +0200
+++ new/mkcomposecache-1.2/configure.ac 2007-01-29 12:27:56.000000000 +0100
@@ -1,8 +1,9 @@
# -*- Autoconf -*-
AC_PREREQ(2.53)
-AC_INIT([mkcomposecache], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([mkcomposecache], [1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([mkcomposecache.c])
+AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -15,6 +16,7 @@
AC_CHECK_HEADERS([stdio.h stdlib.h string.h unistd.h locale.h], , [AC_MSG_FAILURE("cannot find essential header")])
AC_CHECK_FUNCS([setlocale], , [AC_MSG_FAILURE("cannot find essential function")])
+AC_CHECK_FUNCS([unsetenv])
AC_SUBST(XLIB_CFLAGS)
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/mkcomposecache-1.1/Makefile.am new/mkcomposecache-1.2/Makefile.am
--- old/mkcomposecache-1.1/Makefile.am 2006-06-29 12:58:12.000000000 +0200
+++ new/mkcomposecache-1.2/Makefile.am 2007-01-29 12:37:36.000000000 +0100
@@ -3,10 +3,18 @@
AM_CFLAGS = @XLIB_CFLAGS@ -Wall
sbin_PROGRAMS = mkcomposecache
-EXTRA_DIST = mkallcomposecaches.sh
+EXTRA_DIST = ChangeLog mkallcomposecaches.sh
mkcomposecache_SOURCES = mkcomposecache.c
mkcomposecache_LDADD = @XLIB_LIBS@
-MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 depcomp install-sh missing
+CLEANFILES=ChangeLog
+MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in depcomp install-sh missing ChangeLog
+
+.PHONY: 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/mkcomposecache-1.1/mkallcomposecaches.sh new/mkcomposecache-1.2/mkallcomposecaches.sh
--- old/mkcomposecache-1.1/mkallcomposecaches.sh 2006-06-30 15:49:14.000000000 +0200
+++ new/mkcomposecache-1.2/mkallcomposecaches.sh 2007-01-26 18:54:11.000000000 +0100
@@ -13,7 +13,9 @@
cat 1>&2 <<EOUSAGE
$0 [var=arg] [...] root
-e.g. $0 prefix=/usr/X11R7 /tmp/build-xorg
+ e.g. $0 prefix=/usr/X11R7 /tmp/build-xorg
+Double quote args with spaces.
+ e.g. $0 "xvfbopts='-sp /usr/lib/xserver/SecurityPolicy'" /tmp/build-xorg
Base defaults:
prefix=/usr
@@ -22,9 +24,9 @@
Program + args defaults:
xvfb=\$root\$prefix/bin/Xvfb
- xvfbopts='-fp \$root\$prefix/\$libs/X11/fonts/misc/
- -sp \$root/etc/X11/xserver/SecurityPolicy
- -co \$root\$prefix/\$libs/X11/rgb'
+ xvfbopts='-fp \$root\$prefix/\$libs/X11/fonts/misc/,
+ \$root\$prefix/share/fonts/misc
+ -sp /dev/null'
xbiff=\$root\$prefix/bin/xbiff
mkcomposecache=\$root\$prefix/sbin/mkcomposecache
@@ -78,7 +80,7 @@
test "x$xbiff" = x && xbiff=$root$prefix/bin/xbiff
test "x$mkcomposecache" = x && mkcomposecache=$root$prefix/sbin/mkcomposecache
test "x$cachedir" = x && cachedir=$root/var/cache/libx11/compose
-test "x$xvfbopts" = x && xvfbopts="-fp $root$prefix/$libs/X11/fonts/misc/ -sp $root/etc/X11/xserver/SecurityPolicy -co $root$prefix/$libs/X11/rgb"
+test "x$xvfbopts" = x && xvfbopts="-fp $root$prefix/$libs/X11/fonts/misc/,$root$prefix/share/fonts/misc -sp /dev/null"
test "x$user" = x && user=nobody
test "x`whoami`" = xroot || user=""
@@ -131,7 +133,7 @@
echo "Starting Xvfb..."
$xvfb $xvfbopts :99 1>$tmpfile 2>&1 &
-trap "echo 1>&2 'Killing Xvfb...'; kill $! 2>/dev/null; rm -rf $tmpdir 2>/dev/null; rm -f $tmpfile 2>/dev/null; true" 0
+trap "echo 1>&2 'Killing Xvfb...'; kill $! 2>/dev/null; sleep 1; echo 1>&2 'Xvfb output:'; cat 1>&2 $tmpfile; rm -rf $tmpdir 2>/dev/null; rm -f $tmpfile 2>/dev/null; true" 0
DISPLAY=:99
LD_LIBRARY_PATH="$ldpath"
@@ -140,7 +142,7 @@
# Starting a single program so that x does not re-initialize for each mkcomposecache
sleep 5
-$xbiff 1>/dev/null 2>&1 &
+$xbiff 2>&1 &
echo ""
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/mkcomposecache-1.1/mkcomposecache.c new/mkcomposecache-1.2/mkcomposecache.c
--- old/mkcomposecache-1.1/mkcomposecache.c 2006-06-29 11:55:05.000000000 +0200
+++ new/mkcomposecache-1.2/mkcomposecache.c 2007-01-29 12:30:00.000000000 +0100
@@ -18,6 +18,8 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include "config.h"
+
#include <X11/Xlib.h>
#include <stdio.h>
#include <stdlib.h>
@@ -67,13 +69,19 @@
sprintf (dest, "XCOMPOSECACHE=%s=%s", argv[3], argv[4]);
putenv (src);
putenv (dest);
+#if HAVE_UNSETENV
+ unsetenv ("XMODIFIERS");
+#else
+ putenv ("XMODIFIERS");
+#endif
if (! (disp = XOpenDisplay (NULL)) ) {
perror ("* XOpenDisplay");
return 1;
}
XSetLocaleModifiers("");
- im = XOpenIM (disp, NULL, NULL, NULL);
+ if (! (im = XOpenIM (disp, NULL, NULL, NULL)) )
+ fputs ("* XOpenIM: no input method\n", stderr);
if (im)
XCloseIM (im);
++++++ xdm.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup 2006-10-18 14:52:01.000000000 +0200
+++ new/etc/X11/xdm/Xsetup 2007-02-01 10:46:39.000000000 +0100
@@ -69,6 +69,8 @@
#
$halporp --key system.formfactor.subtype --string tabletpc
if test $? -eq 0 -a -x $xvkbd ; then
+ # Bug 238604
+ if grep -q DISPLAYMANAGER_AUTOLOGIN="" /etc/sysconfig/displaymanager; then
# Bug 149957
( declare -i t=100
while test $((t--)) -gt 0 ; do
@@ -79,6 +81,7 @@
done
HOME=/root exec $xvkbd -compact -geometry -0-0 -xdm
) & echo $! > /var/run/xvkbd.pid
+ fi
fi
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup 2006-10-18 14:52:27.000000000 +0200
+++ new/etc/X11/xdm/Xstartup 2007-02-01 10:46:42.000000000 +0100
@@ -27,7 +27,10 @@
#
$halporp --key system.formfactor.subtype --string tabletpc
if test $? -eq 0 -a -x $xvkbd ; then
+ # Bug 238604
+ if grep -q DISPLAYMANAGER_AUTOLOGIN="" /etc/sysconfig/displaymanager; then
/sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
+ fi
fi
#
++++++ xpr-X11R7.0-1.0.1.tar.bz2 -> xpr-1.0.2.tar.bz2 ++++++
++++ 12292 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/xpr-X11R7.0-1.0.1/autogen.sh new/xpr-1.0.2/autogen.sh
--- old/xpr-X11R7.0-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/xpr-1.0.2/autogen.sh 2006-07-11 04:53:57.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/xpr-X11R7.0-1.0.1/ChangeLog new/xpr-1.0.2/ChangeLog
--- old/xpr-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:53.000000000 +0100
+++ new/xpr-1.0.2/ChangeLog 2007-01-28 08:50:38.000000000 +0100
@@ -1,31 +1,161 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit cceb5d7387f8dcc39000f8e27b82230e9a8f5019
+Author: Alan Coopersmith <alan.coopersmith@xxxxxxx>
+Date: Sat Jan 27 23:50:00 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 b3e250641a02791204a24ee955a41ce9371e35c3
+Author: Alan Coopersmith <alan.coopersmith@xxxxxxx>
+Date: Sat Jan 27 23:47:11 2007 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Replace static ChangeLog with dist-hook to generate from git
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 028ed782e7a3e502e54f1343d66b1311cb00a900
+Author: Alan Coopersmith <alan.coopersmith@xxxxxxx>
+Date: Tue Jan 2 19:03:44 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 9049071794e0cdf8d72851f52481e053f6d21ca4
+Author: Eric S. Raymond <esr@xxxxxxxxxxx>
+Date: Tue Jan 2 19:03:09 2007 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug 9518: Markup problems on the xdpr.1 page
+
+ <https://bugs.freedesktop.org/show_bug.cgi?id=9518>
-2005-11-20 Alan Coopersmith <alan.coopersmith@xxxxxxx>
+commit c7d48ec1d3206d6eb250072fe5eb1511b43f0af2
+Author: Kevin E Martin <kem@xxxxxxx>
+Date: Wed Dec 21 02:29:53 2005 +0000
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
+ Update package version for X11R7 release.
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b5b4935d49c92babb1ff57d25f2e4ecb5491f80f
+Author: Adam Jackson <ajax@xxxxxxxx>
+Date: Mon Dec 19 16:22:46 2005 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Stub COPYING files
+commit d3840fd1c4ee62bb3c556fec71e17fe59740ecc3
+Author: Kevin E Martin <kem@xxxxxxx>
+Date: Thu Dec 15 00:24:10 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit bd9c0b849104aeb68b297171246cc30bfdb6ddaa
+Author: Kevin E Martin <kem@xxxxxxx>
+Date: Tue Dec 6 22:48:24 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 5597c26daba5072fd9a0c6f943a424946af98875
+Author: Kevin E Martin <kem@xxxxxxx>
+Date: Sat Dec 3 05:49:27 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 9402168a108ff81c81a8137ed5882b928d9960bc
+Author: Alan Coopersmith <Alan.Coopersmith@xxxxxxx>
+Date: Mon Nov 28 22:01:46 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 dfc64376daec039f564b023acc136af34a6f71ad
+Author: Eric Anholt <anholt@xxxxxxxxxxx>
+Date: Mon Nov 21 10:35:07 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit 84f2c29fd400a4d484622ac8b2eb7e7e90fda9b3
+Author: Alan Coopersmith <Alan.Coopersmith@xxxxxxx>
+Date: Mon Nov 21 03:14:16 2005 +0000
+
+ Change dependency from xmu to xmuu since the full xmu (with all its baggage
+ like Xt) is not needed here.
+
+commit a1e58da278e8ff4105d96c4e8068ac27e62eb13b
+Author: Eric Anholt <anholt@xxxxxxxxxxx>
+Date: Sun Nov 20 22:08:55 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit e3857fb739d8f4aaa871e64585a48bff0d6537a4
+Author: Kevin E Martin <kem@xxxxxxx>
+Date: Wed Oct 19 02:47:56 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit fa885773b5b96ec051bbc477da5b0eaff28edb3a
+Author: Alan Coopersmith <Alan.Coopersmith@xxxxxxx>
+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 0cb5e946c3bdfb49101a6f018734a5cfe0db8f48
+Author: Alan Coopersmith <Alan.Coopersmith@xxxxxxx>
+Date: Fri Oct 14 00:25:47 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 67e02555f85d8c6374bb2618391e200aa5165cea
+Author: Alan Coopersmith <Alan.Coopersmith@xxxxxxx>
+Date: Mon Aug 1 20:25:32 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit ab0d5822ee12d003c1797f78dceec00c68c06be5
+Author: Kevin E Martin <kem@xxxxxxx>
+Date: Fri Jul 29 21:22:37 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 869f3a1bc4ff378d2c0437518b91154c43c16e87
+Author: Adam Jackson <ajax@xxxxxxxx>
+Date: Wed Jul 20 19:32:03 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 e3928f9b676c1054790b5ef69b8a568e80482189
+Author: Søren Sandmann Pedersen <sandmann@xxxxxxxxxxx>
+Date: Fri Jul 1 21:10:15 2005 +0000
+
+ symlink.sh: add xplsprinters.sgml xprehashprinterlist.sgml xdpr.script
+ Check in build systems for xpr, xprehashprinterlist, xplsprinters
+
+commit 5e2412e58e798657ae36bfddf643ff7da7b98e15
+Author: Roland Mainz <roland.mainz@xxxxxxxxxxx>
+Date: Mon Nov 8 21:38:56 2004 +0000
+
+ xc/programs/xpr/x2jet.c
+ //freedesktop.org/bugzilla/show_bug.cgi?id=1795): Fix build bustage caused
+ by bug 1779, patch by Bernhard Rosenkraenzer <bero@xxxxxxxxxxxx>.
+
+commit aa81cc55645093145f346aa8ec490df00299c8fb
+Author: Roland Mainz <roland.mainz@xxxxxxxxxxx>
+Date: Mon Nov 8 07:22:50 2004 +0000
+
+ xc/programs/xpr/x2jet.c
+ xc/programs/xpr/x2pmp.c
+ xc/programs/xpr/xpr.c
+ Fix various warnings, build problems in "xpr" and convert the whole source
+ from K&R style to ANSI-C.
+
+commit 9a961d11bea6be64c6f51b4f0829ff4fe2999c4a
+Author: Roland Mainz <roland.mainz@xxxxxxxxxxx>
+Date: Sun Oct 31 02:14:06 2004 +0000
+
+ Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=631 - Uploading
+ "xpr" and "pclcomp" as they are needed for the RASTER and PCL drivers
+ on some platforms.
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/xpr-X11R7.0-1.0.1/compile new/xpr-1.0.2/compile
--- old/xpr-X11R7.0-1.0.1/compile 2005-12-21 08:31:31.000000000 +0100
+++ new/xpr-1.0.2/compile 2007-01-28 08:41:58.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 <tromey@xxxxxxxxxx>.
#
# 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 <bug-automake@xxxxxxx> or send patches to
+# <automake-patches@xxxxxxx>.
+
+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 <bug-automake@xxxxxxx>.
+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/xpr-X11R7.0-1.0.1/config.h.in new/xpr-1.0.2/config.h.in
--- old/xpr-X11R7.0-1.0.1/config.h.in 2005-12-21 08:31:29.000000000 +0100
+++ new/xpr-1.0.2/config.h.in 2007-01-28 08:50:38.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/xpr-X11R7.0-1.0.1/configure.ac new/xpr-1.0.2/configure.ac
--- old/xpr-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:53.000000000 +0100
+++ new/xpr-1.0.2/configure.ac 2007-01-28 08:49:19.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xpr,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xpr)
+AC_INIT(xpr,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xpr)
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/xpr-X11R7.0-1.0.1/Makefile.am new/xpr-1.0.2/Makefile.am
--- old/xpr-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:24.000000000 +0100
+++ new/xpr-1.0.2/Makefile.am 2007-01-28 08:40:46.000000000 +0100
@@ -44,7 +44,14 @@
CLEANFILES = xdpr
-EXTRA_DIST = xdpr.script
+EXTRA_DIST = xdpr.script 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/xpr-X11R7.0-1.0.1/missing new/xpr-1.0.2/missing
--- old/xpr-X11R7.0-1.0.1/missing 2005-12-21 08:31:31.000000000 +0100
+++ new/xpr-1.0.2/missing 2007-01-28 08:41:57.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 <pinard@xxxxxxxxxxxxxxxx>, 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 <bug-automake@xxxxxxx>."
+ 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/xpr-X11R7.0-1.0.1/xdpr.man new/xpr-1.0.2/xdpr.man
--- old/xpr-X11R7.0-1.0.1/xdpr.man 2004-10-31 03:14:06.000000000 +0100
+++ new/xpr-1.0.2/xdpr.man 2007-01-03 04:01:09.000000000 +0100
@@ -57,7 +57,6 @@
with the \fI\-device\fP option.
.TP
.B \-display \fIhost:display\fP[\fI.screen\fP]
-.cm .IB host : display
Normally,
.I xdpr
gets the host and display number to use from the environment
@@ -73,9 +72,9 @@
Digital LA100
.TP
.B ljet
-\s-1HP\s+1 LaserJet series and other monochrome PCL devices
+HP LaserJet series and other monochrome PCL devices
such as ThinkJet, QuietJet, RuggedWriter, \s-1HP\s+12560 series,
-and \s-1HP\s+12930 series printers
+and HP 2930 series printers
.TP
.B ln03
Digital LN03
@@ -126,7 +125,7 @@
PRINTER
which printer to use by default.
.SH COPYRIGHT
-Copyright ([\d,\s]*) X Consortium
+Copyright X Consortium
.br
See \fIX(1)\fP for a full statement of rights and permissions.
.SH AUTHORS
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |