[fityk] 20/45: Imported Debian patch 0.8.6-1

Stuart Prescott stuart at debian.org
Sun Nov 6 23:35:30 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 a0b68a7073683ceb52d7a0b83e738c5555c6b18d
Merge: 9428e92 1d431dd
Author: Carlo Segre <segre at debian.org>
Date:   Fri May 2 00:54:09 2008 -0500

    Imported Debian patch 0.8.6-1

 3rdparty/Makefile.in                               |   25 +-
 3rdparty/xylib/Makefile.in                         |   27 +-
 3rdparty/xylib/README                              |    5 +-
 3rdparty/xylib/web.css                             |   21 +-
 3rdparty/xylib/xylib/Makefile.in                   |   35 +-
 3rdparty/xylib/xylib/xylib.h                       |   17 +-
 Makefile.in                                        |   35 +-
 NEWS                                               |    9 +-
 TODO                                               |   99 +-
 aclocal.m4                                         |  621 +++---------
 config/Makefile.in                                 |   12 +-
 config/readline.m4                                 |   25 +-
 config/wxwin.m4                                    | 1056 ++++++++++++++++++++
 configure                                          |  845 ++++++++++++----
 configure.ac                                       |    6 +-
 debian/changelog                                   |    6 +
 doc/Makefile.in                                    |   25 +-
 doc/fitykhelp.html                                 |  258 ++---
 doc/fitykhelp.xml                                  |    2 +-
 doc/fitykhelp_img/Makefile.in                      |   12 +-
 fityk.iss                                          |    6 +-
 fityk.spec                                         |    2 +-
 macosx/macosx/.svn/all-wcprops                     |   29 -
 macosx/macosx/.svn/entries                         |   79 --
 macosx/macosx/.svn/format                          |    1 -
 macosx/macosx/.svn/prop-base/Makefile.svn-base     |    5 -
 macosx/macosx/.svn/prop-base/README.txt.svn-base   |    5 -
 macosx/macosx/.svn/prop-base/fityk.icns.svn-base   |    5 -
 .../macosx/.svn/text-base/Info.plist.in.svn-base   |   36 -
 macosx/macosx/.svn/text-base/Makefile.svn-base     |   43 -
 macosx/macosx/.svn/text-base/README.txt.svn-base   |   28 -
 macosx/macosx/.svn/text-base/fityk.icns.svn-base   |  Bin 34653 -> 0 bytes
 python/Makefile                                    |   65 +-
 python/Makefile.in                                 |   35 +-
 samples/Makefile.in                                |   12 +-
 samples/test_syntax.fit                            |    1 +
 src/LMfit.cpp                                      |    6 +-
 src/Makefile.in                                    |   35 +-
 src/cli/Makefile.in                                |   31 +-
 src/cmd2.cpp                                       |   45 +-
 src/fit.cpp                                        |   12 +-
 src/func.cpp                                       |   12 +-
 src/func.h                                         |    5 +-
 src/logic.cpp                                      |    7 +-
 src/view.cpp                                       |   55 +-
 src/view.h                                         |    6 +-
 src/wxgui/Makefile.am                              |   26 +-
 src/wxgui/Makefile.in                              |   56 +-
 src/wxgui/cmn.h                                    |    9 +-
 src/wxgui/dataedit.cpp                             |    7 +-
 src/wxgui/fancyrc.cpp                              |   53 +-
 src/wxgui/fancyrc.h                                |    6 +-
 src/wxgui/frame.cpp                                |   69 +-
 src/wxgui/frame.h                                  |    7 +-
 src/wxgui/img/Makefile.am                          |    3 +-
 src/wxgui/img/Makefile.in                          |   15 +-
 src/wxgui/img/info16.h                             |   40 +
 src/wxgui/img/xyconvert.ico                        |  Bin 9974 -> 14254 bytes
 src/wxgui/inputline.cpp                            |    4 +-
 src/wxgui/mplot.cpp                                |   21 +-
 src/wxgui/mplot.h                                  |    4 +-
 src/wxgui/pane.cpp                                 |    9 +-
 src/wxgui/plot.cpp                                 |    6 +-
 src/wxgui/plot.h                                   |    4 +-
 src/wxgui/print.cpp                                |    7 +-
 src/wxgui/sidebar.cpp                              |   80 +-
 src/wxgui/sidebar.h                                |    7 +-
 src/wxgui/xybrowser.cpp                            |   33 +-
 68 files changed, 2779 insertions(+), 1394 deletions(-)

