Hello community,
here is the log from the commit of package daps for openSUSE:Factory checked in
at 2013-05-27 09:43:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/daps (Old)
and /work/SRC/openSUSE:Factory/.daps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "daps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/daps/daps.changes 2013-05-07
15:11:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.daps.new/daps.changes 2013-05-27
09:43:52.000000000 +0200
@@ -1,0 +2,20 @@
+Wed May 15 14:46:08 UTC 2013 - fsunderme...@opensuse.org
+
+- Bugfixes:
+ * option -m was missing when parsing the command line options
+ * allow relative paths for --statdir and --export-dir
+ * A custom static dir (--statdir) was not correctly copied/linked
+ when no --static option was specified
+ * fixed entitiy packaging in various targets
+ * made automatic setting of HTML_CSS and EPUB_CSS more robust by
+ allowing empty values when readlink fails
+
+-------------------------------------------------------------------
+Mon May 13 08:30:05 UTC 2013 - fsunderme...@opensuse.org
+
+Version 1.1.7 (Bugfix release):
+ - Critical fix: Locdrop tarballs did not have profiled but original
+ sources. This has been corrected
+ - Made check for ROOTID in lib/daps_functions more robust
+
+-------------------------------------------------------------------
@@ -4,0 +25 @@
+- Created bnc #818744 requesting an online update
Old:
----
daps-1.1.6.tar.bz2
New:
----
daps-1.1.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ daps.spec ++++++
--- /var/tmp/diff_new_pack.QECrQG/_old 2013-05-27 09:43:53.000000000 +0200
+++ /var/tmp/diff_new_pack.QECrQG/_new 2013-05-27 09:43:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: daps
-Version: 1.1.6
+Version: 1.1.7
Release: 0
###############################################################
++++++ daps-1.1.6.tar.bz2 -> daps-1.1.7.tar.bz2 ++++++
++++ 3000 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/daps/bin/daps.in new/daps/bin/daps.in
--- old/daps/bin/daps.in 2013-05-02 16:00:41.000000000 +0200
+++ new/daps/bin/daps.in 2013-05-15 10:49:27.000000000 +0200
@@ -866,7 +866,7 @@
CALL_SCMDHELP=1
fi
;;
- --main)
+ -m|--main)
# make path absolute and strip trailing slash
sanitize_path "$2" "MAIN_CMDL"
MAIN="$MAIN_CMDL"
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/daps/configure.ac new/daps/configure.ac
--- old/daps/configure.ac 2013-05-02 16:47:44.000000000 +0200
+++ new/daps/configure.ac 2013-05-13 10:28:06.000000000 +0200
@@ -19,7 +19,7 @@
m4_define(daps_version_micro, 9dev)
AC_PREREQ([2.68])
-AC_INIT([DAPS], [1.1.6], [https://sourceforge.net/p/daps/tickets/], [daps],
[http://daps.sf.net])
+AC_INIT([DAPS], [1.1.7], [https://sourceforge.net/p/daps/tickets/], [daps],
[http://daps.sf.net])
AC_CONFIG_MACRO_DIR([m4])
AC_MSG_NOTICE([
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/daps/lib/daps_functions new/daps/lib/daps_functions
--- old/daps/lib/daps_functions 2013-05-03 23:26:41.000000000 +0200
+++ new/daps/lib/daps_functions 2013-05-15 10:50:56.000000000 +0200
@@ -80,7 +80,7 @@
shift
;;
--export-dir)
- P_EXPORT_DIR="$2"
+ sanitize_path "$2" "P_EXPORT_DIR"
shift 2
;;
--extra-dict)
@@ -155,10 +155,6 @@
P_REMARKS=1
shift
;;
- --statdir)
- P_STAT_DIR="$2"
- shift 2
- ;;
--rootelement)
ROOTELEMENT="$2"
shift 2
@@ -179,6 +175,10 @@
P_SETDATE="$2"
shift 2
;;
+ --statdir)
+ sanitize_path "$2" "P_STAT_DIR"
+ shift 2
+ ;;
--subdirs)
P_SUBDIRS=1
shift
@@ -217,7 +217,7 @@
# Create the log directory and a link to the DC-file in R_DIR
# (R_DIR and LOG_DIR are set in bin/daps)
- local DC_COUNT
+ local DC_COUNT RESULT
# create directories
@@ -243,11 +243,14 @@
if [[ -n $ROOTID ]]; then
EXISTS_ROOTID=$(xsltproc --stringparam rootid $ROOTID --xinclude \
${DAPSROOT}/daps-xslt/common/check_rootid.xsl $MAIN 2>/dev/null)
- if [[ "yes" != $EXISTS_ROOTID ]]; then
+ RESULT=$?
+ if [[ 0 == $RESULT && "yes" != $EXISTS_ROOTID ]]; then
exit_on_error "Fatal: ROOTID \"$ROOTID\" does not exist"
+ elif [[ 0 != $RESULT && 2 == $VERBOSITY ]]; then
+ ccecho "warn" "Warning: Wasn't able to determine if ROOTID exist."
fi
fi
-
+
#
# The DocBook stylesheets require a 0|1 for REMARKS and COMMENTS, but
# yes|no for DRAFT
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/daps/make/common.mk new/daps/make/common.mk
--- old/daps/make/common.mk 2013-05-06 13:23:57.000000000 +0200
+++ new/daps/make/common.mk 2013-05-15 16:42:46.000000000 +0200
@@ -882,7 +882,6 @@
$(shell xsltproc --nonet --xinclude $(STYLESEARCH) \
$(PROFILE_PARENT_DIR)/dist/$(notdir $(MAIN))) \
$(notdir $(MAIN))))
-dist-xml: ENTITIES = $(shell $(LIBEXEC_DIR)/getentityname.py $(INCLUDED))
dist-xml: TARBALL = $(RESULT_DIR)/$(BOOK)$(LANGSTRING).tar
dist-xml:
ifeq ($(VERBOSITY),1)
@@ -891,7 +890,7 @@
tar chf $(TARBALL) --absolute-names \
--transform=s%$(PROFILE_PARENT_DIR)/dist%xml% $(INCLUDED)
tar rhf $(TARBALL) --absolute-names --transform=s%$(DOC_DIR)/%% \
- $(DOCCONF) $(addprefix $(DOC_DIR)/xml/,$(ENTITIES))
+ $(DOCCONF) $(ENTITIES)
bzip2 -9f $(TARBALL)
@ccecho "result" "Find the tarball at:\n$(TARBALL).bz2"
@@ -908,7 +907,6 @@
--xinclude $(STYLESEARCH) \
$(PROFILE_PARENT_DIR)/dist/$(notdir $(MAIN))) \
$(notdir $(MAIN))))
-dist-book: ENTITIES = $(shell $(LIBEXEC_DIR)/getentityname.py $(INCLUDED))
dist-book: TARBALL = $(RESULT_DIR)/$(BOOK)$(LANGSTRING).tar
dist-book:
ifeq ($(VERBOSITY),1)
@@ -917,7 +915,7 @@
tar chf $(TARBALL) --absolute-names \
--transform=s%$(PROFILE_PARENT_DIR)/dist%xml% $(INCLUDED)
tar rhf $(TARBALL) --absolute-names --transform=s%$(DOC_DIR)/%% \
- $(DOCCONF) $(addprefix $(DOC_DIR)/xml/,$(ENTITIES))
+ $(DOCCONF) $(ENTITIES)
bzip2 -9f $(TARBALL)
@ccecho "result" "Find the tarball at:\n$(TARBALL).bz2"
@@ -1235,7 +1233,6 @@
$(PROFILE_URN) $<
$(LIBEXEC_DIR)/entities-exchange.sh -d recover $@
else
-$(PROFILE_PARENT_DIR)/dist/%: $(DOC_DIR)/xml/% link-entity-noprofile
ln -sf $< $@
endif
@@ -1269,7 +1266,7 @@
endif
if test -n "$(ENTITIES)"; then \
for i in $(ENTITIES); do \
- ln -sf $(DOC_DIR)/xml/$$i $(PROFILE_PARENT_DIR)/noprofile; \
+ (cd $(PROFILE_PARENT_DIR)/noprofile && ln -sf $$i); \
done \
fi
@@ -1281,8 +1278,8 @@
endif
if test -n "$(ENTITIES)"; then \
for i in $(ENTITIES); do \
- ln -sf $(DOC_DIR)/xml/$$i $(PROFILE_PARENT_DIR)/dist/$$i; \
- ln -sf $(DOC_DIR)/xml/$$i $(TMP_DIR)/dist/xml/$$i; \
+ (cd $(PROFILE_PARENT_DIR)/dist && ln -sf $$i); \
+ (cd $(TMP_DIR)/dist/xml && ln -sf $$i); \
done \
fi
@@ -1306,7 +1303,7 @@
# echo "-----> $(LIBEXEC_DIR)/getentityname.py $(DOCFILES) "
if test -n "$(ENTITIES)"; then \
for i in $(ENTITIES); do \
- ln -sf $(DOC_DIR)/xml/$$i $(PROFILEDIR)/; \
+ (cd $(PROFILEDIR) && ln -sf $$i); \
done \
fi
ifeq ($(VERBOSITY),1)
@@ -1578,7 +1575,7 @@
IS_STATIC_DIR := $(notdir $(STYLEIMG))
ifndef HTML_CSS
ifneq ($(IS_STATIC_DIR),static)
- HTML_CSS := $(shell readlink -e $(firstword $(wildcard $(dir
$(STYLEH))*.css)))
+ HTML_CSS := $(shell readlink -e $(firstword $(wildcard $(dir
$(STYLEH))*.css)) 2>/dev/null || true)
ifeq ($(VERBOSITY),1)
HTML_CSS_INFO := No CSS file specified. Automatically
using\n$(HTML_CSS)
endif
@@ -1646,7 +1643,7 @@
tar cph --exclude-vcs -C $(dir $<) static | \
(cd $(HTML_DIR); tar xpv) >/dev/null
else
- $(HTML_GRAPH_COMMAND) $< $(HTML_DIR)/
+ $(HTML_GRAPH_COMMAND) $</* $(HTML_DIR)/static
endif
endif
ifdef HTML_CSS
@@ -1951,7 +1948,7 @@
--stringparam callout.graphics.path callouts/
ifndef EPUB_CSS
- EPUB_CSS := $(shell readlink -e $(firstword $(wildcard $(dir
$(STYLEEPUB))*.css)))
+ EPUB_CSS := $(shell readlink -e $(firstword $(wildcard $(dir
$(STYLEEPUB))*.css)) 2>/dev/null || true)
EPUB_CSS_INFO := No CSS file specified. Automatically using\n$(EPUB_CSS)
endif
@@ -2141,7 +2138,7 @@
ln -sf $< $@
if test -n "$(ENTITIES)"; then \
for i in $(ENTITIES); do \
- ln -sf $(DOC_DIR)/xml/$$i $(dir $@); \
+ (cd $(dir $@) && ln -sf $$i); \
done \
fi
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/daps/make/package.mk new/daps/make/package.mk
--- old/daps/make/package.mk 2013-04-21 17:26:41.000000000 +0200
+++ new/daps/make/package.mk 2013-05-10 00:14:13.000000000 +0200
@@ -146,14 +146,16 @@
endif
ifdef USESVN
- TO_TRANS_FILES := $(shell svn pl -v --xml $(DOCFILES) $(ENTITIES) | xsltproc
$(DAPSROOT)/daps-xslt/common/get-svn-props.xsl -)
+ TO_TRANS_FILES := $(subst $(DOC_DIR)/xml,$(PROFILEDIR),$(shell svn pl -v
--xml $(DOCFILES) | xsltproc $(DAPSROOT)/daps-xslt/common/get-svn-props.xsl -))
endif
TO_TRANS_TAR :=
$(LOCDROP_EXPORT_BOOKDIR)/translation-$(BOOK)$(LANGSTRING).tar.bz2
-NO_TRANS_FILES := $(filter-out $(TO_TRANS_FILES),$(SRCFILES) $(ENTITIES))
+NO_TRANS_FILES := $(filter-out $(TO_TRANS_FILES),$(subst
$(DOC_DIR)/xml,$(PROFILEDIR),$(SRCFILES)))
NO_TRANS_TAR := $(LOCDROP_EXPORT_BOOKDIR)/setfiles-$(BOOK)$(LANGSTRING).tar
+
+
.PHONY: locdrop
locdrop: | $(LOCDROP_EXPORT_BOOKDIR)
locdrop: $(SRCFILES) $(USED_ALL) $(PROFILES) $(PROFILEDIR)/.validate
@@ -178,10 +180,10 @@
else
# tarball with files for translation
BZIP2=--best tar chfj $(TO_TRANS_TAR) --absolute-names \
- --transform=s%$(DOC_DIR)/%% $(TO_TRANS_FILES)
+ --transform=s%$(PROFILEDIR)/%xml/% $(TO_TRANS_FILES)
# tarball with files not being translated
tar chf $(NO_TRANS_TAR) --absolute-names \
- --transform=s%$(DOC_DIR)/%% $(NO_TRANS_FILES)
+ --transform=s%$(PROFILEDIR)/%xml/% $(NO_TRANS_FILES)
tar rhf $(NO_TRANS_TAR) --absolute-names --transform=s%$(DOC_DIR)/%% \
$(DOCCONF)
ifdef DEF_FILE
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/daps/man/xml/daps-envconvert.xml new/daps/man/xml/daps-envconvert.xml
--- old/daps/man/xml/daps-envconvert.xml 2012-12-21 10:12:14.000000000
+0100
+++ new/daps/man/xml/daps-envconvert.xml 2013-05-13 10:28:06.000000000
+0200
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.5/docbookx.dtd";
[
<!ENTITY daps_command "daps">
-<!ENTITY daps_version "1.1">
+<!ENTITY daps_version "1.1.7">
<!ENTITY daps_envconvert "daps-envconvert">
]>
<refentry lang="en" id="daps_envconvert">
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/daps/man/xml/daps-init.xml new/daps/man/xml/daps-init.xml
--- old/daps/man/xml/daps-init.xml 2012-12-21 10:12:14.000000000 +0100
+++ new/daps/man/xml/daps-init.xml 2013-05-13 10:28:06.000000000 +0200
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.5/docbookx.dtd";
[
<!ENTITY daps_command "daps">
-<!ENTITY daps_version "1.1">
+<!ENTITY daps_version "1.1.7">
<!ENTITY daps_init "daps_init">
]>
<refentry lang="en" id="daps_init">
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/daps/man/xml/daps.xml new/daps/man/xml/daps.xml
--- old/daps/man/xml/daps.xml 2012-12-21 10:12:14.000000000 +0100
+++ new/daps/man/xml/daps.xml 2013-05-13 10:28:06.000000000 +0200
@@ -4,7 +4,7 @@
"http://www.docbook.org/xml/4.5/docbookx.dtd";
[
<!ENTITY daps_command "daps">
- <!ENTITY daps_version "1.1">
+ <!ENTITY daps_version "1.1.7">
]>
<refentry lang="en" id="daps">
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/daps/missing new/daps/missing
--- old/daps/missing 2013-05-02 17:28:15.000000000 +0200
+++ new/daps/missing 2013-05-13 10:28:06.000000000 +0200
@@ -1,10 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.18; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -26,7 +25,7 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
@@ -34,7 +33,7 @@
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-# In the cases where this matters, `missing' is being run in the
+# In the cases where this matters, 'missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
@@ -65,7 +64,7 @@
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.
Options:
@@ -74,21 +73,20 @@
--run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
+ 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
+ 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
help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
+ 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.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-autom...@gnu.org>."
exit $?
@@ -100,8 +98,8 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
@@ -122,22 +120,13 @@
# 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
+ # running '$TOOL --version' or '$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
@@ -149,27 +138,27 @@
case $program in
aclocal*)
echo 1>&2 "\
-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
+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*)
echo 1>&2 "\
-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
+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*)
echo 1>&2 "\
-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
+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."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
test -z "$files" && files="config.h"
@@ -186,9 +175,9 @@
automake*)
echo 1>&2 "\
-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.
+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."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
@@ -197,10 +186,10 @@
autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+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
+ You can get '$1' as part of Autoconf from any GNU
archive site."
file=`echo "$*" | sed -n "$sed_output"`
@@ -220,13 +209,13 @@
bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
+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."
+ Bison from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -250,13 +239,13 @@
lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
+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."
+ Flex from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -273,10 +262,10 @@
help2man*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. 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."
+ Help2man package in order for those modifications to take
+ effect. You can get Help2man from any GNU archive site."
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -291,12 +280,12 @@
makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
+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."
+ 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 "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
@@ -318,49 +307,14 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+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,
+ 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
- some other package would contain this missing \`$1' program."
+ some other package would contain this missing '$1' program."
exit 1
;;
esac
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
