[SCM] synfig-etl/upstream: Imported Upstream version 0.04.19
onlyjob at users.alioth.debian.org
onlyjob at users.alioth.debian.org
Tue Sep 29 08:03:23 UTC 2015
The following commit has been merged in the upstream branch:
commit d667899b4048c467c53ad9145f760fc50b5c83d3
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Tue Sep 29 18:02:33 2015 +1000
Imported Upstream version 0.04.19
diff --git a/ChangeLog b/ChangeLog
index a1eb97f..5993dd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2015-07-19 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/m4/subs.m4: ETL: Make sure to remove complex debugging options
+ (like "-grecord-gcc-switches") if debug mode is off
+
+2015-05-08 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/m4/subs.m4: Correct substitution expression for debug mode
+
+2015-05-08 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/configure.ac: Bump version of ETL
+
+2015-05-08 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/configure.ac, ETL/m4/subs.m4: Fix debug mode scripts for ETL
+ and synfig-studio
+
+2015-04-25 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/configure.ac: Release version 1.0
+
+2015-04-24 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/NEWS, ETL/configure.ac: Version 1.0 - RC5
+
+2015-04-15 Konstantin Dmitriev <ksee.zelgadis at gmail.com>
+
+ * ETL/NEWS, ETL/configure.ac: Version 1.0 - RC4
+
2015-03-27 Ivan Mahonin <bh at icystar.com>
* ETL/ETL/_stringf.h, ETL/ETL/etl_config.h: Fix slashes in filenames Conflicts: synfig-core/src/synfig/filesystemnative.cpp
diff --git a/ETL/etl_profile.h b/ETL/etl_profile.h
index baaa7bd..43e413e 100644
--- a/ETL/etl_profile.h
+++ b/ETL/etl_profile.h
@@ -98,7 +98,7 @@
#define ETL_NAME "Extended Template Library"
/* Define to the full name and version of this package. */
-#define ETL_STRING "Extended Template Library 0.04.18-RC5"
+#define ETL_STRING "Extended Template Library 0.04.19"
/* Define to the one symbol short name of this package. */
#define ETL_TARNAME "ETL"
@@ -107,7 +107,7 @@
#define ETL_URL ""
/* Define to the version of this package. */
-#define ETL_VERSION "0.04.18-RC5"
+#define ETL_VERSION "0.04.19"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
diff --git a/NEWS b/NEWS
index 8b0c3e8..d4ee8ac 100644
--- a/NEWS
+++ b/NEWS
@@ -4,10 +4,14 @@ More detailed notes are available on the releases page:
http://synfig.org/en/news/releases
+0.04.19 (git tag "1.0.1") - July 21, 2015
+
+ * Minor tweaks of build scripts.
+
0.04.18 (git tag "1.0") - April 27, 2015
* Fix compiler warnings.
- * Change handling of directory separators
+ * Change handling of directory separators.
0.04.17 (git tag "0.64.1") - November 4, 2013
diff --git a/configure b/configure
index 803d8aa..0c37d8e 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Extended Template Library 0.04.18-RC5.
+# Generated by GNU Autoconf 2.69 for Extended Template Library 0.04.19.
#
# Report bugs to <http://www.synfig.org/issues/thebuggenie/synfig>.
#
@@ -581,8 +581,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Extended Template Library'
PACKAGE_TARNAME='ETL'
-PACKAGE_VERSION='0.04.18-RC5'
-PACKAGE_STRING='Extended Template Library 0.04.18-RC5'
+PACKAGE_VERSION='0.04.19'
+PACKAGE_STRING='Extended Template Library 0.04.19'
PACKAGE_BUGREPORT='http://www.synfig.org/issues/thebuggenie/synfig'
PACKAGE_URL=''
@@ -741,8 +741,8 @@ enable_silent_rules
enable_maintainer_mode
enable_dependency_tracking
enable_warnings
-enable_debug
enable_optimization
+enable_debug
enable_profiling
'
ac_precious_vars='build_alias
@@ -1297,7 +1297,7 @@ if test "$ac_init_help" = "long"; then
# 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 Extended Template Library 0.04.18-RC5 to adapt to many kinds of systems.
+\`configure' configures Extended Template Library 0.04.19 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1368,7 +1368,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Extended Template Library 0.04.18-RC5:";;
+ short | recursive ) echo "Configuration of Extended Template Library 0.04.19:";;
esac
cat <<\_ACEOF
@@ -1387,8 +1387,8 @@ Optional Features:
speeds up one-time build
--enable-warnings=[none|minimum|maximum|hardcore]
Control compiler pickyness. [default=maximum]
- --enable-debug Build in debugging mode
--enable-optimization=[0,1,2,3,4] Select optimization level (default=2)
+ --enable-debug Build in debugging mode
--enable-profiling Enable profiling using gprof
Some influential environment variables:
@@ -1469,7 +1469,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Extended Template Library configure 0.04.18-RC5
+Extended Template Library configure 0.04.19
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1876,7 +1876,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Extended Template Library $as_me 0.04.18-RC5, which was
+It was created by Extended Template Library $as_me 0.04.19, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2854,7 +2854,7 @@ fi
# Define the identity of the package.
PACKAGE='ETL'
- VERSION='0.04.18-RC5'
+ VERSION='0.04.19'
# Some tools Automake needs.
@@ -4557,42 +4557,6 @@ $as_echo_n "checking for compiler warning flags to use... " >&6; }
$as_echo "$gtkmm_use_flags" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug flags" >&5
-$as_echo_n "checking for debug flags... " >&6; }
-
- # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
- enableval=$enable_debug;
- debug=$enableval
-
-else
-
- debug="no"
-
-fi
-
- debug_flags=''
-
- case "$debug" in
- yes)
- debug_flags="-D_DEBUG -g"
- ;;
- half)
- debug_flags="-DNDEBUG -g"
- ;;
- no|*)
- debug_flags="-DNDEBUG"
- ;;
- esac
-
-
- CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"
- CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $debug_flags" >&5
-$as_echo "$debug_flags" >&6; }
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for optimization flags" >&5
$as_echo_n "checking for optimization flags... " >&6; }
@@ -4623,6 +4587,39 @@ fi
$as_echo "$optimization_flags" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for debug flags" >&5
+$as_echo_n "checking for debug flags... " >&6; }
+
+ # Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+ enableval=$enable_debug;
+ debug=$enableval
+
+else
+
+ debug="no"
+
+fi
+
+ debug_flags=''
+
+ case "$debug" in
+ yes)
+ debug_flags="-D_DEBUG -g -O0"
+ CXXFLAGS="`echo $CXXFLAGS | sed s:-O.::` $debug_flags -fno-inline"
+ CFLAGS="`echo $CFLAGS | sed s:-O.::` $debug_flags"
+ ;;
+ no|*)
+ debug_flags="-DNDEBUG"
+ CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
+ CFLAGS="`echo $CFLAGS | sed 's:-g[a-z-]*\s::g' | sed 's:-g[a-z-]*$::'` $debug_flags"
+ ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $debug_flags" >&5
+$as_echo "$debug_flags" >&6; }
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for profiling" >&5
$as_echo_n "checking for profiling... " >&6; }
@@ -6093,7 +6090,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Extended Template Library $as_me 0.04.18-RC5, which was
+This file was extended by Extended Template Library $as_me 0.04.19, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6159,7 +6156,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Extended Template Library config.status 0.04.18-RC5
+Extended Template Library config.status 0.04.19
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index edbf4b8..06c70c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# -- I N I T --------------------------------------------------
-AC_INIT([Extended Template Library],[0.04.18-RC5],[http://www.synfig.org/issues/thebuggenie/synfig],[ETL])
+AC_INIT([Extended Template Library],[0.04.19],[http://www.synfig.org/issues/thebuggenie/synfig],[ETL])
AC_REVISION
AC_CONFIG_AUX_DIR(config)
@@ -33,8 +33,8 @@ AC_PROG_RANLIB
AC_LANG([C++])
AC_ARG_WARNINGS
-AC_ARG_DEBUG
AC_ARG_OPTIMIZATION
+AC_ARG_DEBUG
AC_ARG_PROFILING
AC_WIN32_QUIRKS
diff --git a/doxygen.cfg b/doxygen.cfg
index eb53268..c5340a1 100644
--- a/doxygen.cfg
+++ b/doxygen.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME = ETL
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.04.18-RC5
+PROJECT_NUMBER = 0.04.19
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/m4/subs.m4 b/m4/subs.m4
index f4dfcf9..7562b95 100644
--- a/m4/subs.m4
+++ b/m4/subs.m4
@@ -76,20 +76,17 @@ AC_DEFUN([AC_ARG_DEBUG],
case "$debug" in
yes)
- debug_flags="-D_DEBUG -g"
- ;;
- half)
- debug_flags="-DNDEBUG -g"
+ debug_flags="-D_DEBUG -g -O0"
+ CXXFLAGS="`echo $CXXFLAGS | sed s:-O.::` $debug_flags -fno-inline"
+ CFLAGS="`echo $CFLAGS | sed s:-O.::` $debug_flags"
;;
no|*)
debug_flags="-DNDEBUG"
+ CXXFLAGS="`echo $CXXFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
+ CFLAGS="`echo $CFLAGS | sed 's:-g[[a-z-]]*\s::g' | sed 's:-g[[a-z-]]*$::'` $debug_flags"
;;
esac
-
- CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"
- CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"
-
AC_MSG_RESULT([$debug_flags])
])
--
synfig-etl packaging
More information about the pkg-multimedia-commits
mailing list