diff -Nru gnome-common-3.14.0/aclocal.m4 gnome-common-3.18.0/aclocal.m4 --- gnome-common-3.14.0/aclocal.m4 2014-09-22 11:33:15.000000000 +0000 +++ gnome-common-3.18.0/aclocal.m4 2015-09-21 20:39:36.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -144,7 +143,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -234,8 +233,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -308,7 +307,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -337,7 +340,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -348,7 +351,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -358,7 +361,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -380,7 +383,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -415,7 +418,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +457,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -485,7 +488,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -566,7 +569,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -626,7 +629,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -654,7 +657,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -673,7 +676,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru gnome-common-3.14.0/ChangeLog gnome-common-3.18.0/ChangeLog --- gnome-common-3.14.0/ChangeLog 2014-09-22 11:33:29.000000000 +0000 +++ gnome-common-3.18.0/ChangeLog 2015-09-21 20:39:58.000000000 +0000 @@ -1,3 +1,223 @@ +commit 1df0aa160b1ce6d1e1f01085253b665fe6d0d1ef +Author: David King +Date: Mon Sep 21 21:39:19 2015 +0100 + + version 3.18.0 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1fdadd2e2f008660909d2fa23f18f6418d051805 +Author: David King +Date: Mon Sep 21 21:39:01 2015 +0100 + + Switch to using XZ-compressed tarballs + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4363223839649f4e5d01dc6d0b3e23a629ddcd8a +Author: David King +Date: Sun Jun 28 22:04:28 2015 +0100 + + build: Make autoconf-archive support optional + + As autoconf-archive installs the same ax_*.m4 macros that gnome-common + installs, which are copied from autoconf-archive into gnome-common, add + a configure argument to toggle autoconf-archive support. + + Passing --without-autoconf-archive to configure (or not providing an + argument) disables compatibility (parallel-installability) with + autoconf-archive, and installs the ax_*.m4 macros. If + --with-autoconf-archive is passed to configure, the macros are not + installed, and gnome-common will not install any M4 macros that conflict + with autoconf-archive. + + https://bugzilla.gnome.org/show_bug.cgi?id=747920 + + configure.ac | 8 ++++++++ + macros2/Makefile.am | 3 +++ + 2 files changed, 11 insertions(+) + +commit 57403addd36276aac8fc52d200177fb6366d888d +Author: David King +Date: Fri Apr 24 09:07:54 2015 +0100 + + gnome-autogen: Fix the package name tracing + + https://bugzilla.gnome.org/show_bug.cgi?id=748394 + + macros2/gnome-autogen.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2bffd7e1a94c5d96a1121ae2243c3615e1aa7766 +Author: Philip Withnall +Date: Tue Jan 27 10:18:30 2015 +0000 + + macros2: Deprecate GNOME_CXX_WARNINGS + + Just as for GNOME_COMPILE_WARNINGS, GNOME_CXX_WARNINGS has been + deprecated in favour of AX_COMPILER_FLAGS. See commit + b57bae0be3df241220b1fba3120e2f50261258e5 for details. + + https://bugzilla.gnome.org/show_bug.cgi?id=729406 + + macros2/gnome-compiler-flags.m4 | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit b57bae0be3df241220b1fba3120e2f50261258e5 +Author: Philip Withnall +Date: Fri Jan 16 11:08:32 2015 +0000 + + macros2: Deprecate GNOME_COMPILE_WARNINGS + + Use AX_COMPILER_FLAGS instead, which comes from the autoconf-archive. It + supports more compilers than just GCC, has a wider selection of flags, + supports LDFLAGS, and is maintained for more projects than just GNOME. + + GNOME_COMPILE_WARNINGS has not been ported to AX_COMPILER_FLAGS as: + • the default argument is a little difficult to map to + AX_COMPILER_FLAGS’ IS-RELEASE argument; and + • AX_COMPILER_FLAGS depends on some other macros in autoconf-archive + licenced as GPLv3, which would potentially be tricky to copy into + gnome-common. + + The --enable-iso-c argument is deprecated as well. Projects should + choose which C standard they want to use, and hard-code that in their + compiler flags. It is not something which should be set by the + developer. + + GNOME_CXX_WARNINGS is not deprecated, but may be in future. + + No further changes should be made to GNOME_COMPILE_WARNINGS: please make + them to AX_COMPILER_FLAGS instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=729407 + + macros2/gnome-compiler-flags.m4 | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit 8dd714645952ccaf99ab714e4af2c47718382b9e +Author: Marc-André Lureau +Date: Tue Dec 23 03:47:47 2014 +0100 + + gnome-autogen: warn if $srcdir is undefined + + Not setting $srcdir will lead to broken out-of-tree autogen call, so + let's ask to set it + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + macros2/gnome-autogen.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 4c8d8ad93225b468bd101760a1153243a12c4898 +Author: Marc-André Lureau +Date: Tue Dec 23 03:46:15 2014 +0100 + + gnome-autogen: warn for deprecated variables + + Well, many people still use deprecated variables for 10y, maybe + it's time to let them know. + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + macros2/gnome-autogen.sh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit 89f74f5214379ca118bcb09f8f3976d6997c42da +Author: Marc-André Lureau +Date: Tue Dec 23 03:45:10 2014 +0100 + + gnome-autogen: infer PKG_NAME from configure.ac + + Let's not repeat ourself in autogen.sh, there are already many places + with the package name. + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + README | 2 -- + macros2/gnome-autogen.sh | 4 ++-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +commit 1ced4ff7722282b809ed33cdb4a1f3c1bdc6e252 +Author: Marc-André Lureau +Date: Tue Dec 23 03:43:54 2014 +0100 + + README: remove check for automake version in example + + It's usually not required, so let's not show a bad example + + https://bugzilla.gnome.org/show_bug.cgi?id=741891 + + README | 1 - + 1 file changed, 1 deletion(-) + +commit 334bb90c5bcf96105aed8eac464bb296bf1aa9c9 +Author: Ting-Wei Lan +Date: Mon Dec 15 23:22:15 2014 +0800 + + compiler-warnings: Add -Werror=return-type + + Function return type mismatch should be considered broken, as it can cause + unexpected result or compilation error. + + https://bugzilla.gnome.org/show_bug.cgi?id=741558 + + macros2/gnome-compiler-flags.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1f60e9536dd8ac71a799d60eb128c6c928c67639 +Author: Philip Withnall +Date: Tue Aug 26 00:06:52 2014 +0100 + + macros2: Remove support for gnome-doc-utils + + Remove support for checking for the GNOME_DOC_INIT macro in configure.ac + and calling gnome-doc-prepare if found. gnome-doc-utils has not been + used in any modules we care about for a long time. + + https://bugzilla.gnome.org/show_bug.cgi?id=729931 + + macros2/gnome-autogen.sh | 15 --------------- + 1 file changed, 15 deletions(-) + +commit a912a74ba7999fe3ed49b07bab86685a5d117f82 +Author: Philip Withnall +Date: Fri May 2 16:09:43 2014 +0200 + + doc-build: Remove doc-build infrastructure + + This pertained to the old GNOME documentation infrastructure, used + before Mallard existed. This isn’t used by any modules we care about + any more. Most modules which set USE_COMMON_DOC_BUILD do so erroneously. + + https://bugzilla.gnome.org/show_bug.cgi?id=729931 + + Makefile.am | 2 +- + configure.ac | 2 - + doc-build/Makefile.am | 12 ----- + doc-build/README | 9 ---- + doc-build/gnome-doc-common.in | 49 -------------------- + doc-build/omf.make | 65 --------------------------- + doc-build/xmldocs.make | 101 ------------------------------------------ + macros2/gnome-autogen.sh | 10 ----- + 8 files changed, 1 insertion(+), 249 deletions(-) + +commit 6684e2fa5d5a4c72c9bf116f74688c0b47f350cf +Author: Philip Withnall +Date: Fri May 2 15:53:09 2014 +0200 + + macros2: Remove GNOME_COMMON_INIT + + It’s been deprecated for a while, and apparently no modules (which I + have checked out, at least) still use it. + + https://bugzilla.gnome.org/show_bug.cgi?id=735416 + + macros2/gnome-common.m4 | 20 -------------------- + 1 file changed, 20 deletions(-) + commit 5d61b55e8bea32fe2b52e21682ee4b3719b290c5 Author: David King Date: Mon Sep 22 12:32:59 2014 +0100 diff -Nru gnome-common-3.14.0/configure gnome-common-3.18.0/configure --- gnome-common-3.14.0/configure 2014-09-22 11:33:16.000000000 +0000 +++ gnome-common-3.18.0/configure 2015-09-21 20:39:37.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-common 3.14.0. +# Generated by GNU Autoconf 2.69 for gnome-common 3.18.0. # # Report bugs to . # @@ -580,14 +580,16 @@ # Identity of this package. PACKAGE_NAME='gnome-common' PACKAGE_TARNAME='gnome-common' -PACKAGE_VERSION='3.14.0' -PACKAGE_STRING='gnome-common 3.14.0' +PACKAGE_VERSION='3.18.0' +PACKAGE_STRING='gnome-common 3.18.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-common' PACKAGE_URL='' ac_unique_file="macros2/gnome-autogen.sh" ac_subst_vars='LTLIBOBJS LIBOBJS +WITH_AUTOCONF_ARCHIVE_FALSE +WITH_AUTOCONF_ARCHIVE_TRUE MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -661,6 +663,7 @@ enable_option_checking enable_silent_rules enable_maintainer_mode +with_autoconf_archive ' ac_precious_vars='build_alias host_alias @@ -1205,7 +1208,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 gnome-common 3.14.0 to adapt to many kinds of systems. +\`configure' configures gnome-common 3.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1271,7 +1274,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-common 3.14.0:";; + short | recursive ) echo "Configuration of gnome-common 3.18.0:";; esac cat <<\_ACEOF @@ -1285,6 +1288,13 @@ disable make rules and dependencies not useful (and sometimes confusing) to the casual installer +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-autoconf-archive Enable parallel-installability with + autoconf-archive, by disabling installation of its + M4 macros + Report bugs to . _ACEOF ac_status=$? @@ -1348,7 +1358,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-common configure 3.14.0 +gnome-common configure 3.18.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1365,7 +1375,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-common $as_me 3.14.0, which was +It was created by gnome-common $as_me 3.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1716,7 +1726,7 @@ -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -1917,8 +1927,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -1937,7 +1947,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2231,7 +2241,7 @@ # Define the identity of the package. PACKAGE='gnome-common' - VERSION='3.14.0' + VERSION='3.18.0' cat >>confdefs.h <<_ACEOF @@ -2265,8 +2275,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2324,6 +2334,7 @@ fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -2391,7 +2402,25 @@ -ac_config_files="$ac_config_files Makefile macros2/Makefile doc-build/Makefile doc-build/gnome-doc-common" + +# Check whether --with-autoconf-archive was given. +if test "${with_autoconf_archive+set}" = set; then : + withval=$with_autoconf_archive; +else + with_autoconf_archive=no +fi + + + if test "x$with_autoconf_archive" != "xno"; then + WITH_AUTOCONF_ARCHIVE_TRUE= + WITH_AUTOCONF_ARCHIVE_FALSE='#' +else + WITH_AUTOCONF_ARCHIVE_TRUE='#' + WITH_AUTOCONF_ARCHIVE_FALSE= +fi + + +ac_config_files="$ac_config_files Makefile macros2/Makefile" cat >confcache <<\_ACEOF @@ -2552,6 +2581,10 @@ as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WITH_AUTOCONF_ARCHIVE_TRUE}" && test -z "${WITH_AUTOCONF_ARCHIVE_FALSE}"; then + as_fn_error $? "conditional \"WITH_AUTOCONF_ARCHIVE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -2949,7 +2982,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-common $as_me 3.14.0, which was +This file was extended by gnome-common $as_me 3.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3002,7 +3035,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-common config.status 3.14.0 +gnome-common config.status 3.18.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -3117,8 +3150,6 @@ case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "macros2/Makefile") CONFIG_FILES="$CONFIG_FILES macros2/Makefile" ;; - "doc-build/Makefile") CONFIG_FILES="$CONFIG_FILES doc-build/Makefile" ;; - "doc-build/gnome-doc-common") CONFIG_FILES="$CONFIG_FILES doc-build/gnome-doc-common" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff -Nru gnome-common-3.14.0/configure.ac gnome-common-3.18.0/configure.ac --- gnome-common-3.14.0/configure.ac 2014-09-22 11:32:49.000000000 +0000 +++ gnome-common-3.18.0/configure.ac 2015-09-21 20:39:16.000000000 +0000 @@ -1,10 +1,10 @@ AC_PREREQ(2.54) -AC_INIT([gnome-common], [3.14.0], +AC_INIT([gnome-common], [3.18.0], [https://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]) +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([no])]) @@ -13,11 +13,17 @@ fi AM_MAINTAINER_MODE([enable]) +AC_ARG_WITH([autoconf-archive], + [AS_HELP_STRING([--with-autoconf-archive], + [Enable parallel-installability with autoconf-archive, by disabling installation of its M4 macros])], + [], [with_autoconf_archive=no]) + +AM_CONDITIONAL([WITH_AUTOCONF_ARCHIVE], + [test "x$with_autoconf_archive" != "xno"]) + AC_CONFIG_FILES([ Makefile macros2/Makefile -doc-build/Makefile -doc-build/gnome-doc-common ]) AC_OUTPUT diff -Nru gnome-common-3.14.0/debian/changelog gnome-common-3.18.0/debian/changelog --- gnome-common-3.14.0/debian/changelog 2015-07-09 11:46:20.000000000 +0000 +++ gnome-common-3.18.0/debian/changelog 2016-07-06 16:51:08.000000000 +0000 @@ -1,3 +1,21 @@ +gnome-common (3.18.0-2) unstable; urgency=medium + + * Upload to unstable. + * Convert from cdbs to dh. + * Remove README.Debian as it contains a lot of outdated information. + * Bump Standards-Version to 3.9.8. + + -- Michael Biebl Wed, 06 Jul 2016 18:51:07 +0200 + +gnome-common (3.18.0-1) experimental; urgency=medium + + * New upstream release. + * debian/rules: Use --with-autoconf-archive configure flag + - replaces manual removal of ax_*.m4 as done in previous version. + * Bump Standards-Version to 3.9.6 + + -- Andreas Henriksson Tue, 20 Oct 2015 18:24:32 +0200 + gnome-common (3.14.0-2) unstable; urgency=medium [ Simon McVittie ] diff -Nru gnome-common-3.14.0/debian/control gnome-common-3.18.0/debian/control --- gnome-common-3.14.0/debian/control 2015-07-09 11:48:27.000000000 +0000 +++ gnome-common-3.18.0/debian/control 2016-07-06 16:52:44.000000000 +0000 @@ -8,13 +8,12 @@ Maintainer: Debian GNOME Maintainers Uploaders: Andreas Henriksson , Gustavo Noronha Silva , Martin Pitt , Michael Biebl Build-Depends: debhelper (>= 9), - cdbs, gnome-pkg-tools Build-Depends-Indep: pkg-config, autotools-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-common -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-common +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-common Package: gnome-common Architecture: all diff -Nru gnome-common-3.14.0/debian/control.in gnome-common-3.18.0/debian/control.in --- gnome-common-3.14.0/debian/control.in 2015-07-09 11:46:12.000000000 +0000 +++ gnome-common-3.18.0/debian/control.in 2016-07-06 16:50:43.000000000 +0000 @@ -4,13 +4,12 @@ Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 9), - cdbs, gnome-pkg-tools Build-Depends-Indep: pkg-config, autotools-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-common -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-common +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-common Package: gnome-common Architecture: all diff -Nru gnome-common-3.14.0/debian/copyright gnome-common-3.18.0/debian/copyright --- gnome-common-3.14.0/debian/copyright 2012-03-15 19:10:31.000000000 +0000 +++ gnome-common-3.18.0/debian/copyright 2016-07-06 16:29:33.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gnome-common -Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-common/ +Source: https://download.gnome.org/sources/gnome-common/ Files: * Copyright: 1998-2001 Martin Baulig diff -Nru gnome-common-3.14.0/debian/docs gnome-common-3.18.0/debian/docs --- gnome-common-3.14.0/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ gnome-common-3.18.0/debian/docs 2016-07-06 16:45:22.000000000 +0000 @@ -0,0 +1 @@ +README diff -Nru gnome-common-3.14.0/debian/README.Debian gnome-common-3.18.0/debian/README.Debian --- gnome-common-3.14.0/debian/README.Debian 2012-03-15 18:35:52.000000000 +0000 +++ gnome-common-3.18.0/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -gnome-common for Debian ------------------------ - - - Using gnome-common with gettext - -gettextize and autogen.sh scripts ---------------------------------- -gettextize should NOT be run from autogen.sh scripts, if you are -doing so, you can fix it in two easy steps: - -- If it is not already there, add 'AM_GNU_GETTEXT_VERSION(x.y.z)' - to your configure.in or configure.ac, where x.y.z is the - version of gettext that your package is ready for. - -- Call 'autopoint' instead of 'gettextize' from your autogen.sh - script. - -If you don't have control over the autogen.sh script, like when -you use gnome-common, you can use the following trick to call -autopoint instead of gettextize: - - -`gnome-config --bindir`/gnome-autogen.sh - +gettextize () { autopoint --force; } - +source `gnome-config --bindir`/gnome-autogen.sh - - - The gnome-common module - -The gnome-common provides an easy way to use the GNOME autoconf macros in -applications which are developed outside of the GNOME CVS tree. Availability - -There are a couple of things installed: -/usr/share/aclocal/gnome-macros -All macros from the macros/ directory are installed here. -/usr/share/aclocal/gnome2-macros -This are the new macros from GNOME 2.0. -/usr/bin/gnome-autogen.sh -A modified version of the autogen.sh from the macros/ directory. - -If you previously had a macros/ directory in your package, you can now -remove it (when you have your package in the GNOME CVS tree, this is done in -the CVSROOT/modules file; to do this, look for a line starting with the name -of your module and remove the ¯os from it). autogen.sh - -In the autogen.sh script of your package, you use the following: -gnome-config --bindir/gnome-autogen.sh - -This calls the gnome-autogen.sh script which was installed by gnome-common. - -If you were previously using the macros/ directory, then you should find a . -macros/autogen.sh line in your autogen.sh. Simply replace it with the new -one. configure.in - -You need to place GNOME_COMMON_INIT somewhere in your configure.in. - -If you were previously using the macros/ directory, then you should find a -AM_ACLOCAL_INCLUDE(macros) line in your configure.in. Simply replace it with -GNOME_COMMON_INIT. Sample Usage - -I made a modified gnome-hello module which uses gnome-common instead of the -macros/ directory which can be found here: -ftp://ftp.home-of-linux.org/pub/gnome-common/GnomeHello-0.1.tar.gz Questions, -Comments, ... - -If you have any questions, comments or suggestions feel free to ask -(martin@home-of-linux.org). - - GNOME 2.0 - -This section is only intended for "hackers". - -You can also use the gnome-common module for GNOME 2.0 applications like -nautilus. - -To do this, you need to put USE_GNOME_2_MACROS=1 . -gnome-config --bindir/gnome-autogen.sh into your autogen.sh and remove -the hack-macros/ directory. - - -- Jan-Hendrik Palic , Fri, 17 Aug 2001 00:15:22 +0000 diff -Nru gnome-common-3.14.0/debian/rules gnome-common-3.18.0/debian/rules --- gnome-common-3.14.0/debian/rules 2015-07-09 11:46:12.000000000 +0000 +++ gnome-common-3.18.0/debian/rules 2016-07-06 16:44:28.000000000 +0000 @@ -1,12 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -common-binary-indep:: fix-duplication +%: + dh $@ --with gnome -fix-duplication: - rm -f -v debian/gnome-common/usr/share/aclocal/ax_check_enable_debug.m4 - rm -f -v debian/gnome-common/usr/share/aclocal/ax_code_coverage.m4 +override_dh_auto_configure: + dh_auto_configure -- --with-autoconf-archive diff -Nru gnome-common-3.14.0/debian/watch gnome-common-3.18.0/debian/watch --- gnome-common-3.14.0/debian/watch 2012-03-15 18:37:28.000000000 +0000 +++ gnome-common-3.18.0/debian/watch 2016-07-06 16:29:33.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -http://ftp.gnome.org/pub/GNOME/sources/gnome-common/([\d\.]+)/ \ - gnome-common-(.*)\.tar\.xz +version=4 +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz diff -Nru gnome-common-3.14.0/doc-build/gnome-doc-common.in gnome-common-3.18.0/doc-build/gnome-doc-common.in --- gnome-common-3.14.0/doc-build/gnome-doc-common.in 2013-06-13 17:44:12.000000000 +0000 +++ gnome-common-3.18.0/doc-build/gnome-doc-common.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -#!/bin/sh - -progname=`echo "$0" | sed 's%^.*/%%'` - -PROGRAM=gnome-doc-common -PACKAGE=@PACKAGE@ -VERSION=@VERSION@ - -prefix=@prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ - -# options -docdir=. -copy=no - -while test $# -gt 0; do - case "$1" in - --help) - echo "usage: $progname [--version|--help]" 1>&2 - exit 1 ;; - --version) - echo "$PROGRAM ($PACKAGE) $VERSION" - exit 0 ;; - --copy) - copy=yes - shift ;; - -*) - echo "$progname: unrecognised option '$1'" 1>&2 - echo "usage: $progname [--version|--help]" 1>&2 - exit 1 ;; - *) - echo "$progname: too many arguments" 1>&2 - echo "usage: $progname [--version|--help]" 1>&2 - exit 1 ;; - esac -done - -for file in omf.make xmldocs.make; do - rm -f $docdir/$file - if test "$copy" = yes; then - cp -f $datadir/$PACKAGE/data/$file $docdir/ || - exit 1 - else - ln -sf $datadir/$PACKAGE/data/$file $docdir/ || - cp -f $datadir/$PACKAGE/data/$file $docdir/ || - exit 1 - fi -done diff -Nru gnome-common-3.14.0/doc-build/Makefile.am gnome-common-3.18.0/doc-build/Makefile.am --- gnome-common-3.14.0/doc-build/Makefile.am 2013-06-13 17:44:12.000000000 +0000 +++ gnome-common-3.18.0/doc-build/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -bin_SCRIPTS = gnome-doc-common - -pkgdatadir = $(datadir)/gnome-common/data -pkgdata_DATA = \ - omf.make \ - xmldocs.make - -EXTRA_DIST = \ - omf.make \ - xmldocs.make \ - gnome-doc-common.in \ - README diff -Nru gnome-common-3.14.0/doc-build/Makefile.in gnome-common-3.18.0/doc-build/Makefile.in --- gnome-common-3.14.0/doc-build/Makefile.in 2014-09-22 11:33:17.000000000 +0000 +++ gnome-common-3.18.0/doc-build/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,474 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = doc-build -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/gnome-doc-common.in README -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = gnome-doc-common -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" -SCRIPTS = $(bin_SCRIPTS) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DATA = $(pkgdata_DATA) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgdatadir = $(datadir)/gnome-common/data -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -am__leading_dot = @am__leading_dot@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -bin_SCRIPTS = gnome-doc-common -pkgdata_DATA = \ - omf.make \ - xmldocs.make - -EXTRA_DIST = \ - omf.make \ - xmldocs.make \ - gnome-doc-common.in \ - README - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc-build/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign doc-build/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -gnome-doc-common: $(top_builddir)/config.status $(srcdir)/gnome-doc-common.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) -install-pkgdataDATA: $(pkgdata_DATA) - @$(NORMAL_INSTALL) - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done - -uninstall-pkgdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) -tags TAGS: - -ctags CTAGS: - -cscope cscopelist: - - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(SCRIPTS) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-pkgdataDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binSCRIPTS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ - ctags-am distclean distclean-generic distdir dvi dvi-am html \ - html-am info info-am install install-am install-binSCRIPTS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkgdataDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-binSCRIPTS uninstall-pkgdataDATA - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gnome-common-3.14.0/doc-build/omf.make gnome-common-3.18.0/doc-build/omf.make --- gnome-common-3.14.0/doc-build/omf.make 2013-06-13 17:44:12.000000000 +0000 +++ gnome-common-3.18.0/doc-build/omf.make 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -# -# No modifications of this Makefile should be necessary. -# -# This file contains the build instructions for installing OMF files. It is -# generally called from the makefiles for particular formats of documentation. -# -# Note that you must configure your package with --localstatedir=/var -# so that the scrollkeeper-update command below will update the database -# in the standard scrollkeeper directory. -# -# If it is impossible to configure with --localstatedir=/var, then -# modify the definition of scrollkeeper_localstate_dir so that -# it points to the correct location. Note that you must still use -# $(localstatedir) in this or when people build RPMs it will update -# the real database on their system instead of the one under RPM_BUILD_ROOT. -# -# Note: This make file is not incorporated into xmldocs.make because, in -# general, there will be other documents install besides XML documents -# and the makefiles for these formats should also include this file. -# -# About this file: -# This file was derived from scrollkeeper_example2, a package -# illustrating how to install documentation and OMF files for use with -# ScrollKeeper 0.3.x and 0.4.x. For more information, see: -# http://scrollkeeper.sourceforge.net/ -# Version: 0.1.3 (last updated: March 20, 2002) -# - -omf_dest_dir=$(datadir)/omf/@PACKAGE@ -scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper - -# At some point, it may be wise to change to something like this: -# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@ - -omf: omf_timestamp - -omf_timestamp: $(omffile) - -for file in $(omffile); do \ - absfile=$(srcdir)/$$file; \ - test -r $$file && absfile=$$file; \ - scrollkeeper-preinstall $(docdir)/$(docname).xml $$absfile $$file.out; \ - done; \ - touch omf_timestamp - -install-data-hook-omf: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - for file in $(omffile); do \ - absfile=$(srcdir)/$$file.out; \ - test -r $$file.out && absfile=$$file.out; \ - $(INSTALL_DATA) $$absfile $(DESTDIR)$(omf_dest_dir)/$$file; \ - done - -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) - -uninstall-local-omf: - -for file in $(omffile); do \ - basefile=`basename $$file`; \ - rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \ - done - -rmdir $(DESTDIR)$(omf_dest_dir) - -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) - -clean-local-omf: - -for file in $(omffile); do \ - rm -f $$file.out; \ - done diff -Nru gnome-common-3.14.0/doc-build/README gnome-common-3.18.0/doc-build/README --- gnome-common-3.14.0/doc-build/README 2013-06-13 17:44:12.000000000 +0000 +++ gnome-common-3.18.0/doc-build/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -To automatically include the standard user documentation build files (omf.make -and xmldocs.make) in you package, set USE_COMMON_DOC_BUILD=yes in autogen.sh -before calling the macros2/autogen.sh script. - -When porting applications across to use this feature, ensure that all of the -references to xmldocs.make are to $(top_srcdir)/xmldocs.make in the appropriate -Makefile.am files. Some modules assume that xmldocs.make is in another -directory (like docs/ or something). - diff -Nru gnome-common-3.14.0/doc-build/xmldocs.make gnome-common-3.18.0/doc-build/xmldocs.make --- gnome-common-3.14.0/doc-build/xmldocs.make 2013-06-13 17:44:12.000000000 +0000 +++ gnome-common-3.18.0/doc-build/xmldocs.make 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -# -# No modifications of this Makefile should be necessary. -# -# To use this template: -# 1) Define: figdir, docname, lang, omffile, and entities in -# your Makefile.am file for each document directory, -# although figdir, omffile, and entities may be empty -# 2) Make sure the Makefile in (1) also includes -# "include $(top_srcdir)/xmldocs.make" and -# "dist-hook: app-dist-hook". -# 3) Optionally define 'entities' to hold xml entities which -# you would also like installed -# 4) Figures must go under $(figdir)/ and be in PNG format -# 5) You should only have one document per directory -# 6) Note that the figure directory, $(figdir)/, should not have its -# own Makefile since this Makefile installs those figures. -# -# example Makefile.am: -# figdir = figures -# docname = scrollkeeper-manual -# lang = C -# omffile=scrollkeeper-manual-C.omf -# entities = fdl.xml -# include $(top_srcdir)/xmldocs.make -# dist-hook: app-dist-hook -# -# About this file: -# This file was taken from scrollkeeper_example2, a package illustrating -# how to install documentation and OMF files for use with ScrollKeeper -# 0.3.x and 0.4.x. For more information, see: -# http://scrollkeeper.sourceforge.net/ -# Version: 0.1.2 (last updated: March 20, 2002) -# - - -# ********** Begin of section some packagers may need to modify ********** -# This variable (docdir) specifies where the documents should be installed. -# This default value should work for most packages. -docdir = $(datadir)/gnome/help/$(docname)/$(lang) - -# ********** You should not have to edit below this line ********** -xml_files = $(entities) $(docname).xml - -EXTRA_DIST = $(xml_files) $(omffile) -CLEANFILES = omf_timestamp - -include $(top_srcdir)/omf.make - -all: omf - -$(docname).xml: $(entities) - -ourdir=`pwd`; \ - cd $(srcdir); \ - cp $(entities) $$ourdir - -app-dist-hook: - if test "$(figdir)"; then \ - $(mkinstalldirs) $(distdir)/$(figdir); \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \ - done \ - fi - -install-data-local: omf - $(mkinstalldirs) $(DESTDIR)$(docdir) - for file in $(xml_files); do \ - cp $(srcdir)/$$file $(DESTDIR)$(docdir); \ - done - if test "$(figdir)"; then \ - $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ - done \ - fi - -install-data-hook: install-data-hook-omf - -uninstall-local: uninstall-local-doc uninstall-local-omf - -uninstall-local-doc: - -if test "$(figdir)"; then \ - for file in $(srcdir)/$(figdir)/*.png; do \ - basefile=`echo $$file | sed -e 's,^.*/,,'`; \ - rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ - done; \ - rmdir $(DESTDIR)$(docdir)/$(figdir); \ - fi - -for file in $(xml_files); do \ - rm -f $(DESTDIR)$(docdir)/$$file; \ - done - -rmdir $(DESTDIR)$(docdir) - -clean-local: clean-local-doc clean-local-omf - -# for non-srcdir builds, remove the copied entities. -clean-local-doc: - if test $(srcdir) != .; then \ - rm -f $(entities); \ - fi diff -Nru gnome-common-3.14.0/install-sh gnome-common-3.18.0/install-sh --- gnome-common-3.14.0/install-sh 2014-09-22 11:33:17.000000000 +0000 +++ gnome-common-3.18.0/install-sh 2015-09-21 20:39:37.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru gnome-common-3.14.0/macros2/gnome-autogen.sh gnome-common-3.18.0/macros2/gnome-autogen.sh --- gnome-common-3.14.0/macros2/gnome-autogen.sh 2014-09-12 14:08:15.000000000 +0000 +++ gnome-common-3.18.0/macros2/gnome-autogen.sh 2015-04-24 08:07:08.000000000 +0000 @@ -1,10 +1,6 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - # default version requirements ... test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.11.2 test "$REQUIRED_AUTORECONF_VERSION" || REQUIRED_AUTORECONF_VERSION=2.53 @@ -12,8 +8,6 @@ test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 # a list of required m4 macros. Package can set an initial value test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= @@ -49,6 +43,30 @@ echo "$@" >&2 } +check_deprecated() { + variable=$1 + + if set | grep "^$variable=" > /dev/null; then + printerr "***Warning*** $1 is deprecated, you may remove it from autogen.sh" + fi +} + +check_deprecated REQUIRED_GNOME_DOC_UTILS_VERSION +check_deprecated REQUIRED_DOC_COMMON_VERSION +check_deprecated USE_COMMON_DOC_BUILD +check_deprecated FORBIDDEN_M4MACROS +check_deprecated GNOME2_DIR +check_deprecated GNOME2_PATH +check_deprecated USE_GNOME2_MACROS +check_deprecated PKG_NAME + +if [ -z "$srcdir" ]; then + printerr "***Warning*** \$srcdir is not defined, out of dir autogen is broken!" + srcdir=. +fi + +PKG_NAME=`autoconf --trace='AC_INIT:$1' "$srcdir/configure.ac"` + # Usage: # compare_versions MIN_VERSION ACTUAL_VERSION # returns true if ACTUAL_VERSION >= MIN_VERSION @@ -222,7 +240,6 @@ want_intltool=false want_pkg_config=false want_gtk_doc=false -want_gnome_doc_utils=false want_maintainer_mode=false version_check automake AUTOMAKE automake $REQUIRED_AUTOMAKE_VERSION \ @@ -267,9 +284,6 @@ if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then want_gtk_doc=true fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi # check that AM_MAINTAINER_MODE is used if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then @@ -327,16 +341,6 @@ require_m4macro gtk-doc.m4 fi -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - check_m4macros if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then @@ -376,15 +380,6 @@ $GTKDOCIZE --copy || exit 1 fi - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then printbold "Running $INTLTOOLIZE..." diff -Nru gnome-common-3.14.0/macros2/gnome-common.m4 gnome-common-3.18.0/macros2/gnome-common.m4 --- gnome-common-3.14.0/macros2/gnome-common.m4 2014-09-15 11:42:28.000000000 +0000 +++ gnome-common-3.18.0/macros2/gnome-common.m4 2014-10-09 13:56:16.000000000 +0000 @@ -3,26 +3,6 @@ # serial 3 # -dnl GNOME_COMMON_INIT - -AU_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) - - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi - - AC_SUBST([ACLOCAL_AMFLAGS]) -], -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" -in your top-level Makefile.am, instead, where "m4" is the macro directory set -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) - AU_DEFUN([GNOME_DEBUG_CHECK], [ AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) diff -Nru gnome-common-3.14.0/macros2/gnome-compiler-flags.m4 gnome-common-3.18.0/macros2/gnome-compiler-flags.m4 --- gnome-common-3.14.0/macros2/gnome-compiler-flags.m4 2014-09-22 11:32:01.000000000 +0000 +++ gnome-common-3.18.0/macros2/gnome-compiler-flags.m4 2015-01-27 18:59:24.000000000 +0000 @@ -1,6 +1,6 @@ # gnome-compiler-flags.m4 # -# serial 2 +# serial 4 # dnl GNOME_COMPILE_WARNINGS @@ -12,7 +12,7 @@ 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],[ +AU_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings dnl ****************************** @@ -49,6 +49,7 @@ -Werror=format-security \ -Werror=format=2 \ -Werror=missing-include-dirs \ + -Werror=return-type \ " dnl Additional warning or error flags provided by the module author to @@ -119,11 +120,14 @@ WARN_CFLAGS="$tested_warning_flags $complCFLAGS" AC_SUBST(WARN_CFLAGS) -]) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-c. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) dnl For C++, do basically the same thing. -AC_DEFUN([GNOME_CXX_WARNINGS],[ +AU_DEFUN([GNOME_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, @@ -174,4 +178,7 @@ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" AC_SUBST(WARN_CXXFLAGS) -]) +], +[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and +eliminate use of --enable-iso-cxx. +See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) diff -Nru gnome-common-3.14.0/macros2/Makefile.am gnome-common-3.18.0/macros2/Makefile.am --- gnome-common-3.14.0/macros2/Makefile.am 2014-08-29 16:28:20.000000000 +0000 +++ gnome-common-3.18.0/macros2/Makefile.am 2015-06-28 21:04:09.000000000 +0000 @@ -10,10 +10,13 @@ # these should be dropped as soon as the deprecated GNOME2_MACROS which use them # are removed. Until then, they should be kept up to date, and all changes to # them submitted upstream. +if !WITH_AUTOCONF_ARCHIVE +# Install the macros only if autoconf-archive support is disabled. AUTOCONF_ARCHIVE_MACROS = \ ax_check_enable_debug.m4 \ ax_code_coverage.m4 \ $(NULL) +endif EXTRA_DIST = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS) gnome-autogen.sh diff -Nru gnome-common-3.14.0/macros2/Makefile.in gnome-common-3.18.0/macros2/Makefile.in --- gnome-common-3.14.0/macros2/Makefile.in 2014-09-22 11:33:17.000000000 +0000 +++ gnome-common-3.18.0/macros2/Makefile.in 2015-09-21 20:39:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,11 +88,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = macros2 -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -136,6 +146,7 @@ esac DATA = $(aclocal_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -222,10 +233,11 @@ # these should be dropped as soon as the deprecated GNOME2_MACROS which use them # are removed. Until then, they should be kept up to date, and all changes to # them submitted upstream. -AUTOCONF_ARCHIVE_MACROS = \ - ax_check_enable_debug.m4 \ - ax_code_coverage.m4 \ - $(NULL) +# Install the macros only if autoconf-archive support is disabled. +@WITH_AUTOCONF_ARCHIVE_FALSE@AUTOCONF_ARCHIVE_MACROS = \ +@WITH_AUTOCONF_ARCHIVE_FALSE@ ax_check_enable_debug.m4 \ +@WITH_AUTOCONF_ARCHIVE_FALSE@ ax_code_coverage.m4 \ +@WITH_AUTOCONF_ARCHIVE_FALSE@ $(NULL) EXTRA_DIST = $(GNOME2_MACROS) $(AUTOCONF_ARCHIVE_MACROS) gnome-autogen.sh aclocaldir = $(datadir)/aclocal @@ -246,7 +258,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign macros2/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign macros2/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -474,6 +485,8 @@ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \ uninstall-aclocalDATA uninstall-am uninstall-binSCRIPTS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru gnome-common-3.14.0/Makefile.am gnome-common-3.18.0/Makefile.am --- gnome-common-3.14.0/Makefile.am 2014-08-26 10:27:54.000000000 +0000 +++ gnome-common-3.18.0/Makefile.am 2014-10-09 13:56:16.000000000 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = macros2 doc-build +SUBDIRS = macros2 EXTRA_DIST = \ autogen.sh \ diff -Nru gnome-common-3.14.0/Makefile.in gnome-common-3.18.0/Makefile.in --- gnome-common-3.14.0/Makefile.in 2014-09-22 11:33:17.000000000 +0000 +++ gnome-common-3.18.0/Makefile.in 2015-09-21 20:39:37.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,13 +86,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) COPYING \ - ChangeLog README install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -144,6 +153,8 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in COPYING ChangeLog README \ + install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -180,8 +191,8 @@ done; \ reldir="$$dir2" GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 -DIST_TARGETS = dist-bzip2 +DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -260,7 +271,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = macros2 doc-build +SUBDIRS = macros2 EXTRA_DIST = \ autogen.sh \ gnome-common.doap \ @@ -285,7 +296,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -478,6 +488,7 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -485,21 +496,20 @@ dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -535,17 +545,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -719,6 +729,8 @@ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Build ChangeLog from GIT history ChangeLog: diff -Nru gnome-common-3.14.0/missing gnome-common-3.18.0/missing --- gnome-common-3.14.0/missing 2014-09-22 11:33:17.000000000 +0000 +++ gnome-common-3.18.0/missing 2015-09-21 20:39:37.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru gnome-common-3.14.0/README gnome-common-3.18.0/README --- gnome-common-3.14.0/README 2014-05-07 16:11:50.000000000 +0000 +++ gnome-common-3.18.0/README 2015-01-05 11:52:16.000000000 +0000 @@ -13,9 +13,6 @@ srcdir=`dirname $0` [ -z "$srcdir" ] && srcdir=. -PKG_NAME=mypackage -REQUIRED_AUTOMAKE_VERSION=1.7 - if [ ! -f "$srcdir/configure.ac" ]; then echo "$srcdir doesn't look like source directory for $PKG_NAME" >&2 exit 1