Hello community, here is the log from the commit of package c_count for openSUSE:Factory checked in at 2015-11-06 00:04:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/c_count (Old) and /work/SRC/openSUSE:Factory/.c_count.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "c_count" Changes: -------- --- /work/SRC/openSUSE:Factory/c_count/c_count.changes 2015-08-07 00:24:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.c_count.new/c_count.changes 2015-11-06 00:04:32.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 5 08:18:46 UTC 2015 - [email protected] + +- Update to 7.17 + * fix breakage in configure script from 7.16 + * updated configure macros + +------------------------------------------------------------------- Old: ---- c_count-7.16.tgz c_count-7.16.tgz.asc New: ---- c_count-7.17.tgz c_count-7.17.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ c_count.spec ++++++ --- /var/tmp/diff_new_pack.DQdViq/_old 2015-11-06 00:04:33.000000000 +0100 +++ /var/tmp/diff_new_pack.DQdViq/_new 2015-11-06 00:04:33.000000000 +0100 @@ -18,7 +18,7 @@ Name: c_count -Version: 7.16 +Version: 7.17 Release: 0 Summary: Source Code Measure Counter for C/C++/Java License: MIT @@ -43,7 +43,6 @@ autoreconf -fiv %configure \ --enable-warnings - make %{?_smp_mflags} %install ++++++ c_count-7.16.tgz -> c_count-7.17.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/CHANGES new/c_count-7.17/CHANGES --- old/c_count-7.16/CHANGES 2015-07-06 01:51:08.000000000 +0200 +++ new/c_count-7.17/CHANGES 2015-09-25 02:43:30.000000000 +0200 @@ -1,4 +1,9 @@ --- $Id: CHANGES,v 7.30 2015/07/05 23:51:08 tom Exp $ +-- $Id: CHANGES,v 7.31 2015/09/25 00:43:30 tom Exp $ + +2015/09/24 (c_count 7.17) + + fix breakage in configure script from 7.16 (report by Somchai Smythe). + + + updated configure macros 2015/07/05 (c_count 7.16) + add configure option --with-man2html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/MANIFEST new/c_count-7.17/MANIFEST --- old/c_count-7.16/MANIFEST 2015-07-06 01:52:32.000000000 +0200 +++ new/c_count-7.17/MANIFEST 2015-09-25 02:20:25.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for c_count-7.16, version v7_16 +MANIFEST for c_count-7.17, version v7_17 -------------------------------------------------------------------------------- MANIFEST this file CHANGES extracted change-log from c_count.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/aclocal.m4 new/c_count-7.17/aclocal.m4 --- old/c_count-7.16/aclocal.m4 2015-07-06 02:04:29.000000000 +0200 +++ new/c_count-7.17/aclocal.m4 2015-09-25 02:18:02.000000000 +0200 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 7.15 2015/07/06 00:04:29 tom Exp $ +dnl $Id: aclocal.m4,v 7.16 2015/09/25 00:18:02 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See also @@ -1005,7 +1005,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_MAN2HTML version: 4 updated: 2015/05/03 19:10:48 +dnl CF_WITH_MAN2HTML version: 5 updated: 2015/08/20 04:51:36 dnl ---------------- dnl Check for man2html and groff. Optionally prefer man2html over groff. dnl Generate a shell script which hides the differences between the two. @@ -1041,7 +1041,7 @@ MAN2HTML_TEMP="man2html.tmp" cat >$MAN2HTML_TEMP <<CF_EOF -#!/bin/sh +#!$SHELL # Temporary script generated by CF_WITH_MAN2HTML # Convert inputs to html, sending result to standard output. # @@ -1068,7 +1068,7 @@ MAN2HTML_NOTE="$GROFF_NOTE" MAN2HTML_PATH="$GROFF_PATH" cat >>$MAN2HTML_TEMP <<CF_EOF -/bin/sh -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" +$SHELL -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" CF_EOF else MAN2HTML_NOTE="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/configure new/c_count-7.17/configure --- old/c_count-7.16/configure 2015-07-06 02:12:11.000000000 +0200 +++ new/c_count-7.17/configure 2015-09-25 02:44:30.000000000 +0200 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 7.15 . +# From configure.in Revision: 7.16 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20141204. # @@ -4025,7 +4025,7 @@ MAN2HTML_TEMP="man2html.tmp" cat >$MAN2HTML_TEMP <<CF_EOF -#!/bin/sh +#!$SHELL # Temporary script generated by CF_WITH_MAN2HTML # Convert inputs to html, sending result to standard output. # @@ -4052,7 +4052,7 @@ MAN2HTML_NOTE="$GROFF_NOTE" MAN2HTML_PATH="$GROFF_PATH" cat >>$MAN2HTML_TEMP <<CF_EOF -/bin/sh -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" +$SHELL -c "tbl \${ROOT}.\${TYPE} | $GROFF_PATH -P -o0 -I\${ROOT}_ -Thtml -\${MACS}" CF_EOF else MAN2HTML_NOTE="" @@ -4527,6 +4527,7 @@ ### output makefile and config.h ac_config_files="$ac_config_files makefile" +ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4606,7 +4607,7 @@ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:4609: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:4610: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -4729,6 +4730,9 @@ Configuration headers: $config_headers +Configuration commands: +$config_commands + Report bugs to <[email protected]>." EOF @@ -4779,7 +4783,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:4782: error: ambiguous option: $1 + { { echo "$as_me:4786: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -4798,7 +4802,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:4801: error: unrecognized option: $1 + -*) { { echo "$as_me:4805: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -4834,8 +4838,9 @@ case "$ac_config_target" in # Handling of arguments. "makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;; + "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;; - *) { { echo "$as_me:4838: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:4843: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4848,6 +4853,7 @@ if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Create a temporary directory, and hook for its removal unless debugging. @@ -5078,7 +5084,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:5081: creating $ac_file" >&5 + { echo "$as_me:5087: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -5096,7 +5102,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5099: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5105: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5109,7 +5115,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5112: error: cannot find input file: $f" >&5 + { { echo "$as_me:5118: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5125,7 +5131,7 @@ if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:5128: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:5134: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -5134,7 +5140,7 @@ fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:5137: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:5143: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -5171,7 +5177,7 @@ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:5174: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:5180: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -5182,7 +5188,7 @@ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:5185: WARNING: Some variables may not be substituted: + { echo "$as_me:5191: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -5231,7 +5237,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:5234: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:5240: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -5242,7 +5248,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:5245: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:5251: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -5255,7 +5261,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:5258: error: cannot find input file: $f" >&5 + { { echo "$as_me:5264: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5266,99 +5272,39 @@ EOF -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -EOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -sed 's/ac_d/ac_i/g' conftest.defines >>conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +# Transform confdefs.h into a list of #define's. We won't use it as a sed +# script, but as data to insert where we see @DEFS@. We expect AC_SAVE_DEFS to +# be either 'cat' or 'sort'. +cat confdefs.h | uniq >conftest.vals + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. + rm -f conftest.tail -while grep . conftest.undefs >/dev/null +echo ' rm -f conftest.frag' >> $CONFIG_STATUS +while grep . conftest.vals >/dev/null do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs + # Write chunks of a limited-size here document to conftest.frag. + echo ' cat >> conftest.frag <<CEOF' >> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals | sed -e 's/#ifdef.*/#if 0/' >> $CONFIG_STATUS + echo 'CEOF' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals +done +rm -f conftest.vals + +# Run sed to substitute the contents of conftest.frag into $tmp/in at the +# marker @DEFS@. +echo ' cat >> conftest.edit <<CEOF +/@DEFS@/r conftest.frag +/@DEFS@/d +CEOF +sed -f conftest.edit $tmp/in > $tmp/out +rm -f $tmp/in +mv $tmp/out $tmp/in +rm -f conftest.edit conftest.frag +' >> $CONFIG_STATUS cat >>$CONFIG_STATUS <<\EOF # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -5373,7 +5319,7 @@ rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:5376: $ac_file is unchanged" >&5 + { echo "$as_me:5322: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/configure.in new/c_count-7.17/configure.in --- old/c_count-7.16/configure.in 2015-07-06 02:10:05.000000000 +0200 +++ new/c_count-7.17/configure.in 2015-09-25 02:42:38.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 7.15 2015/07/06 00:10:05 tom Exp $ -AC_REVISION($Revision: 7.15 $) +dnl $Id: configure.in,v 7.16 2015/09/25 00:42:38 tom Exp $ +AC_REVISION($Revision: 7.16 $) AC_PREREQ(2.13.20020210) AC_INIT(c_count.c) AC_CONFIG_HEADER(config.h:config.hin) @@ -36,5 +36,5 @@ fi ### output makefile and config.h -AC_OUTPUT(makefile) +AC_OUTPUT(makefile,,,cat) CF_MAKE_DOCS(c_count,1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/package/c_count.nsi new/c_count-7.17/package/c_count.nsi --- old/c_count-7.16/package/c_count.nsi 2015-07-06 01:58:02.000000000 +0200 +++ new/c_count-7.17/package/c_count.nsi 2015-09-25 02:20:01.000000000 +0200 @@ -1,10 +1,10 @@ -; $Id: c_count.nsi,v 1.4 2015/07/05 23:58:02 tom Exp $ +; $Id: c_count.nsi,v 1.5 2015/09/25 00:20:01 tom Exp $ ; Script generated with the Venis Install Wizard ; Define your application name !define APPNAME "c_count" !define VERSION_MAJOR "7" -!define VERSION_MINOR "16" +!define VERSION_MINOR "17" !define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" !define APPNAMEANDVERSION "${APPNAME} ${VERSION}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/package/c_count.spec new/c_count-7.17/package/c_count.spec --- old/c_count-7.16/package/c_count.spec 2015-07-06 01:53:04.000000000 +0200 +++ new/c_count-7.17/package/c_count.spec 2015-09-25 02:20:01.000000000 +0200 @@ -1,7 +1,7 @@ Summary: c_count - C-language line counter %define AppProgram c_count -%define AppVersion 7.16 -# $Id: c_count.spec,v 1.7 2015/07/05 23:53:04 tom Exp $ +%define AppVersion 7.17 +# $Id: c_count.spec,v 1.8 2015/09/25 00:20:01 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/package/debian/changelog new/c_count-7.17/package/debian/changelog --- old/c_count-7.16/package/debian/changelog 2015-07-06 01:53:55.000000000 +0200 +++ new/c_count-7.17/package/debian/changelog 2015-09-25 02:20:01.000000000 +0200 @@ -1,3 +1,9 @@ +ccount (7.17) unstable; urgency=low + + * configure-fixes for gcc 5.x + + -- Thomas E. Dickey <[email protected]> Thu, 24 Sep 2015 20:19:45 -0400 + ccount (7.16) unstable; urgency=low * routine packaging updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.16/patchlev.h new/c_count-7.17/patchlev.h --- old/c_count-7.16/patchlev.h 2015-07-06 01:52:53.000000000 +0200 +++ new/c_count-7.17/patchlev.h 2015-09-25 02:20:01.000000000 +0200 @@ -1,2 +1,2 @@ #define RELEASE 7 -#define PATCHLEVEL 16 +#define PATCHLEVEL 17
