Hello community,
here is the log from the commit of package xorg-x11-fonts for openSUSE:Factory
checked in at Thu Sep 9 16:09:56 CEST 2010.
--------
--- xorg-x11-fonts/xorg-x11-fonts.changes 2010-04-07 12:40:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-fonts/xorg-x11-fonts.changes 2010-09-05 04:28:27.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Sep 5 02:22:21 UTC 2010 - sndirsch@novell.com
+
+- font-bitstream-speedo 1.0.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2
New:
----
font-bitstream-speedo-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-fonts.spec ++++++
--- /var/tmp/diff_new_pack.STTD8W/_old 2010-09-09 16:09:15.000000000 +0200
+++ /var/tmp/diff_new_pack.STTD8W/_new 2010-09-09 16:09:15.000000000 +0200
@@ -22,7 +22,7 @@
BuildRequires: fontconfig freetype2 pkgconfig xorg-x11 xorg-x11-fonts-devel xorg-x11-libICE xorg-x11-libSM xorg-x11-libX11 xorg-x11-libXau xorg-x11-libXdmcp xorg-x11-libXext xorg-x11-libXfixes xorg-x11-libXmu xorg-x11-libXp xorg-x11-libXpm xorg-x11-libXprintUtil xorg-x11-libXrender xorg-x11-libXt xorg-x11-libXv xorg-x11-libfontenc xorg-x11-libs xorg-x11-libxkbfile xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 1
+Release: 4
License: MIT License (or similar)
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +43,7 @@
Source8: font-bh-type1-1.0.1.tar.bz2
Source9: font-bitstream-100dpi-1.0.1.tar.bz2
Source10: font-bitstream-75dpi-1.0.1.tar.bz2
-Source11: font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2
+Source11: font-bitstream-speedo-1.0.1.tar.bz2
Source12: font-bitstream-type1-1.0.1.tar.bz2
Source13: font-cronyx-cyrillic-1.0.1.tar.bz2
Source14: font-cursor-misc-1.0.1.tar.bz2
++++++ font-bitstream-speedo-X11R7.0-1.0.0.tar.bz2 -> font-bitstream-speedo-1.0.1.tar.bz2 ++++++
++++ 15305 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/font-bitstream-speedo-X11R7.0-1.0.0/autogen.sh new/font-bitstream-speedo-1.0.1/autogen.sh
--- old/font-bitstream-speedo-X11R7.0-1.0.0/autogen.sh 2005-09-28 21:49:16.000000000 +0200
+++ new/font-bitstream-speedo-1.0.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /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/font-bitstream-speedo-X11R7.0-1.0.0/ChangeLog new/font-bitstream-speedo-1.0.1/ChangeLog
--- old/font-bitstream-speedo-X11R7.0-1.0.0/ChangeLog 2005-12-15 01:24:23.000000000 +0100
+++ new/font-bitstream-speedo-1.0.1/ChangeLog 2009-10-11 03:16:30.000000000 +0200
@@ -1,27 +1,108 @@
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c7858f59cbb79f3eb2c8b2720d57913dd19ee6ff
+Author: Alan Coopersmith
+Date: Sat Oct 10 17:30:43 2009 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ font-bitstream-speedo 1.0.1
+
+ Signed-off-by: Alan Coopersmith
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b93eb2b4db7f307dda02e28baeeae758fa809895
+Author: Alan Coopersmith
+Date: Wed Oct 7 15:14:02 2009 -0700
- * configure.ac:
- Add m4 magic to allow AS_HELP_STRING to work with older versions
- of autoconf 2.57.
+ Migrate to xorg macros 1.3 & font-util 1.1 macros
+
+ Signed-off-by: Alan Coopersmith
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 609a2a67135ae1be0b86b75fea2fcb04a2acac7c
+Author: Alan Coopersmith
+Date: Tue Oct 6 19:14:27 2009 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add pointers to mailing lists, bugzilla, & git to README
+
+ Signed-off-by: Alan Coopersmith
-2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit b0b37116ede2b080957357ac15b928aafe58ca34
+Author: Paulo Cesar Pereira de Andrade
+Date: Tue Jan 27 19:11:07 2009 -0200
- * Makefile.am:
- * configure.ac:
- Add configure option to change the installed font dir.
+ Janitor: Correct make distcheck and configure.ac simplification
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 3f8e1466a142201b0e68200bc1e0d387eb2cdbd9
+Author: Julien Cristau
+Date: Sat Oct 25 21:38:40 2008 +0200
- * configure.ac:
- Update package version number for RC1 release.
+ cause configure to bail if mkfontdir is not found
+commit 73f71f7a5f87376bb07d1700b778e1309de5472f
+Author: James Cloos
+Date: Thu Dec 6 16:37:51 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit f0aed51c969e8aa82e5cd5897b88a93a1180bfc8
+Author: James Cloos
+Date: Mon Sep 3 05:53:05 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit ef4bc48a0fec14a5777f4b14f0f03ab0aa228696
+Author: James Cloos
+Date: Thu Aug 23 19:26:25 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 6ca6f5cdf6d705c7c0f261d4279c65cebdc2c644
+Author: Kevin E Martin
+Date: Thu Dec 15 00:24:23 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit edd856cf72d8a77e995fd034fbdba7ca63862194
+Author: Kevin E Martin
+Date: Sat Dec 3 17:08:52 2005 +0000
+
+ Add m4 magic to allow AS_HELP_STRING to work with older versions of
+ autoconf 2.57.
+
+commit 98ba1984a54660dab2c25b255274431de7852bf1
+Author: Kevin E Martin
+Date: Sat Dec 3 05:49:39 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 7c145337e00a982b3cacb66c2905a403a5b5c867
+Author: Eric Anholt
+Date: Tue Nov 22 02:00:19 2005 +0000
+
+ Add .cvsignores for fonts.
+
+commit f72272f3950f3c5e503a2971e7ffdbe4d34c8639
+Author: Kevin E Martin
+Date: Tue Nov 15 08:29:17 2005 +0000
+
+ Add configure option to change the installed font dir.
+
+commit 633f26575d06995a8a4fd66ebaeb59563e15ea3c
+Author: Kevin E Martin
+Date: Wed Oct 19 02:48:07 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit d52a0ae217ac47ac6b52607c5373959c5808fc90
+Author: Kevin E Martin
+Date: Wed Sep 28 19:49:16 2005 +0000
+
+ Add Ethiopic, Meltho and Speedo fonts and their build systems
+
+commit e4ce0a24995b2866bc271c5cbbbbff914bba60aa
+Author: Kaleb Keithley
+Date: Fri Nov 14 16:48:42 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 086ea4b5c2988fa97ca0c6bce32a7b850ba5f80e
+Author: Kaleb Keithley
+Date: Fri Nov 14 15:54:35 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/font-bitstream-speedo-X11R7.0-1.0.0/configure.ac new/font-bitstream-speedo-1.0.1/configure.ac
--- old/font-bitstream-speedo-X11R7.0-1.0.0/configure.ac 2005-12-15 01:24:23.000000000 +0100
+++ new/font-bitstream-speedo-1.0.1/configure.ac 2009-10-11 01:44:31.000000000 +0200
@@ -22,23 +22,24 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(font-bitstream-speedo, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-speedo)
+AC_INIT(font-bitstream-speedo, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], font-bitstream-speedo)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AC_PROG_INSTALL
-
-AC_PATH_PROG(MKFONTDIR, mkfontdir)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+AC_PROG_INSTALL
-DEFAULT_FONTDIR=${libdir}/X11/fonts/Speedo
-AC_ARG_WITH(fontdir,
- AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]),
- [FONTDIR="$withval"],
- [FONTDIR="$DEFAULT_FONTDIR"])
-AC_SUBST(FONTDIR)
+# Require X.Org's font util macros 1.1 or later
+m4_ifndef([XORG_FONT_MACROS_VERSION],
+ [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.1)
-XORG_RELEASE_VERSION
+XORG_FONTDIR([Speedo])
+XORG_FONT_SCALED_UTILS
AC_OUTPUT([Makefile])
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/font-bitstream-speedo-X11R7.0-1.0.0/Makefile.am new/font-bitstream-speedo-1.0.1/Makefile.am
--- old/font-bitstream-speedo-X11R7.0-1.0.0/Makefile.am 2005-11-15 09:29:17.000000000 +0100
+++ new/font-bitstream-speedo-1.0.1/Makefile.am 2009-10-07 03:50:39.000000000 +0200
@@ -33,7 +33,7 @@
fontdir = @FONTDIR@
font_DATA = $(FONT_FILES)
-EXTRA_DIST = $(FONT_FILES) COPYRIGHT autogen.sh
+EXTRA_DIST = $(FONT_FILES) COPYRIGHT
# Note that the fonts.scale is not generated; rather, it is copied above
install-data-hook:
@@ -42,3 +42,13 @@
distuninstallcheck:
@:
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+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/font-bitstream-speedo-X11R7.0-1.0.0/missing new/font-bitstream-speedo-1.0.1/missing
--- old/font-bitstream-speedo-X11R7.0-1.0.0/missing 2005-12-21 09:18:09.000000000 +0100
+++ new/font-bitstream-speedo-1.0.1/missing 2009-10-11 03:16:20.000000000 +0200
@@ -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=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -14,9 +18,7 @@
# GNU General Public License for more details.
# 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.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
-case "$1" in
+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 "\
@@ -67,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@
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]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+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,42 +105,69 @@
exit 1
;;
- aclocal*)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# 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). This is about non-GNU programs, so use $1 not
+# $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 $program 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."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
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."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
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."
@@ -130,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,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."
@@ -155,21 +195,16 @@
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
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."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@
fi
;;
- bison|yacc)
+ 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."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ 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."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
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."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
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)
+ 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
@@ -300,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +355,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 +366,11 @@
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-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# 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/font-bitstream-speedo-X11R7.0-1.0.0/README new/font-bitstream-speedo-1.0.1/README
--- old/font-bitstream-speedo-X11R7.0-1.0.0/README 2005-09-28 21:49:16.000000000 +0200
+++ new/font-bitstream-speedo-1.0.1/README 2009-10-07 04:14:27.000000000 +0200
@@ -0,0 +1,24 @@
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/font/bitstream-speedo
+
+ http://cgit.freedesktop.org/xorg/font/bitstream-speedo
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org