Hello community,
here is the log from the commit of package xorg-x11
checked in at Tue Dec 19 17:21:24 CET 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-12-16 06:06:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-12-17 11:43:27.000000000 +0100
@@ -1,0 +2,12 @@
+Sun Dec 17 11:41:26 CET 2006 - sndirsch@suse.de
+
+- updated beforelight to release 1.0.2
+ * remove config.h from _SOURCES
+ * Makefile.am: make appdefaultdir respect DESTDIR
+- updated fonttosfnt to release 1.0.3
+ * Makefile.am: make ChangeLog hook safer
+ * Fix author address in manual page, update COPYING.
+- updated xdm to release 1.1.3
+ * Makefile.am: make ChangeLog hook safer
+
+-------------------------------------------------------------------
Old:
----
beforelight-X11R7.0-1.0.1.tar.bz2
fonttosfnt-1.0.2.tar.bz2
xdm-1.1.2.tar.bz2
New:
----
beforelight-1.0.2.tar.bz2
beforelight.diff
fonttosfnt-1.0.3.tar.bz2
xdm-1.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.Orsc1c/_old 2006-12-19 17:18:00.000000000 +0100
+++ /var/tmp/diff_new_pack.Orsc1c/_new 2006-12-19 17:18:00.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: 34
+Release: 36
License: X11/MIT, Other License(s), see package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -24,10 +24,10 @@
Summary: X.Org core and sample applications
Source0: appres-X11R7.0-1.0.0.tar.bz2
Source1: bdftopcf-X11R7.0-1.0.0.tar.bz2
-Source2: beforelight-X11R7.0-1.0.1.tar.bz2
+Source2: beforelight-1.0.2.tar.bz2
Source3: bitmap-X11R7.1-1.0.2.tar.bz2
Source4: editres-1.0.2.tar.bz2
-Source5: fonttosfnt-1.0.2.tar.bz2
+Source5: fonttosfnt-1.0.3.tar.bz2
Source6: fslsfonts-X11R7.0-1.0.1.tar.bz2
Source7: fstobdf-X11R7.1-1.0.2.tar.bz2
Source8: iceauth-X11R7.0-1.0.1.tar.bz2
@@ -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.2.tar.bz2
+Source39: xdm-1.1.3.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
@@ -140,6 +140,7 @@
Patch19: scripts.diff
Patch20: xdm.diff
Patch21: xvidtune.diff
+Patch22: beforelight.diff
%description
This package contains the X.Org core and sample applications.
@@ -222,6 +223,7 @@
%patch17
patch -d scripts-* -p0 -s < %PATCH19
patch -d xvidtune-* -p0 -s < %PATCH21
+patch -d beforelight-* -p0 -s < %PATCH22
%build
@@ -235,7 +237,7 @@
#autoreconf -fi
case $dir in
xdm-*) option="--with-pam --with-xdmconfigdir=/etc/X11/xdm --with-xdmscriptdir=/etc/X11/xdm" ;;
- xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*)
+ xfs-*|lbxproxy-*|proxymngr-*|rstart-*|x11perf-*|xedit-*|xinit-*|xsm-*|scripts-*|sessreg-*|beforelight-*)
option=""; autoreconf -fi ;;
luit-*) option="--with-localealiasfile=/usr/share/X11/locale/locale.alias" ;;
*) option="" ;;
@@ -442,6 +444,15 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Sun Dec 17 2006 - sndirsch@suse.de
+- updated beforelight to release 1.0.2
+ * remove config.h from _SOURCES
+ * Makefile.am: make appdefaultdir respect DESTDIR
+- updated fonttosfnt to release 1.0.3
+ * Makefile.am: make ChangeLog hook safer
+ * Fix author address in manual page, update COPYING.
+- updated xdm to release 1.1.3
+ * Makefile.am: make ChangeLog hook safer
* Sat Dec 16 2006 - sndirsch@suse.de
- updated editres to release 1.0.2
* remove config.h from _SOURCES
++++++ beforelight-X11R7.0-1.0.1.tar.bz2 -> beforelight-1.0.2.tar.bz2 ++++++
++++ 12500 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/beforelight-X11R7.0-1.0.1/Makefile.am new/beforelight-1.0.2/Makefile.am
--- old/beforelight-X11R7.0-1.0.1/Makefile.am 2005-12-07 17:17:57.000000000 +0100
+++ new/beforelight-1.0.2/Makefile.am 2006-12-15 23:16:57.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.15 2005/12/07 16:17:57 kem Exp $
+# $Id$
#
# Copyright 2005 Red Hat, Inc.
#
@@ -26,15 +26,14 @@
beforelight_LDADD = $(BEFORELIGHT_LIBS)
beforelight_SOURCES = \
- b4light.c \
- config.h
+ b4light.c
appman_PRE = \
beforelight.man
# App default files (*.ad)
-appdefaultdir = @appdefaultdir@
+appdefaultdir = $(DESTDIR)@appdefaultdir@
EXTRA_DIST = \
Beforelight.ad
@@ -51,7 +50,6 @@
CLEANFILES = $(APPDEFAULTFILES)
-
appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
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/beforelight-X11R7.0-1.0.1/compile new/beforelight-1.0.2/compile
--- old/beforelight-X11R7.0-1.0.1/compile 2005-12-21 08:20:08.000000000 +0100
+++ new/beforelight-1.0.2/compile 2006-12-15 22:27:37.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/beforelight-X11R7.0-1.0.1/config.h new/beforelight-1.0.2/config.h
--- old/beforelight-X11R7.0-1.0.1/config.h 2005-12-21 08:20:10.000000000 +0100
+++ new/beforelight-1.0.2/config.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-/* config.h. Generated by configure. */
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Name of package */
-#define PACKAGE "beforelight"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "beforelight"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "beforelight 1.0.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "beforelight"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.1"
-
-/* Version number of package */
-#define VERSION "1.0.1"
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/beforelight-X11R7.0-1.0.1/config.h.in new/beforelight-1.0.2/config.h.in
--- old/beforelight-X11R7.0-1.0.1/config.h.in 2005-12-21 08:20:07.000000000 +0100
+++ new/beforelight-1.0.2/config.h.in 2006-12-15 23:13:47.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/beforelight-X11R7.0-1.0.1/configure.ac new/beforelight-1.0.2/configure.ac
--- old/beforelight-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:42.000000000 +0100
+++ new/beforelight-1.0.2/configure.ac 2006-12-15 23:12:59.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(beforelight,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],beforelight)
+AC_INIT(beforelight,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],beforelight)
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/beforelight-X11R7.0-1.0.1/missing new/beforelight-1.0.2/missing
--- old/beforelight-X11R7.0-1.0.1/missing 2005-12-21 08:20:08.000000000 +0100
+++ new/beforelight-1.0.2/missing 2006-12-15 22:27:37.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:
++++++ beforelight.diff ++++++
--- Makefile.am.orig 2006-12-17 17:06:57.112745348 +0100
+++ Makefile.am 2006-12-17 17:07:25.897816333 +0100
@@ -33,7 +33,7 @@
# App default files (*.ad)
-appdefaultdir = $(DESTDIR)@appdefaultdir@
+appdefaultdir = @appdefaultdir@
EXTRA_DIST = \
Beforelight.ad
++++++ fonttosfnt-1.0.2.tar.bz2 -> fonttosfnt-1.0.3.tar.bz2 ++++++
++++ 7164 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/fonttosfnt-1.0.2/COPYING new/fonttosfnt-1.0.3/COPYING
--- old/fonttosfnt-1.0.2/COPYING 2006-10-12 00:13:40.000000000 +0200
+++ new/fonttosfnt-1.0.3/COPYING 2006-11-08 15:06:01.000000000 +0100
@@ -1,12 +1,19 @@
-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) 2002-2003 by Juliusz Chroboczek
-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:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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
+AUTHORS OR COPYRIGHT HOLDERS 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.
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/fonttosfnt-1.0.2/ChangeLog new/fonttosfnt-1.0.3/ChangeLog
--- old/fonttosfnt-1.0.2/ChangeLog 2006-10-13 23:30:19.000000000 +0200
+++ new/fonttosfnt-1.0.3/ChangeLog 2006-12-16 00:37:55.000000000 +0100
@@ -1,3 +1,28 @@
+commit 0c316fb4aadf26bea5784974cd484483d6322b5c
+Author: Daniel Stone
+Date: Sat Dec 16 01:37:31 2006 +0200
+
+ bump to 1.0.3
+
+commit 0eba2afb80bf17c0a2d2753ff92c1986211d92be
+Author: Daniel Stone
+Date: Wed Dec 6 19:01:27 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+ Make ChangeLog hook as safe as possible.
+
+commit 8c2de974ec3df06a547906474ced5ffb4a07a6b5
+Author: Juliusz Chroboczek
+Date: Tue Oct 31 01:48:49 2006 +0100
+
+ Fix author address in manual page, update COPYING.
+
+commit e734cef9baff470a5e913f2e9ac7e0ce649ea7dc
+Author: Adam Jackson
+Date: Fri Oct 13 17:30:24 2006 -0400
+
+ Bump to 1.0.2
+
commit 72caf26ad336b3de9af3e640f939ea2cd0caa42b
Author: Adam Jackson
Date: Thu Oct 12 20:56:01 2006 -0400
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/fonttosfnt-1.0.2/Makefile.am new/fonttosfnt-1.0.3/Makefile.am
--- old/fonttosfnt-1.0.2/Makefile.am 2006-10-13 02:55:11.000000000 +0200
+++ new/fonttosfnt-1.0.3/Makefile.am 2006-12-06 18:01:14.000000000 +0100
@@ -75,6 +75,6 @@
.PHONY: ChangeLog
ChangeLog:
- git-log > 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/fonttosfnt-1.0.2/config.h.in new/fonttosfnt-1.0.3/config.h.in
--- old/fonttosfnt-1.0.2/config.h.in 2006-10-13 23:30:19.000000000 +0200
+++ new/fonttosfnt-1.0.3/config.h.in 2006-12-16 00:37:51.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/fonttosfnt-1.0.2/configure.ac new/fonttosfnt-1.0.3/configure.ac
--- old/fonttosfnt-1.0.2/configure.ac 2006-10-13 23:28:53.000000000 +0200
+++ new/fonttosfnt-1.0.3/configure.ac 2006-12-16 00:37:26.000000000 +0100
@@ -22,7 +22,7 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(fonttosfnt,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fonttosfnt)
+AC_INIT(fonttosfnt,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],fonttosfnt)
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/fonttosfnt-1.0.2/fonttosfnt.man new/fonttosfnt-1.0.3/fonttosfnt.man
--- old/fonttosfnt-1.0.2/fonttosfnt.man 2006-10-12 00:13:40.000000000 +0200
+++ new/fonttosfnt-1.0.3/fonttosfnt.man 2006-11-08 15:06:01.000000000 +0100
@@ -27,8 +27,8 @@
cell fonts (terminal fonts).
.TP
.B \-b
-Write byte-aligned glyph data. By default, bit-aligned data is
-written, which yields a smaller file size.
+Write byte-aligned glyph data. By default, unaligned data is written,
+which yields a smaller file size.
.TP
.B \-r
Do not reencode fonts. By default, fonts are reencoded to Unicode
@@ -69,10 +69,9 @@
are dummy values.
.SH SEE ALSO
X(7), Xserver(1), Xft(3x).
-.I Fonts in X.
+.I Fonts in X11.
.SH AUTHOR
The version of
.B Fonttosfnt
-included in this X.Org Foundation release
-was originally written by Juliusz Chroboczek
-for the XFree86 project.
+included in this X.Org Foundation release was originally written by
+Juliusz Chroboczek for the XFree86 project.
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.Orsc1c/_old 2006-12-19 17:18:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Orsc1c/_new 2006-12-19 17:18:03.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.2/auth.c 2005-11-11 11:33:00.000000000 +0100
++++ xdm-1.1.3/auth.c 2005-11-11 11:33:00.000000000 +0100
@@ -680,7 +680,7 @@
}
++++++ xdm-1.1.2.tar.bz2 -> xdm-1.1.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/ChangeLog new/xdm-1.1.3/ChangeLog
--- old/xdm-1.1.2/ChangeLog 2006-11-30 18:53:19.000000000 +0100
+++ new/xdm-1.1.3/ChangeLog 2006-12-16 00:40:25.000000000 +0100
@@ -1,3 +1,16 @@
+commit 0128497fac0794d947fa44b433550fe064905d8d
+Author: Daniel Stone
+Date: Sat Dec 16 01:38:30 2006 +0200
+
+ xdm 1.1.3
+
+commit 3bc9148509a058647a9c43d0e2668c94ac579884
+Author: Daniel Stone
+Date: Wed Dec 6 19:01:52 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+ Make ChangeLog hook as safe as possible.
+
commit 75a8fce621adecd50db129c839a578df630137db
Author: Daniel Stone
Date: Thu Nov 30 19:49:31 2006 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/Makefile.am new/xdm-1.1.3/Makefile.am
--- old/xdm-1.1.2/Makefile.am 2006-11-08 15:36:58.000000000 +0100
+++ new/xdm-1.1.3/Makefile.am 2006-12-06 18:01:40.000000000 +0100
@@ -179,7 +179,7 @@
.PHONY: ChangeLog
ChangeLog:
- git-log > 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 old/xdm-1.1.2/Makefile.in new/xdm-1.1.3/Makefile.in
--- old/xdm-1.1.2/Makefile.in 2006-11-30 18:50:24.000000000 +0100
+++ new/xdm-1.1.3/Makefile.in 2006-12-16 00:39:07.000000000 +0100
@@ -1632,7 +1632,7 @@
.PHONY: ChangeLog
ChangeLog:
- git-log > 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
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/aclocal.m4 new/xdm-1.1.3/aclocal.m4
--- old/xdm-1.1.2/aclocal.m4 2006-11-30 18:50:09.000000000 +0100
+++ new/xdm-1.1.3/aclocal.m4 2006-12-16 00:38:58.000000000 +0100
@@ -6650,7 +6650,7 @@
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.1
+ [XORG_MACROS_version=1.1.3
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7054,7 +7054,8 @@
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -7067,6 +7068,23 @@
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\).*/\1/p'`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\).*/\2/p'`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\)\.\([[^\.]]\+\).*/\3/p'`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
@@ -7908,10 +7926,10 @@
AMDEPSHOWCMDSAT=''
AMPRETTYECHO=true
AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
+if test "x$enable_pretty_cmds" = xyes;
then
AMSHOWCMDSAT='@'
- _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@'
+ _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@'
AMPRETTYECHO=echo
AMCMDECHO=true
LT_QUIET='--quiet'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/config.h.in new/xdm-1.1.3/config.h.in
--- old/xdm-1.1.2/config.h.in 2006-11-30 18:50:18.000000000 +0100
+++ new/xdm-1.1.3/config.h.in 2006-12-16 00:39:04.000000000 +0100
@@ -135,6 +135,15 @@
/* 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
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/configure new/xdm-1.1.3/configure
--- old/xdm-1.1.2/configure 2006-11-30 18:50:18.000000000 +0100
+++ new/xdm-1.1.3/configure 2006-12-16 00:39:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for xdm 1.1.2.
+# Generated by GNU Autoconf 2.60 for xdm 1.1.3.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='xdm'
PACKAGE_TARNAME='xdm'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='xdm 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='xdm 1.1.3'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1494,7 +1494,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xdm 1.1.2 to adapt to many kinds of systems.
+\`configure' configures xdm 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1564,7 +1564,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xdm 1.1.2:";;
+ short | recursive ) echo "Configuration of xdm 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1745,7 +1745,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xdm configure 1.1.2
+xdm configure 1.1.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1759,7 +1759,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xdm $as_me 1.1.2, which was
+It was created by xdm $as_me 1.1.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2418,10 +2418,10 @@
AMDEPSHOWCMDSAT=''
AMPRETTYECHO=true
AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
+if test "x$enable_pretty_cmds" = xyes;
then
AMSHOWCMDSAT='@'
- test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@'
+ test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@'
AMPRETTYECHO=echo
AMCMDECHO=true
LT_QUIET='--quiet'
@@ -2452,7 +2452,7 @@
# Define the identity of the package.
PACKAGE='xdm'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -25797,6 +25797,29 @@
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile config/Makefile greeter/Makefile"
@@ -26274,7 +26297,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xdm $as_me 1.1.2, which was
+This file was extended by xdm $as_me 1.1.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26327,7 +26350,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xdm config.status 1.1.2
+xdm config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdm-1.1.2/configure.ac new/xdm-1.1.3/configure.ac
--- old/xdm-1.1.2/configure.ac 2006-11-30 18:49:23.000000000 +0100
+++ new/xdm-1.1.3/configure.ac 2006-12-16 00:38:24.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.2],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
+AC_INIT(xdm,[1.1.3],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org