Hello community, here is the log from the commit of package gnome-common for openSUSE:Factory checked in at 2013-09-27 17:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-common (Old) and /work/SRC/openSUSE:Factory/.gnome-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-common" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-common/gnome-common.changes 2013-04-02 11:45:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-common.new/gnome-common.changes 2013-09-27 17:19:05.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 23 14:58:22 UTC 2013 - dims...@opensuse.org + +- Update to version 3.10.0: + + compiler-flags: + - Add a #serial line (bgo#707475). + - Add an optional second argument for custom warnings + (bgo#707475). + + Run intltool before autoreconf so intltool.m4 is picked up by + aclocal (bgo#705365). + + gnome-autogen.sh: + - run glib-gettexize if using GLib gettext. + - Check only for autoreconf; autoconf, automake, libtool, + gettext are already checked by autoreconf. + - Do not use sed to get the AC_CONFIG_MACRO_DIR directory. + - Create m4 directory if it doesnt exits. + - Add support for automake 1.14. + + Add support for lcov 1.10. + + Other bugs fixed: bgo#699943 + +------------------------------------------------------------------- Old: ---- gnome-common-3.7.4.tar.xz New: ---- gnome-common-3.10.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-common.spec ++++++ --- /var/tmp/diff_new_pack.cEWWmP/_old 2013-09-27 17:19:05.000000000 +0200 +++ /var/tmp/diff_new_pack.cEWWmP/_new 2013-09-27 17:19:05.000000000 +0200 @@ -17,13 +17,13 @@ Name: gnome-common -Version: 3.7.4 +Version: 3.10.0 Release: 0 Summary: Common Files to Build GNOME License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org/ -Source: http://download.gnome.org/sources/gnome-common/3.7/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gnome-common/3.10/%{name}-%{version}.tar.xz BuildRequires: pkg-config Requires: autoconf Requires: automake ++++++ gnome-common-3.7.4.tar.xz -> gnome-common-3.10.0.tar.xz ++++++ ++++ 3208 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/gnome-common-3.7.4/ChangeLog new/gnome-common-3.10.0/ChangeLog --- old/gnome-common-3.7.4/ChangeLog 2013-01-14 23:52:19.000000000 +0100 +++ new/gnome-common-3.10.0/ChangeLog 2013-09-23 16:28:53.000000000 +0200 @@ -1,3 +1,154 @@ +commit daf03d618f3093b7c7ba5850fe27f9f552500a9e +Author: David King <amigad...@amigadave.com> +Date: Mon Sep 23 15:28:42 2013 +0100 + + version 3.10.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f8f5bc923239d02a5e2f5f8ee8d357eafb2bfc12 +Author: Philip Withnall <phi...@tecnocode.co.uk> +Date: Wed Sep 4 23:11:14 2013 -0600 + + compiler-flags: Add a #serial line + + As suggested in bug #707475, this will ensure the latest version of + gnome-compiler-flags.m4 is used if conflicting versions are found in + different directories in the autoconf search path. + + Helps: https://bugzilla.gnome.org/show_bug.cgi?id=707475 + + macros2/gnome-compiler-flags.m4 | 5 +++++ + 1 file changed, 5 insertions(+) + +commit c834b24651e1b0f510ede8610bde0be1e940de14 +Author: Philip Withnall <phi...@tecnocode.co.uk> +Date: Wed Sep 4 00:48:19 2013 -0600 + + compiler-flags: Add an optional second argument for custom warnings + + This allows module authors to choose to enforce stricter warnings on + a per-module basis, to avoid the situation where an outside + contributor submits a patch which introduces warnings the maintainer + has enabled locally. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=707475 + + macros2/gnome-compiler-flags.m4 | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit ac800833454ab6d38afb288773079b8ad1d5503f +Author: Seán de Búrca <leftmost...@gmail.com> +Date: Tue Aug 27 07:55:53 2013 -0600 + + Run intltool before autoreconf so intltool.m4 is picked up by aclocal. + https://bugzilla.gnome.org/show_bug.cgi?id=705365 + + macros2/gnome-autogen.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit d04839754bbbb6ffed9c4641fed801b586944820 +Author: Javier Jardón <jjar...@gnome.org> +Date: Mon Jul 22 16:22:38 2013 +0100 + + gnome-autogen.sh: run glib-gettexize if using GLib gettext + + This code was removed by error in + commit 323bbfe0989405725379cada1aa5cb361fd2999f + + macros2/gnome-autogen.sh | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 17f56a49964a3ddabf0d166326989033b7d84764 +Author: Javier Jardón <jjar...@gnome.org> +Date: Fri Jul 19 12:09:17 2013 +0100 + + gnome-autogen.sh: Check only for autoreconf + + autoconf, automake, libtool, gettext are already checked by autoreconf + + macros2/gnome-autogen.sh | 64 ++++++------------------------------------------ + 1 file changed, 7 insertions(+), 57 deletions(-) + +commit 876109c69119d8bdd434d435230a47ce9dd1fd98 +Author: Javier Jardón <jjar...@gnome.org> +Date: Fri Jul 19 12:05:50 2013 +0100 + + Rename configure.in to configure.ac + + autogen.sh | 2 +- + configure.ac | 23 +++++++++++++++++++++++ + configure.in | 23 ----------------------- + 3 files changed, 24 insertions(+), 24 deletions(-) + +commit 9739c718813dff951c4201e06e8f3e64036ed37e +Author: Javier Jardón <javier.jar...@codethink.co.uk> +Date: Thu Jul 18 17:44:27 2013 +0100 + + gnome-autogen: Do not use sed to get the AC_CONFIG_MACRO_DIR directory + + macros2/gnome-autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 47aa8189803d5f1bf60701f52795ef8735064b6c +Author: Javier Jardón <javier.jar...@codethink.co.uk> +Date: Thu Jul 18 15:09:50 2013 +0100 + + macros2/gnome-autogen.sh: Create m4 directory if it doesnt exits + + This is a automake bug fixed in automake 1.13.2 + + macros2/gnome-autogen.sh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +commit 323bbfe0989405725379cada1aa5cb361fd2999f +Author: Javier Jardón <javier.jar...@codethink.co.uk> +Date: Thu Jun 27 12:07:17 2013 +0100 + + gnome-autogen.sh: Use autoreconf + + instead autopoint/libtoolize/autoconf/automake manually + + macros2/gnome-autogen.sh | 82 +++++------------------------------------------- + 1 file changed, 7 insertions(+), 75 deletions(-) + +commit cfaa608653c47b20ea92706da573d1b19df47227 +Author: Yosef Or Boczko <yosef...@walla.com> +Date: Sun Jun 23 08:52:17 2013 +0300 + + Add support for automake 1.14 + + macros2/gnome-autogen.sh | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +commit 47e94cb99140d8a1f01182c0b52f25915bad01e2 +Author: Dan Winship <d...@gnome.org> +Date: Wed May 8 13:26:19 2013 -0400 + + code-coverage: fix conditionalization + + The "make clean" rule added by gnome-code-coverage.m4 was not + conditionalized (making it spew errors on "make clean" when built + without coverage support, since $(LCOV) expanded to ""), and the other + rules were conditionalized incorrectly (testing "ifdef + CODE_COVERAGE_ENABLED", when that variable was always set, just + sometimes to "no"). Fix both problems. + + https://bugzilla.gnome.org/show_bug.cgi?id=699943 + + macros2/gnome-code-coverage.m4 | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit ee22cb117f3b2e192dc88550ff7bff73886b382c +Author: Paolo Borelli <pbore...@gnome.org> +Date: Mon Apr 8 12:21:48 2013 +0200 + + Add support for lcov 1.10 + + macros2/gnome-code-coverage.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit 766c35359ef924ceb2288c14c2d6239fcc0618f8 Author: David King <amigad...@amigadave.com> Date: Mon Jan 14 22:51:31 2013 +0000 @@ -74,8 +225,10 @@ build: remove useless (empty or ancient) files that we don't need - README | 36 ------------------------------------ - 1 file changed, 36 deletions(-) + AUTHORS | 0 + NEWS | 0 + README | 36 ------------------------------------ + 3 files changed, 36 deletions(-) commit 4aebf8593334f64f6e77c6208f6306f1adfa6a38 Author: Raphael Kubo da Costa <rak...@freebsd.org> @@ -2270,7 +2423,8 @@ Makefile.am | 2 +- bin/.cvsignore | 3 --- stamp-h.in | 1 - - 3 files changed, 1 insertion(+), 5 deletions(-) + stamp.h.in | 0 + 4 files changed, 1 insertion(+), 5 deletions(-) commit ea9e85851445efa0135c3f8d08c3d1ea53760d91 Author: James Henstridge <jam...@src.gnome.org> @@ -2283,7 +2437,8 @@ bin/ChangeLog | 16 ---------------- bin/Makefile.am | 15 --------------- bin/gnome-autogen.sh.in | 30 ------------------------------ - 3 files changed, 61 deletions(-) + doc/Makefile.am | 0 + 4 files changed, 61 deletions(-) commit fa7ef8fd3f48c45c309a7048117fce35e7906f7f Author: James Henstridge <ja...@daa.com.au> @@ -6626,7 +6781,8 @@ svn path=/trunk/; revision=1263 - 0 files changed + doc/Makefile.am | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) commit c3738f753c42ccd88effee6261c6fcd9adf6cdef Author: Martin Baulig <mar...@src.gnome.org> @@ -14201,14 +14357,17 @@ svn path=/trunk/; revision=91 .cvsignore | 9 +++++++++ + AUTHORS | 0 ChangeLog | 7 +++++++ Makefile.am | 11 +++++++++++ + NEWS | 0 README | 2 ++ acconfig.h | 3 +++ autogen.sh | 17 +++++++++++++++++ configure.in | 36 ++++++++++++++++++++++++++++++++++++ stamp-h.in | 1 + - 8 files changed, 86 insertions(+) + stamp.h.in | 0 + 11 files changed, 86 insertions(+) commit 61e2c71aae3a1a661c4c1ddc0abbdc40029a2664 Author: Raja R Harinath <harin...@src.gnome.org> 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/gnome-common-3.7.4/autogen.sh new/gnome-common-3.10.0/autogen.sh --- old/gnome-common-3.7.4/autogen.sh 2010-10-28 10:29:33.000000000 +0200 +++ new/gnome-common-3.10.0/autogen.sh 2013-07-22 10:59:44.000000000 +0200 @@ -8,7 +8,7 @@ PKG_NAME="Gnome Common Macros" -(test -f $srcdir/configure.in \ +(test -f $srcdir/configure.ac \ ## put other tests here ) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" 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/gnome-common-3.7.4/configure.ac new/gnome-common-3.10.0/configure.ac --- old/gnome-common-3.7.4/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/gnome-common-3.10.0/configure.ac 2013-09-23 16:27:42.000000000 +0200 @@ -0,0 +1,23 @@ +AC_PREREQ(2.54) +AC_INIT([gnome-common], [3.10.0], + [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common]) + +AC_CONFIG_SRCDIR([macros2/gnome-autogen.sh]) + +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) + +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])]) + +if test -z "$enable_maintainer_mode"; then + enable_maintainer_mode=yes +fi +AM_MAINTAINER_MODE([enable]) + +AC_CONFIG_FILES([ +Makefile +macros2/Makefile +doc-build/Makefile +doc-build/gnome-doc-common +]) + +AC_OUTPUT 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/gnome-common-3.7.4/configure.in new/gnome-common-3.10.0/configure.in --- old/gnome-common-3.7.4/configure.in 2013-01-14 23:50:54.000000000 +0100 +++ new/gnome-common-3.10.0/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -AC_PREREQ(2.54) -AC_INIT([gnome-common], [3.7.4], - [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common]) - -AC_CONFIG_SRCDIR([macros2/gnome-autogen.sh]) - -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])]) - -if test -z "$enable_maintainer_mode"; then - enable_maintainer_mode=yes -fi -AM_MAINTAINER_MODE([enable]) - -AC_CONFIG_FILES([ -Makefile -macros2/Makefile -doc-build/Makefile -doc-build/gnome-doc-common -]) - -AC_OUTPUT 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/gnome-common-3.7.4/macros2/gnome-autogen.sh new/gnome-common-3.10.0/macros2/gnome-autogen.sh --- old/gnome-common-3.7.4/macros2/gnome-autogen.sh 2013-01-10 10:45:39.000000000 +0100 +++ new/gnome-common-3.10.0/macros2/gnome-autogen.sh 2013-09-03 22:32:52.000000000 +0200 @@ -6,10 +6,7 @@ test "$srcdir" || srcdir=. # default version requirements ... -test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 -test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 -test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 +test "$REQUIRED_AUTORECONF_VERSION" || REQUIRED_AUTORECONF_VERSION=2.53 test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 @@ -89,12 +86,7 @@ return 0 fi - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." + printbold "checking for $vc_package >= $vc_min_version..." for vc_checkprog in $vc_checkprogs; do echo $ECHO_N " testing $vc_checkprog... " $ECHO_C if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then @@ -115,7 +107,7 @@ fi done if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" + printerr "***Error***: You must have $vc_package >= $vc_min_version installed" printerr " to build $PKG_NAME. Download the appropriate package for" printerr " from your distribution or get the source tarball at" printerr " $vc_source" @@ -169,7 +161,7 @@ # Uses REQUIRED_M4MACROS and ACLOCAL variables. check_m4macros() { # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` + cm_macrodirs=`aclocal --print-ac-dir` # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 # but it contains only Automake's own macros, so we can ignore it. @@ -256,8 +248,6 @@ # try to catch the case where the macros2/ directory hasn't been cleared out. forbid_m4macro gnome-cxx-check.m4 -want_libtool=false -want_gettext=false want_glib_gettext=false want_intltool=false want_pkg_config=false @@ -265,12 +255,8 @@ want_gnome_doc_utils=false want_maintainer_mode=false -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"; -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` +version_check autoreconf AUTORECONF autoreconf $REQUIRED_AUTORECONF_VERSION \ + "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTORECONF_VERSION.tar.xz"; find_configure_files() { configure_ac= @@ -281,7 +267,7 @@ fi if test "x$configure_ac" != x; then echo "$configure_ac" - $AUTOCONF -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do + autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do find_configure_files "$1/$dir" done fi @@ -295,13 +281,6 @@ echo skipping $dirname -- flagged as no auto-gen continue fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then want_glib_gettext=true fi @@ -343,34 +322,6 @@ fi done -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"; -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"; - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz"; - require_m4macro gettext.m4 -fi - if $want_glib_gettext; then version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz"; @@ -426,35 +377,19 @@ printbold "Processing $configure_ac" cd $dirname - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 + # if the AC_CONFIG_MACRO_DIR() macro is used, create that directory + # This is a automake bug fixed in automake 1.13.2 + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13514 + m4dir=`autoconf --trace 'AC_CONFIG_MACRO_DIR:$1'` + if [ -n "$m4dir" ]; then + mkdir -p $m4dir fi if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi + printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." + echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 fi - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi if grep "^GTK_DOC_CHECK" $basename >/dev/null; then printbold "Running $GTKDOCIZE..." $GTKDOCIZE --copy || exit 1 @@ -469,54 +404,15 @@ $GNOME_DOC_PREPARE --force --copy || exit 1 fi - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in + if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || + grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then + printbold "Running $INTLTOOLIZE..." + $INTLTOOLIZE --force --copy --automake || exit 1 fi - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi + # Now that all the macros are sorted, run autoreconf ... + printbold "Running autoreconf..." + autoreconf --verbose --force --install -Wno-portability || exit 1 cd "$topdir" 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/gnome-common-3.7.4/macros2/gnome-code-coverage.m4 new/gnome-common-3.10.0/macros2/gnome-code-coverage.m4 --- old/gnome-common-3.7.4/macros2/gnome-code-coverage.m4 2012-11-02 15:25:12.000000000 +0100 +++ new/gnome-common-3.10.0/macros2/gnome-code-coverage.m4 2013-06-13 19:44:12.000000000 +0200 @@ -44,7 +44,7 @@ ]) # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9" + lcov_version_list="1.6 1.7 1.8 1.9 1.10" AC_CHECK_PROG([LCOV], [lcov], [lcov]) AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) @@ -120,7 +120,7 @@ # Use recursive makes in order to ignore errors during check check-code-coverage: -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) -$(MAKE) $(AM_MAKEFLAGS) -k check $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @@ -129,7 +129,7 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp @@ -142,11 +142,13 @@ # Hook rule executed before code-coverage-capture, overridable by the user code-coverage-capture-hook: +ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) -find . -name "*.gcda" -o -name "*.gcov" -delete +endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) 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/gnome-common-3.7.4/macros2/gnome-compiler-flags.m4 new/gnome-common-3.10.0/macros2/gnome-compiler-flags.m4 --- old/gnome-common-3.7.4/macros2/gnome-compiler-flags.m4 2012-11-14 09:28:07.000000000 +0100 +++ new/gnome-common-3.10.0/macros2/gnome-compiler-flags.m4 2013-09-07 05:57:28.000000000 +0200 @@ -1,7 +1,17 @@ +# gnome-compiler-flags.m4 +# +# serial 2 +# + dnl GNOME_COMPILE_WARNINGS dnl Turn on many useful compiler warnings and substitute the result into dnl WARN_CFLAGS dnl For now, only works on GCC +dnl Pass the default value of the --enable-compile-warnings configure option as +dnl the first argument to the macro, defaulting to 'yes'. +dnl Additional warning/error flags can be passed as an optional second argument. +dnl +dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) AC_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings @@ -41,6 +51,11 @@ -Werror=missing-include-dirs \ " + dnl Additional warning or error flags provided by the module author to + dnl allow stricter standards to be imposed on a per-module basis. + dnl The author can pass -W or -Werror flags here as they see fit. + additional_flags="m4_default([$2],[])" + case "$enable_compile_warnings" in no) warning_flags= @@ -49,10 +64,10 @@ warning_flags="-Wall" ;; yes) - warning_flags="$base_warn_flags $base_error_flags" + warning_flags="$base_warn_flags $base_error_flags $additional_flags" ;; maximum|error) - warning_flags="$base_warn_flags $base_error_flags" + warning_flags="$base_warn_flags $base_error_flags $additional_flags" ;; *) AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) 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/gnome-common-3.7.4/missing new/gnome-common-3.10.0/missing --- old/gnome-common-3.7.4/missing 2012-07-30 16:20:51.000000000 +0200 +++ new/gnome-common-3.10.0/missing 2013-09-23 16:27:53.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # 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 -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. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -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 - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --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' - 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 - help2man touch the output file - 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] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -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,272 +70,141 @@ ;; -*) - 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 ;; 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 - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - 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 $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 - 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 - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - 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. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -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 "$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 "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - 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 - 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 test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - 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 - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -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 "$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 $? - fi - ;; - - 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 - 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 "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... 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 - - # 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. - 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 - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
