diff -Nru eqc-1.4.14/configure eqc-1.4.14release/configure --- eqc-1.4.14/configure 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/configure 2015-06-09 19:11:52.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for eqc 1.4.13. +# Generated by GNU Autoconf 2.69 for eqc 1.4.14. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='eqc' PACKAGE_TARNAME='eqc' -PACKAGE_VERSION='1.4.13' -PACKAGE_STRING='eqc 1.4.13' +PACKAGE_VERSION='1.4.14' +PACKAGE_STRING='eqc 1.4.14' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1354,7 +1354,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 eqc 1.4.13 to adapt to many kinds of systems. +\`configure' configures eqc 1.4.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of eqc 1.4.13:";; + short | recursive ) echo "Configuration of eqc 1.4.14:";; esac cat <<\_ACEOF @@ -1550,7 +1550,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -eqc configure 1.4.13 +eqc configure 1.4.14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2003,7 +2003,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by eqc $as_me 1.4.13, which was +It was created by eqc $as_me 1.4.14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2382,7 +2382,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -ac_config_headers="$ac_config_headers config/config.h src/version.h" +ac_config_headers="$ac_config_headers config/config.h" am__api_version='1.14' @@ -2871,7 +2871,7 @@ # Define the identity of the package. PACKAGE='eqc' - VERSION='1.4.13' + VERSION='1.4.14' cat >>confdefs.h <<_ACEOF @@ -2971,7 +2971,7 @@ $as_echo "#define EQCLIB_MINOR_VERSION 4" >>confdefs.h -$as_echo "#define EQCLIB_MICRO_VERSION 13" >>confdefs.h +$as_echo "#define EQCLIB_MICRO_VERSION 14" >>confdefs.h ARCHIVE_VERSION=3 @@ -2990,7 +2990,7 @@ _ACEOF -LT_VERSION_INFO="2:0:2" +LT_VERSION_INFO="3:0:2" LT_RELEASE="1.4" @@ -17362,7 +17362,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by eqc $as_me 1.4.13, which was +This file was extended by eqc $as_me 1.4.14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17428,7 +17428,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -eqc config.status 1.4.13 +eqc config.status 1.4.14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17933,7 +17933,6 @@ do case $ac_config_target in "config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;; - "src/version.h") CONFIG_HEADERS="$CONFIG_HEADERS src/version.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; diff -Nru eqc-1.4.14/debian/bzr-builder.manifest eqc-1.4.14release/debian/bzr-builder.manifest --- eqc-1.4.14/debian/bzr-builder.manifest 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/debian/bzr-builder.manifest 2015-06-09 19:11:52.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~8 -lp:eqc revid:git-v1:eff42aab370efdf59a7206a8bbf3c75de8d0b99f +# bzr-builder format 0.3 deb-version {debupstream}-0~13 +lp:eqc revid:git-v1:826c7bbd8dc3dd6e01807bff84e02c1f6a78c2de diff -Nru eqc-1.4.14/debian/changelog eqc-1.4.14release/debian/changelog --- eqc-1.4.14/debian/changelog 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/debian/changelog 2015-06-09 19:11:52.000000000 +0000 @@ -1,10 +1,10 @@ -eqc (1.4.14-0~8~ubuntu14.10.1) utopic; urgency=low +eqc (1.4.14release-0~13~ubuntu14.10.1) utopic; urgency=low * Auto build. - -- Jan Rheinländer Tue, 09 Jun 2015 17:46:31 +0000 + -- Jan Rheinländer Tue, 09 Jun 2015 19:11:52 +0000 -eqc (1.4.14) experimental; urgency=low +eqc (1.4.14release) experimental; urgency=low * Improve evaluation of integrals by expanding expressions first to get a sum of simpler expressions * Added method to find precedence of an expression * Enabled eqc::clearall() to persist symbols across compilation runs diff -Nru eqc-1.4.14/Makefile.in eqc-1.4.14release/Makefile.in --- eqc-1.4.14/Makefile.in 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/Makefile.in 2015-06-09 19:11:52.000000000 +0000 @@ -85,8 +85,9 @@ $(top_srcdir)/config/config.h.in $(srcdir)/eqc.spec.in \ $(srcdir)/eqc.pc.in COPYING TODO config/compile \ config/config.guess config/config.rpath config/config.sub \ - config/install-sh config/missing config/ltmain.sh \ - $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \ + config/depcomp config/install-sh config/missing config/ylwrap \ + config/ltmain.sh $(top_srcdir)/config/compile \ + $(top_srcdir)/config/config.guess \ $(top_srcdir)/config/config.rpath \ $(top_srcdir)/config/config.sub \ $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \ diff -Nru eqc-1.4.14/src/Makefile eqc-1.4.14release/src/Makefile --- eqc-1.4.14/src/Makefile 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/src/Makefile 2015-06-09 19:11:52.000000000 +0000 @@ -78,8 +78,8 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -build_triplet = x86_64-pc-linux-gnu -host_triplet = x86_64-pc-linux-gnu +build_triplet = x86_64-unknown-linux-gnu +host_triplet = x86_64-unknown-linux-gnu bin_PROGRAMS = eqc$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -250,14 +250,14 @@ AUTOMAKE = ${SHELL} /home/jan/Development/Source/eqc/config/missing automake-1.14 AWK = gawk CC = gcc -CCDEPMODE = depmode=none -CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall +CCDEPMODE = depmode=gcc3 +CFLAGS = -g -O2 CPP = gcc -E -CPPFLAGS = -D_FORTIFY_SOURCE=2 +CPPFLAGS = CXX = g++ CXXCPP = g++ -E -CXXDEPMODE = depmode=none -CXXFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 CYGPATH_W = echo DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -283,7 +283,7 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s LATEX = /usr/bin/latex LD = /usr/bin/ld -m elf_x86_64 -LDFLAGS = -Wl,-Bsymbolic-functions -Wl,-z,relro +LDFLAGS = LEX = flex LEXLIB = -lfl LEX_OUTPUT_ROOT = lex.yy @@ -297,7 +297,7 @@ LTLIBASPRINTF = -lasprintf LTLIBOBJS = LT_RELEASE = 1.4 -LT_VERSION_INFO = 2:0:2 +LT_VERSION_INFO = 3:0:2 MAKEINDEX = /usr/bin/makeindex MAKEINFO = ${SHELL} /home/jan/Development/Source/eqc/config/missing makeinfo MANIFEST_TOOL = : @@ -311,10 +311,10 @@ PACKAGE = eqc PACKAGE_BUGREPORT = PACKAGE_NAME = eqc -PACKAGE_STRING = eqc 1.4.14rc2 +PACKAGE_STRING = eqc 1.4.14 PACKAGE_TARNAME = eqc PACKAGE_URL = -PACKAGE_VERSION = 1.4.14rc2 +PACKAGE_VERSION = 1.4.14 PATH_SEPARATOR = : PDFLATEX = /usr/bin/pdflatex PKG_CONFIG = /usr/bin/pkg-config @@ -325,7 +325,7 @@ SET_MAKE = SHELL = /bin/bash STRIP = strip -VERSION = 1.4.14rc2 +VERSION = 1.4.14 YACC = bison -y YFLAGS = abs_builddir = /home/jan/Development/Source/eqc/src @@ -342,41 +342,41 @@ am__tar = $${TAR-tar} chof - "$$tardir" am__untar = $${TAR-tar} xf - bindir = ${exec_prefix}/bin -build = x86_64-pc-linux-gnu -build_alias = x86_64-linux-gnu +build = x86_64-unknown-linux-gnu +build_alias = build_cpu = x86_64 build_os = linux-gnu -build_vendor = pc +build_vendor = unknown builddir = . datadir = ${datarootdir} datarootdir = ${prefix}/share docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} dvidir = ${docdir} exec_prefix = ${prefix} -host = x86_64-pc-linux-gnu +host = x86_64-unknown-linux-gnu host_alias = host_cpu = x86_64 host_os = linux-gnu -host_vendor = pc +host_vendor = unknown htmldir = ${docdir} includedir = ${prefix}/include -infodir = ${prefix}/share/info +infodir = ${datarootdir}/info install_sh = ${SHELL} /home/jan/Development/Source/eqc/config/install-sh libdir = ${exec_prefix}/lib -libexecdir = ${prefix}/lib/eqc +libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale -localstatedir = /var -mandir = ${prefix}/share/man +localstatedir = ${prefix}/var +mandir = ${datarootdir}/man mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} -prefix = /usr +prefix = /usr/local program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin sharedstatedir = ${prefix}/com srcdir = . -sysconfdir = /etc +sysconfdir = ${prefix}/etc target_alias = top_build_prefix = ../ top_builddir = .. @@ -393,7 +393,7 @@ stringex.cpp extintegral.cpp differential.cpp libeqc_HEADERS = eqc.h equation.h expression.h func.h message.h operands.h ncsymbol.h\ - unit.h printing.h utils.h optstack.h msgdriver.h version.h\ + unit.h printing.h utils.h optstack.h msgdriver.h\ stringex.h extintegral.h differential.h libeqcdir = $(includedir)/libeqc @@ -540,66 +540,66 @@ distclean-compile: -rm -f *.tab.c -#include ./$(DEPDIR)/differential.Plo -#include ./$(DEPDIR)/eqc.Plo -#include ./$(DEPDIR)/equation.Plo -#include ./$(DEPDIR)/expression.Plo -#include ./$(DEPDIR)/extintegral.Plo -#include ./$(DEPDIR)/func.Plo -#include ./$(DEPDIR)/ltxfilelex.Po -#include ./$(DEPDIR)/ltxfileparse.Po -#include ./$(DEPDIR)/main.Po -#include ./$(DEPDIR)/message.Plo -#include ./$(DEPDIR)/msgdriver.Plo -#include ./$(DEPDIR)/ncsymbol.Plo -#include ./$(DEPDIR)/operands.Plo -#include ./$(DEPDIR)/optstack.Plo -#include ./$(DEPDIR)/printing.Plo -#include ./$(DEPDIR)/stringex.Plo -#include ./$(DEPDIR)/unit.Plo -#include ./$(DEPDIR)/utils.Plo +include ./$(DEPDIR)/differential.Plo +include ./$(DEPDIR)/eqc.Plo +include ./$(DEPDIR)/equation.Plo +include ./$(DEPDIR)/expression.Plo +include ./$(DEPDIR)/extintegral.Plo +include ./$(DEPDIR)/func.Plo +include ./$(DEPDIR)/ltxfilelex.Po +include ./$(DEPDIR)/ltxfileparse.Po +include ./$(DEPDIR)/main.Po +include ./$(DEPDIR)/message.Plo +include ./$(DEPDIR)/msgdriver.Plo +include ./$(DEPDIR)/ncsymbol.Plo +include ./$(DEPDIR)/operands.Plo +include ./$(DEPDIR)/optstack.Plo +include ./$(DEPDIR)/printing.Plo +include ./$(DEPDIR)/stringex.Plo +include ./$(DEPDIR)/unit.Plo +include ./$(DEPDIR)/utils.Plo .cc.o: -# $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -# $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# $(AM_V_CXX)source='$<' object='$@' libtool=no -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) - $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $< + $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CXX)source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ +# $(AM_V_CXX_no)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -# $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -# $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# $(AM_V_CXX)source='$<' object='$@' libtool=no -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) - $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CXX)source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ +# $(AM_V_CXX_no)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -# $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -# $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# $(AM_V_CXX)source='$<' object='$@' libtool=yes -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) - $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< + $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# $(AM_V_CXX)source='$<' object='$@' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ +# $(AM_V_CXX_no)$(LTCXXCOMPILE) -c -o $@ $< .cpp.o: -# $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -# $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# $(AM_V_CXX)source='$<' object='$@' libtool=no -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) - $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ $< + $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CXX)source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ +# $(AM_V_CXX_no)$(CXXCOMPILE) -c -o $@ $< .cpp.obj: -# $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -# $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# $(AM_V_CXX)source='$<' object='$@' libtool=no -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) - $(AM_V_CXX)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# $(AM_V_CXX)source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ +# $(AM_V_CXX_no)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -# $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -# $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# $(AM_V_CXX)source='$<' object='$@' libtool=yes -# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) - $(AM_V_CXX)$(LTCXXCOMPILE) -c -o $@ $< + $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# $(AM_V_CXX)source='$<' object='$@' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \ +# $(AM_V_CXX_no)$(LTCXXCOMPILE) -c -o $@ $< .ll.cc: $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) diff -Nru eqc-1.4.14/src/Makefile.am eqc-1.4.14release/src/Makefile.am --- eqc-1.4.14/src/Makefile.am 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/src/Makefile.am 2015-06-09 19:11:52.000000000 +0000 @@ -8,7 +8,7 @@ operands.cpp unit.cpp printing.cpp utils.cpp optstack.cpp msgdriver.cpp\ stringex.cpp extintegral.cpp differential.cpp libeqc_HEADERS = eqc.h equation.h expression.h func.h message.h operands.h ncsymbol.h\ - unit.h printing.h utils.h optstack.h msgdriver.h version.h\ + unit.h printing.h utils.h optstack.h msgdriver.h\ stringex.h extintegral.h differential.h libeqcdir = $(includedir)/libeqc diff -Nru eqc-1.4.14/src/Makefile.in eqc-1.4.14release/src/Makefile.in --- eqc-1.4.14/src/Makefile.in 2015-06-09 17:46:31.000000000 +0000 +++ eqc-1.4.14release/src/Makefile.in 2015-06-09 19:11:52.000000000 +0000 @@ -393,7 +393,7 @@ stringex.cpp extintegral.cpp differential.cpp libeqc_HEADERS = eqc.h equation.h expression.h func.h message.h operands.h ncsymbol.h\ - unit.h printing.h utils.h optstack.h msgdriver.h version.h\ + unit.h printing.h utils.h optstack.h msgdriver.h\ stringex.h extintegral.h differential.h libeqcdir = $(includedir)/libeqc