diff --cc debian/changelog
index a5e4094,0000000..6abe15c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,149 -1,0 +1,155 @@@
++fityk (0.8.6-1) unstable; urgency=low
++
++  * New upstream release
++
++ -- Carlo Segre <segre at debian.org>  Fri, 02 May 2008 00:54:09 -0500
++
 +fityk (0.8.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Reenable 3rdparty usage in build (this means using the included Boost
 +    libraries and removing the Build-Depends on them).
 +
 + -- Carlo Segre <segre at debian.org>  Sun, 30 Mar 2008 11:31:03 -0500
 +
 +fityk (0.8.2-2) unstable; urgency=low
 +
 +  * Acknowledge NMU (Closes: #455180)
 +  * Upgrade to Standards-Version 3.7.3 (no changes)
 +  * Move Homepage from description to debian/control header
 +
 + -- Carlo Segre <segre at debian.org>  Sat, 22 Mar 2008 11:29:16 -0500
 +
 +fityk (0.8.2-1.1) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Fix gcc-4.3 FTBFS, patch by Cyril Brulebois
 +    <cyril.brulebois at enst-bretagne.fr>. (Closes: #455180)
 +
 + -- Marc 'HE' Brockschmidt <he at debian.org>  Sun, 16 Mar 2008 17:26:13 +0100
 +
 +fityk (0.8.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Restored optimization
 +  * Use static libraries for now
 +  * Don't compile python wrapper yet
 +
 + -- Carlo Segre <segre at debian.org>  Thu, 23 Aug 2007 00:20:21 -0500
 +
 +fityk (0.7.8-2) unstable; urgency=low
 +
 +  * Added declarations to src/numfuncs.h to allow compilation
 +    by g++4.3 (Closes:  #417192)
 +  * Don't ignore clean errors
 +  * Compatibility level 5
 +  * Comply with menu and desktop policy
 +
 + -- Carlo Segre <segre at debian.org>  Sat, 18 Aug 2007 11:08:05 -0500
 +
 +fityk (0.7.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Restored -O2 compiler flags - upstream has fixed g++-4.1 compile
 +
 + -- Carlo Segre <segre at debian.org>  Wed,  7 Mar 2007 18:58:33 -0600
 +
 +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 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 python/Makefile
index 12c4eaa,0000000..d7cd241
mode 100644,000000..100644
--- a/python/Makefile
+++ b/python/Makefile
@@@ -1,566 -1,0 +1,571 @@@
- # Makefile.in generated by automake 1.10 from Makefile.am.
++# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# python/Makefile.  Generated from Makefile.in by configure.
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- # 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  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.
 +
 +
 +
 +
 +pkgdatadir = $(datadir)/fityk
 +pkglibdir = $(libdir)/fityk
 +pkgincludedir = $(includedir)/fityk
 +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 = :
 +build_triplet = i486-pc-linux-gnu
 +host_triplet = i486-pc-linux-gnu
 +target_triplet = i486-pc-linux-gnu
 +subdir = python
 +DIST_COMMON = $(python_PYTHON) $(srcdir)/Makefile.am \
 +	$(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/config/ac_pkg_swig.m4 \
 +	$(top_srcdir)/config/ac_python_devel.m4 \
- 	$(top_srcdir)/config/readline.m4 $(top_srcdir)/configure.ac
++	$(top_srcdir)/config/readline.m4 $(top_srcdir)/config/wxwin.m4 \
++	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_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 = `echo $$p | sed -e 's|^.*/||'`;
 +am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"
 +pyexecLTLIBRARIES_INSTALL = $(INSTALL)
 +LTLIBRARIES = $(pyexec_LTLIBRARIES)
 +_fityk_la_DEPENDENCIES = ../src/libfityk.la
 +am__objects_1 =
 +am__fityk_la_OBJECTS = _fityk_la-fityk_wrap.lo $(am__objects_1)
 +_fityk_la_OBJECTS = $(am__fityk_la_OBJECTS)
 +_fityk_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(_fityk_la_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I. -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +	$(LDFLAGS) -o $@
 +SOURCES = $(_fityk_la_SOURCES)
 +DIST_SOURCES = $(_fityk_la_SOURCES)
 +pythonPYTHON_INSTALL = $(INSTALL_DATA)
 +py_compile = $(top_srcdir)/config/py-compile
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run aclocal-1.10
- AMTAR = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run tar
++ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.8.6/config/missing --run aclocal-1.10
++AMTAR = ${SHELL} /home/debian/fityk/fityk-0.8.6/config/missing --run tar
 +AR = ar
- AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run autoconf
- AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run autoheader
- AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run automake-1.10
++AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.8.6/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.8.6/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.8.6/config/missing --run automake-1.10
 +AWK = gawk
 +CC = i486-linux-gnu-gcc
 +CCDEPMODE = depmode=gcc3
 +CFLAGS = -g -O2
 +CPP = i486-linux-gnu-gcc -E
 +CPPFLAGS = 
 +CPPFLAGS_3RDPARTY = -I$(top_srcdir)/3rdparty -I$(top_srcdir)/3rdparty/xylib
 +CXX = i486-linux-gnu-g++
 +CXXCPP = i486-linux-gnu-g++ -E
 +CXXDEPMODE = depmode=gcc3
 +CXXFLAGS = -g -O2
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
 +DOC = doc
++DSYMUTIL = 
 +ECHO = echo
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
 +EGREP = /bin/grep -E
 +EXEEXT = 
 +F77 = i486-linux-gnu-g77
 +FFLAGS = -g -O2
 +GREP = /bin/grep
 +INSTALL = /usr/bin/install -c
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 +LDFLAGS = 
 +LIBOBJS = 
 +LIBRARY_VERSION_FLAG = -version-info 0:0:0
 +LIBS = -lm -lm 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAINT = #
- MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.8.5/config/missing --run makeinfo
++MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.8.6/config/missing --run makeinfo
 +MKDIR_P = /bin/mkdir -p
++NMEDIT = 
 +NO_READLINE = 
 +OBJEXT = o
 +PACKAGE = fityk
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = fityk
- PACKAGE_STRING = fityk 0.8.5
++PACKAGE_STRING = fityk 0.8.6
 +PACKAGE_TARNAME = fityk
- PACKAGE_VERSION = 0.8.5
++PACKAGE_VERSION = 0.8.6
 +PATH_SEPARATOR = :
 +PYBINDINGDIR = 
 +PYTHON = 
 +PYTHON_CPPFLAGS = 
 +PYTHON_EXEC_PREFIX = 
 +PYTHON_EXTRA_LDFLAGS = 
 +PYTHON_EXTRA_LIBS = 
 +PYTHON_LDFLAGS = 
 +PYTHON_PLATFORM = 
 +PYTHON_PREFIX = 
 +PYTHON_SITE_PKG = 
 +PYTHON_VERSION = 
 +RANLIB = ranlib
 +RC = 
- READLINE_LIBS = -lreadline  -lncurses
++READLINE_LIBS = -lreadline 
 +SED = /bin/sed
 +SET_MAKE = 
 +SHELL = /bin/sh
 +SRCSUBDIRS =  wxgui cli
 +STRIP = strip
 +SWIG = 
 +SWIG_LIB = 
 +SWIG_PYTHON_CPPFLAGS = 
 +SWIG_PYTHON_OPT = 
- VERSION = 0.8.5
++VERSION = 0.8.6
 +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 -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 -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 -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 -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 = -pthread   -lwx_gtk2u_adv-2.6 -lwx_gtk2u_core-2.6 -lwx_baseu-2.6 
 +WX_LIBS_STATIC = 
 +WX_RESCOMP = 
 +WX_VERSION = 2.6.3
++WX_VERSION_MAJOR = 2
++WX_VERSION_MICRO = 3
++WX_VERSION_MINOR = 6
 +XYLIB_LDADD = $(top_builddir)/3rdparty/xylib/xylib/libxy.la
- abs_builddir = /home/debian/fityk/fityk-0.8.5/python
- abs_srcdir = /home/debian/fityk/fityk-0.8.5/python
- abs_top_builddir = /home/debian/fityk/fityk-0.8.5
- abs_top_srcdir = /home/debian/fityk/fityk-0.8.5
++abs_builddir = /home/debian/fityk/fityk-0.8.6/python
++abs_srcdir = /home/debian/fityk/fityk-0.8.6/python
++abs_top_builddir = /home/debian/fityk/fityk-0.8.6
++abs_top_srcdir = /home/debian/fityk/fityk-0.8.6
 +ac_ct_CC = 
 +ac_ct_CXX = 
 +ac_ct_F77 = 
 +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
 +builddir = .
 +datadir = ${datarootdir}
 +datarootdir = ${prefix}/share
 +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 +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 = $(SHELL) /home/debian/fityk/fityk-0.8.5/config/install-sh
++install_sh = $(SHELL) /home/debian/fityk/fityk-0.8.6/config/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = ${exec_prefix}/libexec
 +localedir = ${datarootdir}/locale
 +localstatedir = ${prefix}/var
 +mandir = ${prefix}/share/man
 +mkdir_p = /bin/mkdir -p
 +oldincludedir = /usr/include
 +pdfdir = ${docdir}
 +pkgpyexecdir = 
 +pkgpythondir = 
 +prefix = /usr
 +program_transform_name = s,x,x,
 +psdir = ${docdir}
 +pyexecdir = 
 +pythondir = 
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +srcdir = .
 +sysconfdir = ${prefix}/etc
 +target = i486-pc-linux-gnu
 +target_alias = 
 +target_cpu = i486
 +target_os = linux-gnu
 +target_vendor = pc
 +top_builddir = ..
 +top_srcdir = ..
 +
 +# $Id: Makefile.am 238 2007-01-21 01:44:04Z wojdyr $
 +EXTRA_DIST = 
 +BUILT_SOURCES = $(srcdir)/fityk_wrap.cpp
 +SWIG_SOURCES = fityk.i
 +python_PYTHON = fityk.py
 +pyexec_LTLIBRARIES = _fityk.la
 +_fityk_la_SOURCES = $(srcdir)/fityk_wrap.cpp $(SWIG_SOURCES)
 +_fityk_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
 +_fityk_la_LDFLAGS = -version-info 0:0:0 -module 
 +_fityk_la_LIBADD = ../src/libfityk.la
 +all: $(BUILT_SOURCES)
 +	$(MAKE) $(AM_MAKEFLAGS) all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(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) --foreign  python/Makefile'; \
 +	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  python/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: # $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES)
 +	@$(NORMAL_INSTALL)
 +	test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
 +	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
 +	  if test -f $$p; then \
 +	    f=$(am__strip_dir) \
- 	    echo " $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
- 	    $(LIBTOOL) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
++	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
++	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
 +	  else :; fi; \
 +	done
 +
 +uninstall-pyexecLTLIBRARIES:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
 +	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \
++	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \
++	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \
 +	done
 +
 +clean-pyexecLTLIBRARIES:
 +	-test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES)
 +	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
 +	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +	  test "$$dir" != "$$p" || dir=.; \
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
 +_fityk.la: $(_fityk_la_OBJECTS) $(_fityk_la_DEPENDENCIES) 
 +	$(_fityk_la_LINK) -rpath $(pyexecdir) $(_fityk_la_OBJECTS) $(_fityk_la_LIBADD) $(LIBS)
 +
 +mostlyclean-compile:
 +	-rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +	-rm -f *.tab.c
 +
 +include ./$(DEPDIR)/_fityk_la-fityk_wrap.Plo
 +
 +.cpp.o:
 +	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +#	source='$<' object='$@' libtool=no \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +#	source='$<' object='$@' libtool=no \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +#	source='$<' object='$@' libtool=yes \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(LTCXXCOMPILE) -c -o $@ $<
 +
 +_fityk_la-fityk_wrap.lo: $(srcdir)/fityk_wrap.cpp
 +	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _fityk_la-fityk_wrap.lo -MD -MP -MF $(DEPDIR)/_fityk_la-fityk_wrap.Tpo -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
 +	mv -f $(DEPDIR)/_fityk_la-fityk_wrap.Tpo $(DEPDIR)/_fityk_la-fityk_wrap.Plo
 +#	source='$(srcdir)/fityk_wrap.cpp' object='_fityk_la-fityk_wrap.lo' libtool=yes \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +install-pythonPYTHON: $(python_PYTHON)
 +	@$(NORMAL_INSTALL)
 +	test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
 +	@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
 +	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 +	  if test -f $$b$$p; then \
 +	    f=$(am__strip_dir) \
 +	    dlist="$$dlist $$f"; \
 +	    echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
 +	    $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \
 +	  else :; fi; \
 +	done; \
 +	if test -n "$$dlist"; then \
 +	  if test -z "$(DESTDIR)"; then \
 +	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
 +	  else \
 +	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
 +	  fi; \
 +	else :; fi
 +
 +uninstall-pythonPYTHON:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
 +	  f=$(am__strip_dir) \
 +	  rm -f "$(DESTDIR)$(pythondir)/$$f"; \
 +	  rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \
 +	  rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \
 +	done
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
- 	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
 +
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
 +	  && gtags -i $(GTAGS_ARGS) $$here
 +
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +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 $(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: $(BUILT_SOURCES)
 +	$(MAKE) $(AM_MAKEFLAGS) check-am
 +all-am: Makefile $(LTLIBRARIES)
 +installdirs:
 +	for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"; do \
 +	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +	done
 +install: $(BUILT_SOURCES)
 +	$(MAKE) $(AM_MAKEFLAGS) 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."
 +	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 +clean: clean-am
 +
 +clean-am: clean-generic clean-libtool clean-pyexecLTLIBRARIES \
 +	mostlyclean-am
 +
 +distclean: distclean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-pythonPYTHON
 +
 +install-dvi: install-dvi-am
 +
 +install-exec-am: install-pyexecLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-info: install-info-am
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-ps: install-ps-am
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +	mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON
 +
 +.MAKE: install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 +	clean-libtool clean-pyexecLTLIBRARIES ctags distclean \
 +	distclean-compile distclean-generic distclean-libtool \
 +	distclean-tags distdir dvi dvi-am html html-am info info-am \
 +	install install-am 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-ps install-ps-am \
 +	install-pyexecLTLIBRARIES install-pythonPYTHON install-strip \
 +	installcheck installcheck-am installdirs maintainer-clean \
 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags uninstall uninstall-am uninstall-pyexecLTLIBRARIES \
 +	uninstall-pythonPYTHON
 +
 +
 +$(srcdir)/fityk_wrap.cpp : $(SWIG_SOURCES) $(top_srcdir)/src/fityk.h
 +	$(SWIG) $(SWIG_PYTHON_OPT) -I$(top_srcdir)/src -o $@ $<
 +# 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:

-- 
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