[fityk] 13/45: Imported Debian patch 0.7.7-1
Stuart Prescott
stuart at debian.org
Sun Nov 6 23:35:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
stuart pushed a commit to branch master
in repository fityk.
commit 1f3d5e16d1c08d1ebbffc109edd70b3d376276d3
Merge: c34f284 199c3b3
Author: Carlo Segre <segre at debian.org>
Date: Thu Feb 15 23:46:35 2007 -0600
Imported Debian patch 0.7.7-1
3rdparty/{Makefile.in => Makefile} | 260 +-
3rdparty/Makefile.in | 10 +-
Makefile.in | 10 +-
NEWS | 15 +
TODO | 115 +-
config/Makefile.in | 10 +-
configure | 5649 +++++++++++++++++++++---------------
configure.ac | 4 +-
debian/changelog | 8 +-
debian/control | 2 +-
doc/Makefile.in | 10 +-
doc/fitykhelp.htb | Bin 125352 -> 126047 bytes
doc/fitykhelp.html | 292 +-
doc/fitykhelp.xml | 319 +-
doc/fitykhelp_img/Makefile.in | 10 +-
fityk.iss | 6 +-
fityk.spec | 2 +-
samples/Makefile.in | 10 +-
samples/SiC_Zn.fit | 27 +-
samples/nacl01.fit | 2 +-
samples/test_syntax.fit | 87 +-
src/LMfit.cpp | 4 +-
src/Makefile.in | 10 +-
src/NMfit.cpp | 34 +-
src/NMfit.h | 8 +-
src/ast.cpp | 23 +-
src/cmd.cpp | 157 +-
src/cmd2.cpp | 99 +-
src/cmd2.h | 8 +-
src/cmd3.cpp | 49 +-
src/data.cpp | 30 +-
src/data.h | 20 +-
src/datatrans.cpp | 33 +-
src/datatrans.h | 4 +-
src/datatrans2.cpp | 69 +-
src/datatrans2.h | 19 +-
src/datatrans3.cpp | 16 +-
src/datatrans4.cpp | 12 +-
src/fit.cpp | 77 +-
src/fit.h | 34 +-
src/func.h | 4 +-
src/guess.cpp | 85 +-
src/guess.h | 7 +-
src/img/Makefile.am | 3 +-
src/img/Makefile.in | 13 +-
src/img/dpsize.xpm | 20 +
src/img/shiftup.xpm | 47 +-
src/logic.cpp | 25 +-
src/logic.h | 3 +-
src/mgr.cpp | 92 +-
src/mgr.h | 9 +-
src/settings.cpp | 42 +-
src/settings.h | 8 +-
src/sum.cpp | 86 +-
src/sum.h | 9 +-
src/u_gnuplot.cpp | 77 +-
src/u_gnuplot.h | 4 +-
src/u_main.cpp | 28 +-
src/ui.cpp | 28 +-
src/ui.h | 19 +-
src/var.cpp | 18 +-
src/var.h | 4 +-
src/wx_IO.cpp | 10 +-
src/wx_common.cpp | 22 +-
src/wx_common.h | 27 +-
src/wx_dlg.cpp | 301 +-
src/wx_dlg.h | 23 +-
src/wx_fdlg.cpp | 83 +-
src/wx_fdlg.h | 11 +-
src/wx_gui.cpp | 116 +-
src/wx_gui.h | 12 +-
src/wx_mplot.cpp | 48 +-
src/wx_mplot.h | 15 +-
src/wx_pane.cpp | 175 +-
src/wx_pane.h | 24 +-
src/wx_plot.cpp | 98 +-
src/wx_plot.h | 37 +-
77 files changed, 5577 insertions(+), 3610 deletions(-)
diff --cc 3rdparty/Makefile
index 78f70c7,0000000..cdb4fc9
mode 100644,000000..100644
--- a/3rdparty/Makefile
+++ b/3rdparty/Makefile
@@@ -1,319 -1,0 +1,325 @@@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
++# 3rdparty/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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@
++
+
+# $Id: Makefile.am,v 1.4 2006/05/31 19:10:15 wojdyr Exp $
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
++srcdir = .
++top_srcdir = ..
++
++pkgdatadir = $(datadir)/fityk
++pkglibdir = $(libdir)/fityk
++pkgincludedir = $(includedir)/fityk
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
++INSTALL = /usr/bin/install -c
+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 = :
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
++build_triplet = i486-pc-linux-gnu
++host_triplet = i486-pc-linux-gnu
++target_triplet = i486-pc-linux-gnu
+subdir = 3rdparty
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/readline.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFITYK = @CFITYK@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- DOC = @DOC@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FITYK = @FITYK@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- NO_READLINE = @NO_READLINE@
- OBJEXT = @OBJEXT@
- OS_WIN32_FALSE = @OS_WIN32_FALSE@
- OS_WIN32_TRUE = @OS_WIN32_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- RC = @RC@
- READLINE_LIBS = @READLINE_LIBS@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
- WX_CFLAGS = @WX_CFLAGS@
- WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
- WX_CONFIG_PATH = @WX_CONFIG_PATH@
- WX_CPPFLAGS = @WX_CPPFLAGS@
- WX_CXXFLAGS = @WX_CXXFLAGS@
- WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
- WX_LIBS = @WX_LIBS@
- WX_LIBS_STATIC = @WX_LIBS_STATIC@
- WX_VERSION = @WX_VERSION@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_RC = @ac_ct_RC@
- ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
- am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
- am__tar = @am__tar@
- am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
- exec_prefix = @exec_prefix@
- gnuplot_in_path = @gnuplot_in_path@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target = @target@
- target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
++ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run aclocal-1.9
++AMDEP_FALSE = #
++AMDEP_TRUE =
++AMTAR = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run tar
++AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run automake-1.9
++AWK = gawk
++CC = i486-linux-gnu-gcc
++CCDEPMODE = depmode=gcc3
++CFITYK = cfityk
++CFLAGS = -g -O1
++CPP = i486-linux-gnu-gcc -E
++CPPFLAGS =
++CXX = i486-linux-gnu-g++
++CXXCPP = i486-linux-gnu-g++ -E
++CXXDEPMODE = depmode=gcc3
++CXXFLAGS = -g -O1
++CYGPATH_W = echo
++DEFS = -DHAVE_CONFIG_H
++DEPDIR = .deps
++DOC = doc
++ECHO_C =
++ECHO_N = -n
++ECHO_T =
++EGREP = /bin/grep -E
++EXEEXT =
++FITYK = fityk
++GREP = /bin/grep
++INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_PROGRAM = ${INSTALL}
++INSTALL_SCRIPT = ${INSTALL}
++INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++LDFLAGS =
++LIBOBJS =
++LIBS = -lm -lm
++LTLIBOBJS =
++MAINT = #
++MAINTAINER_MODE_FALSE =
++MAINTAINER_MODE_TRUE = #
++MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run makeinfo
++NO_READLINE =
++OBJEXT = o
++OS_WIN32_FALSE =
++OS_WIN32_TRUE = #
++PACKAGE = fityk
++PACKAGE_BUGREPORT =
++PACKAGE_NAME =
++PACKAGE_STRING =
++PACKAGE_TARNAME =
++PACKAGE_VERSION =
++PATH_SEPARATOR = :
++RC =
++READLINE_LIBS = -lreadline -ltermcap
++SET_MAKE =
++SHELL = /bin/sh
++STRIP =
++VERSION = 0.7.7
++WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
++WX_CFLAGS_ONLY =
++WX_CONFIG_PATH = /usr/bin/wx-config
++WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
++WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
++WX_CXXFLAGS_ONLY = -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA
++WX_LIBS = -pthread -lwx_gtk2u_xrc-2.6 -lwx_gtk2u_qa-2.6 -lwx_gtk2u_html-2.6 -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu_xml-2.6 -lwx_baseu_net-2.6 -lwx_baseu-2.6
++WX_LIBS_STATIC =
++WX_VERSION = 2.6.3
++ac_ct_CC =
++ac_ct_CXX =
++am__fastdepCC_FALSE = #
++am__fastdepCC_TRUE =
++am__fastdepCXX_FALSE = #
++am__fastdepCXX_TRUE =
++am__include = include
++am__leading_dot = .
++am__quote =
++am__tar = ${AMTAR} chof - "$$tardir"
++am__untar = ${AMTAR} xf -
++bindir = ${exec_prefix}/bin
++build = i486-pc-linux-gnu
++build_alias = i486-linux-gnu
++build_cpu = i486
++build_os = linux-gnu
++build_vendor = pc
++datadir = ${datarootdir}/fityk
++datarootdir = ${prefix}/share
++docdir = ${datarootdir}/doc/${PACKAGE}
++dvidir = ${docdir}
++exec_prefix = ${prefix}
++gnuplot_in_path = yes
++host = i486-pc-linux-gnu
++host_alias = i486-linux-gnu
++host_cpu = i486
++host_os = linux-gnu
++host_vendor = pc
++htmldir = ${docdir}
++includedir = ${prefix}/include
++infodir = ${prefix}/share/info
++install_sh = /home/debian/fityk/fityk-0.7.7/config/install-sh
++libdir = ${exec_prefix}/lib
++libexecdir = ${exec_prefix}/libexec
++localedir = ${datarootdir}/locale
++localstatedir = ${prefix}/var
++mandir = ${prefix}/share/man
++mkdir_p = mkdir -p --
++oldincludedir = /usr/include
++pdfdir = ${docdir}
++prefix = /usr
++program_transform_name = s,x,x,
++psdir = ${docdir}
++sbindir = ${exec_prefix}/sbin
++sharedstatedir = ${prefix}/com
++sysconfdir = ${prefix}/etc
++target = i486-pc-linux-gnu
++target_alias =
++target_cpu = i486
++target_os = linux-gnu
++target_vendor = pc
+EXTRA_DIST = README boost
+all: all-am
+
+.SUFFIXES:
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu 3rdparty/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu 3rdparty/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)
++$(top_srcdir)/configure: # $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$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
+installdirs:
+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:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_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
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+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-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
+
+# 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 --cc configure
index 82c032e,46cad82..1a28f04
--- a/configure
+++ b/configure
@@@ -340,7 -761,8 +761,8 @@@ x_libraries=NON
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
- datadir='${prefix}/share/fityk'
+ datarootdir='${prefix}/share'
-datadir='${datarootdir}'
++datadir='${datarootdir}/fityk'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
@@@ -2622,16 -3239,35 +3239,35 @@@ els
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+
fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- rm -f conftest*
- if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+ if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+ elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
++ CXXFLAGS="-g -O1"
+ else
+ CXXFLAGS="-g"
+ fi
+ else
+ if test "$GXX" = yes; then
- CXXFLAGS="-O2"
++ CXXFLAGS="-O1"
+ else
+ CXXFLAGS=
+ fi
+ fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@@ -3470,10 -4043,43 +4043,43 @@@ els
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- continue
+
fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
- CFLAGS="-g -O2"
++ CFLAGS="-g -O1"
+ else
+ CFLAGS="-g"
+ fi
+ else
+ if test "$GCC" = yes; then
- CFLAGS="-O2"
++ CFLAGS="-O1"
+ else
+ CFLAGS=
+ fi
+ fi
+ { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+ echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+ if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@@ -4525,11 -5448,11 +5448,11 @@@ f
OLD_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$srcdir/3rdparty"
+#CPPFLAGS="$CPPFLAGS -I$srcdir/3rdparty"
if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
- echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
- echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
+ echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6; }
if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
@@@ -4930,11 -5867,11 +5867,11 @@@ if test "$enable_CLI" != "no"; the
if test "x$with_readline" != "xno" ; then
gp_tcap=""
-- for termlib in ncurses curses termcap terminfo termlib; do
++ for termlib in termcap terminfo termlib; do
as_ac_Lib=`echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for tputs in -l${termlib}" >&5
- echo $ECHO_N "checking for tputs in -l${termlib}... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+ { echo "$as_me:$LINENO: checking for tputs in -l${termlib}" >&5
+ echo $ECHO_N "checking for tputs in -l${termlib}... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@@ -6343,25 -7408,25 +7408,25 @@@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$a
_ACEOF
-
-
cat >>$CONFIG_STATUS <<\_ACEOF
+
+ # Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "fityk.spec" ) CONFIG_FILES="$CONFIG_FILES fityk.spec" ;;
- "fityk.iss" ) CONFIG_FILES="$CONFIG_FILES fityk.iss" ;;
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/img/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/img/Makefile" ;;
- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "doc/fitykhelp_img/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/fitykhelp_img/Makefile" ;;
- "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
- "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
- # "3rdparty/Makefile" ) CONFIG_FILES="$CONFIG_FILES 3rdparty/Makefile" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "fityk.spec") CONFIG_FILES="$CONFIG_FILES fityk.spec" ;;
+ "fityk.iss") CONFIG_FILES="$CONFIG_FILES fityk.iss" ;;
+ "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/img/Makefile") CONFIG_FILES="$CONFIG_FILES src/img/Makefile" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "doc/fitykhelp_img/Makefile") CONFIG_FILES="$CONFIG_FILES doc/fitykhelp_img/Makefile" ;;
+ "samples/Makefile") CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
+ "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
- "3rdparty/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/Makefile" ;;
++# "3rdparty/Makefile") CONFIG_FILES="$CONFIG_FILES 3rdparty/Makefile" ;;
+
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
diff --cc debian/changelog
index 0c5f43e,0000000..c635a9a
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,93 -1,0 +1,99 @@@
++fityk (0.7.7-1) unstable; urgency=low
++
++ * New upstream release
++
++ -- Carlo Segre <segre at debian.org> Thu, 15 Feb 2007 23:46:35 -0600
++
+fityk (0.7.6-1) unstable; urgency=low
+
+ * New upstream release
+ * Force -O1 optimization for successful compilation with g++-4.1
+
+ -- Carlo Segre <segre at debian.org> Sat, 16 Sep 2006 08:32:03 -0500
+
+fityk (0.7.5-3) unstable; urgency=low
+
+ * Added Tag: field in control, experiment for Enrico Zini
+
+ -- Carlo Segre <segre at debian.org> Sat, 9 Sep 2006 00:10:06 -0500
+
+fityk (0.7.5-2) unstable; urgency=low
+
+ * Relaxed build dependency on libwxgtk2.6.
+ * Changed maintainer email to segre at debian.org
+
+ -- Carlo Segre <segre at debian.org> Wed, 2 Aug 2006 16:44:31 -0500
+
+fityk (0.7.5-1) unstable; urgency=low
+
+ * New upstream release, see /usr/share/doc/fityk/changelog.gz.
+
+ -- Carlo Segre <segre at debian.org> Wed, 2 Aug 2006 13:30:07 -0500
+
+fityk (0.7.4-2) unstable; urgency=low
+
- * Use .desktop filr from upstream instead but leave the Ubuntu-
++ * Use .desktop file from upstream instead but leave the Ubuntu-
+ contributed version as an option.
+
+ -- Carlo Segre <segre at iit.edu> Wed, 7 Jun 2006 10:27:10 -0500
+
+fityk (0.7.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Changed to Standards Version 3.7.2
+ * Added .desktop file from Phil Bull via Ubuntu maintainer
+ Emmet Hikory <emmet.hikory at gmail.com> (Thanks!)
+
+ -- Carlo Segre <segre at iit.edu> Tue, 6 Jun 2006 09:49:14 -0500
+
+fityk (0.7.3-1) unstable; urgency=low
+
+ * New upstream release (Closes: #360795)
+
+ -- Carlo Segre <segre at iit.edu> Tue, 11 Apr 2006 22:02:48 -0500
+
+fityk (0.7.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Transition to WxWidgets 2.6 (Build-Dep on libwxgtk2.6-dev)
+ * Stop using local boost headers for compilation
+
+ -- Carlo Segre <segre at iit.edu> Sun, 12 Mar 2006 00:44:52 -0600
+
+fityk (0.5.1-2) unstable; urgency=low
+
+ * Changed build dep to libreadline5-dev (Closes: #326366).
+
+ -- Carlo Segre <segre at iit.edu> Sat, 3 Sep 2005 13:05:05 -0500
+
+fityk (0.5.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Transition to g++ 4.0 (Closes: #316564).
+ * Added libboost-dev dependency and inhibit use of local version.
+
+ -- Carlo Segre <segre at iit.edu> Fri, 22 Jul 2005 07:24:17 -0500
+
+fityk (0.5.0p1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Carlo Segre <segre at iit.edu> Sun, 12 Jun 2005 00:00:31 -0500
+
+fityk (0.4.4-1) unstable; urgency=low
+
+ * New upstream release. Changes described in NEWS.
+
+ -- Carlo Segre <segre at iit.edu> Tue, 8 Mar 2005 08:37:13 -0600
+
+fityk (0.4.3p1-1) unstable; urgency=low
+
+ * New upstream release. Changes described in NEWS.
+
+ -- Carlo Segre <segre at iit.edu> Sat, 20 Nov 2004 12:11:22 -0600
+
+fityk (0.4.2-1) unstable; urgency=low
+
+ * Initial Release (Closes: #271166).
+
+ -- Carlo Segre <segre at iit.edu> Fri, 10 Sep 2004 11:23:40 -0500
diff --cc debian/control
index 443f064,0000000..6ce9fab
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,0 +1,31 @@@
+Source: fityk
+Section: science
+Priority: optional
+Maintainer: Carlo Segre <segre at debian.org>
- Build-Depends: debhelper (>> 4.0.0), libwxgtk2.6-dev (>> 2.6.0), libreadline5-dev | libreadline-dev, libboost-dev
++Build-Depends: debhelper (>> 4.0.0), libwxgtk2.6-dev (>> 2.6.0), libboost-dev, libreadline5-dev
+Standards-Version: 3.7.2
+
+Package: fityk
+Architecture: any
+Tag: field::chemistry, field::physics, implemented-in::c++, interface::x11, role::program, scope::utility, uitoolkit::wxwidgets, x11::application
+Depends: ${shlibs:Depends}
+Recommends: gnuplot
+Suggests: menu
+Description: general-purpose nonlinear curve fitting and data analysis
+ Fityk is a flexible and portable program for nonlinear fitting of analytical
+ functions (especially peak-shaped) to data (usually experimental data). In
+ other words, for nonlinear peak separation and analysis.
+ .
+ It was developed for analyzing diffraction patterns, but can be also used in
+ other fields, since concepts and operations specific for crystallography are
+ separated from the rest of the program.
+ .
+ Fityk offers various nonlinear fitting methods, subtracting background,
+ calibrating data, easy placement of peaks and changing peak parameters,
+ automation of common tasks with scripts, and much more. The main advantage
+ of the program is flexibility - parameters of peaks can be arbitrarily
+ bound to each other, eg. the width of a peak can be an independent
+ variable, can be the same as the width of another peak or can be given
+ by a complicated - common to all peaks - formula.
+ .
+ Homepage: http://www.unipress.waw.pl/fityk/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git
More information about the debian-science-commits
mailing list