[fityk] 14/45: Imported Debian patch 0.7.8-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 89d1cf3067cf1336b8855ffb9cfc2d211bb34a36
Merge: 1f3d5e1 ceaf9c7
Author: Carlo Segre <segre at debian.org>
Date: Wed Mar 7 18:58:33 2007 -0600
Imported Debian patch 0.7.8-1
3rdparty/Makefile | 25 +-
3rdparty/Makefile.am | 2 +-
3rdparty/Makefile.in | 5 +-
INSTALL | 48 +-
Makefile.am | 3 +-
Makefile.in | 9 +-
NEWS | 19 +
TODO | 152 ++-
config.h.in | 4 +
config/Makefile.am | 2 +-
config/Makefile.in | 7 +-
config/config.guess | 574 ++++-----
config/config.sub | 89 +-
config/depcomp | 9 +-
config/install-sh | 2 +-
config/missing | 9 +-
config/mkinstalldirs | 150 ---
config/readline.m4 | 12 +
configure | 221 +++-
configure.ac | 10 +-
debian/changelog | 7 +
debian/rules | 2 +-
doc/Makefile.am | 25 +-
doc/Makefile.in | 28 +-
doc/fitykhelp.htb | Bin 126047 -> 134398 bytes
doc/fitykhelp.html | 357 ++++--
doc/fitykhelp.xml | 461 +++++--
doc/fitykhelp_img/Makefile.am | 5 +-
doc/fitykhelp_img/Makefile.in | 8 +-
doc/fitykhelp_img/note.png | Bin 0 -> 386 bytes
doc/fitykhelp_img/voigt2.png | Bin 0 -> 4897 bytes
doc/fo.xsl | 71 ++
doc/hh-mod.xsl | 8 +-
doc/html.css | 63 +
fityk.iss | 138 +--
fityk.iss.in | 138 +--
fityk.spec | 2 +-
install-sh | 294 -----
missing | 336 -----
mkinstalldirs | 111 --
samples/Makefile.am | 2 +-
samples/Makefile.in | 5 +-
samples/SiC_Zn.fit | 8 +-
samples/nacl01.fit | 2 +-
samples/test_syntax.fit | 35 +-
src/GAfit.cpp | 27 +-
src/GAfit.h | 3 +-
src/LMfit.cpp | 33 +-
src/LMfit.h | 3 +-
src/Makefile.am | 41 +-
src/Makefile.in | 136 +--
src/NMfit.cpp | 20 +-
src/NMfit.h | 3 +-
src/ast.cpp | 353 ++++--
src/ast.h | 6 +-
src/bfunc.cpp | 46 +-
src/bfunc.h | 3 +-
src/calc.cpp | 19 +-
src/calc.h | 3 +-
src/cli/Makefile.am | 11 +
src/{img => cli}/Makefile.in | 229 ++--
src/{u_gnuplot.cpp => cli/gnuplot.cpp} | 16 +-
src/{u_gnuplot.h => cli/gnuplot.h} | 5 +-
src/{u_main.cpp => cli/main.cpp} | 43 +-
src/cmd.cpp | 49 +-
src/cmd.h | 3 +-
src/cmd2.cpp | 77 +-
src/cmd2.h | 5 +-
src/cmd3.cpp | 5 +-
src/cmd3.h | 3 +-
src/common.cpp | 3 +-
src/common.h | 26 +-
src/data.cpp | 132 +-
src/data.h | 10 +-
src/datatrans.cpp | 22 +-
src/datatrans.h | 5 +-
src/datatrans2.cpp | 7 +-
src/datatrans2.h | 5 +-
src/datatrans3.cpp | 3 +-
src/datatrans3.h | 3 +-
src/datatrans4.cpp | 5 +-
src/datatrans4.h | 3 +-
src/fileroutines.cpp | 5 +-
src/fileroutines.h | 1 +
src/fit.cpp | 47 +-
src/fit.h | 3 +-
src/func.cpp | 63 +-
src/func.h | 18 +-
src/guess.cpp | 8 +-
src/guess.h | 3 +-
src/logic.cpp | 53 +-
src/logic.h | 8 +-
src/mgr.cpp | 11 +-
src/mgr.h | 3 +-
src/numfuncs.cpp | 3 +-
src/numfuncs.h | 3 +-
src/optional_suffix.h | 2 +-
src/settings.cpp | 36 +-
src/settings.h | 3 +-
src/sum.cpp | 9 +-
src/sum.h | 5 +-
src/ui.cpp | 26 +-
src/ui.h | 44 +-
src/var.cpp | 6 +-
src/var.h | 3 +-
src/voigt.cpp | 30 +-
src/voigt.h | 30 +-
src/wx_dlg.cpp | 1809 ---------------------------
src/wx_dlg.h | 222 ----
src/wx_fdlg.cpp | 1172 ------------------
src/wx_fdlg.h | 156 ---
src/wx_pane.cpp | 1949 ------------------------------
src/wx_pane.h | 347 ------
src/wxgui/Makefile.am | 42 +
src/{ => wxgui}/Makefile.in | 166 +--
src/{wx_plot.cpp => wxgui/aplot.cpp} | 492 +-------
src/wxgui/aplot.h | 69 ++
src/wxgui/callback.h | 78 ++
src/{wx_common.cpp => wxgui/cmn.cpp} | 30 +-
src/{wx_common.h => wxgui/cmn.h} | 84 +-
src/wxgui/dataedit.cpp | 666 ++++++++++
src/wxgui/dataedit.h | 98 ++
src/wxgui/defmgr.cpp | 456 +++++++
src/wxgui/defmgr.h | 56 +
src/wxgui/dialogs.cpp | 668 ++++++++++
src/wxgui/dialogs.h | 112 ++
src/wxgui/dload.cpp | 479 ++++++++
src/wxgui/dload.h | 59 +
src/wxgui/fancyrc.cpp | 195 +++
src/wxgui/fancyrc.h | 45 +
src/wxgui/gradient.cpp | 200 +++
src/wxgui/gradient.h | 103 ++
src/{wx_gui.cpp => wxgui/gui.cpp} | 474 +++-----
src/{wx_gui.h => wxgui/gui.h} | 103 +-
src/{ => wxgui}/img/Makefile.am | 2 +-
src/{ => wxgui}/img/Makefile.in | 13 +-
src/{ => wxgui}/img/active_mode.xpm | 0
src/{ => wxgui}/img/add.xpm | 0
src/{ => wxgui}/img/add_peak.xpm | 0
src/{ => wxgui}/img/addpeak_mode.xpm | 0
src/{ => wxgui}/img/bg_mode.xpm | 0
src/{ => wxgui}/img/close.xpm | 0
src/{ => wxgui}/img/color.xpm | 0
src/{ => wxgui}/img/colorsel.xpm | 0
src/{ => wxgui}/img/cont_fit.xpm | 0
src/{ => wxgui}/img/convert.xpm | 0
src/{ => wxgui}/img/copyfunc.xpm | 0
src/{ => wxgui}/img/down_arrow.xpm | 0
src/{ => wxgui}/img/dpsize.xpm | 0
src/{ => wxgui}/img/edit_data.xpm | 0
src/{ => wxgui}/img/editf.xpm | 0
src/{ => wxgui}/img/exec_down.xpm | 0
src/{ => wxgui}/img/exec_selected.xpm | 0
src/{ => wxgui}/img/filter.xpm | 0
src/{ => wxgui}/img/fityk.ico | Bin
src/{ => wxgui}/img/fityk.xpm | 0
src/{ => wxgui}/img/lock.xpm | 0
src/{ => wxgui}/img/lock_open.xpm | 0
src/{ => wxgui}/img/manual.xpm | 0
src/{ => wxgui}/img/mouse_l.xpm | 0
src/{ => wxgui}/img/mouse_r.xpm | 0
src/{ => wxgui}/img/open.xpm | 0
src/{ => wxgui}/img/open_data.xpm | 0
src/{ => wxgui}/img/open_data_custom.xpm | 0
src/{ => wxgui}/img/rename.xpm | 0
src/{ => wxgui}/img/right_pane.xpm | 0
src/{ => wxgui}/img/run_fit.xpm | 0
src/{ => wxgui}/img/run_script.xpm | 0
src/{ => wxgui}/img/save.xpm | 0
src/{ => wxgui}/img/save_as.xpm | 0
src/{ => wxgui}/img/save_data.xpm | 0
src/{ => wxgui}/img/save_script.xpm | 0
src/{ => wxgui}/img/shiftup.xpm | 0
src/{ => wxgui}/img/strip_bg.xpm | 0
src/{ => wxgui}/img/sum.xpm | 0
src/{ => wxgui}/img/undo_fit.xpm | 0
src/{ => wxgui}/img/unused.xpm | 0
src/{ => wxgui}/img/up_arrow.xpm | 0
src/{ => wxgui}/img/zoom_all.xpm | 0
src/{ => wxgui}/img/zoom_left.xpm | 0
src/{ => wxgui}/img/zoom_mode.xpm | 0
src/{ => wxgui}/img/zoom_prev.xpm | 0
src/{ => wxgui}/img/zoom_right.xpm | 0
src/{ => wxgui}/img/zoom_up.xpm | 0
src/{ => wxgui}/img/zoom_vert.xpm | 0
src/{ => wxgui}/img/zshift.xpm | 0
src/wxgui/inputline.cpp | 179 +++
src/wxgui/inputline.h | 41 +
src/wxgui/listptxt.cpp | 231 ++++
src/wxgui/listptxt.h | 72 ++
src/{wx_mplot.cpp => wxgui/mplot.cpp} | 74 +-
src/{wx_mplot.h => wxgui/mplot.h} | 12 +-
src/wxgui/pane.cpp | 383 ++++++
src/wxgui/pane.h | 101 ++
src/wxgui/plot.cpp | 476 ++++++++
src/{wx_plot.h => wxgui/plot.h} | 104 +-
src/wxgui/print.cpp | 396 ++++++
src/wxgui/print.h | 71 ++
src/wxgui/sdebug.cpp | 348 ++++++
src/wxgui/sdebug.h | 45 +
src/wxgui/setdlg.cpp | 368 ++++++
src/wxgui/setdlg.h | 39 +
src/wxgui/sidebar.cpp | 934 ++++++++++++++
src/wxgui/sidebar.h | 104 ++
src/wxgui/statbar.cpp | 200 +++
src/wxgui/statbar.h | 59 +
src/{ => wxgui}/winres.rc | 0
src/{ => wxgui}/wx_IO.cpp | 14 +-
208 files changed, 10590 insertions(+), 9253 deletions(-)
diff --cc 3rdparty/Makefile
index cdb4fc9,0000000..eca2f43
mode 100644,000000..100644
--- a/3rdparty/Makefile
+++ b/3rdparty/Makefile
@@@ -1,325 -1,0 +1,326 @@@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# 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.
+
+
+
- # $Id: Makefile.am,v 1.4 2006/05/31 19:10:15 wojdyr Exp $
++# $Id: Makefile.am 168 2006-05-31 19:10:15Z wojdyr $
+srcdir = .
+top_srcdir = ..
+
+pkgdatadir = $(datadir)/fityk
+pkglibdir = $(libdir)/fityk
+pkgincludedir = $(includedir)/fityk
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+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 = 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
++mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.7.7/config/missing --run aclocal-1.9
++ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.7.8/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
++AMTAR = ${SHELL} /home/debian/fityk/fityk-0.7.8/config/missing --run tar
++AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.7.8/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.7.8/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.7.8/config/missing --run automake-1.9
+AWK = gawk
+CC = i486-linux-gnu-gcc
+CCDEPMODE = depmode=gcc3
+CFITYK = cfityk
- CFLAGS = -g -O1
++CFLAGS = -g -O2
+CPP = i486-linux-gnu-gcc -E
+CPPFLAGS =
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
+CXXDEPMODE = depmode=gcc3
- CXXFLAGS = -g -O1
++CXXFLAGS = -g -O2
+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
++MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.7.8/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 = :
++RANLIB = ranlib
+RC =
+READLINE_LIBS = -lreadline -ltermcap
+SET_MAKE =
+SHELL = /bin/sh
+STRIP =
- VERSION = 0.7.7
++VERSION = 0.7.8
+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
++install_sh = /home/debian/fityk/fityk-0.7.8/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: # $(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: # $(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
+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 Makefile.in
index 33c91b0,3465388..97e2960
--- a/Makefile.in
+++ b/Makefile.in
@@@ -206,9 -206,10 +206,10 @@@ target_alias = @target_alias
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
+ ACLOCAL_AMFLAGS = -I config
EXTRA_DIST = fityk.spec fityk.iss fityk.url
AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = @DOC@ src samples config 3rdparty
+SUBDIRS = @DOC@ src samples config
dist_icon_DATA = fityk.png
icondir = $(datadir)/pixmaps
dist_desktop_DATA = fityk.desktop
diff --cc configure.ac
index 8f3de1a,0977a51..8697125
--- a/configure.ac
+++ b/configure.ac
@@@ -171,7 -173,7 +173,7 @@@ AC_CHECK_LIB([m], [isnan], [AC_DEFINE([
dnl in generated configure script, this line is too late
test "x$prefix" = xNONE && prefix=$ac_default_prefix
- AC_CONFIG_FILES([Makefile fityk.spec fityk.iss src/Makefile src/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile])
-AC_CONFIG_FILES([Makefile fityk.spec fityk.iss src/Makefile src/wxgui/Makefile src/cli/Makefile src/wxgui/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile 3rdparty/Makefile])
++AC_CONFIG_FILES([Makefile fityk.spec fityk.iss src/Makefile src/wxgui/Makefile src/cli/Makefile src/wxgui/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile])
AC_OUTPUT
diff --cc debian/changelog
index c635a9a,0000000..2f9770e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,99 -1,0 +1,106 @@@
++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 debian/rules
index bdffe20,0000000..6fe8a6d
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,87 -1,0 +1,87 @@@
+#!/usr/bin/make -f
+
+export DH_COMPAT=4
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O2 -g -Wall
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+config.status: configure
+ dh_testdir
+ -test -r /usr/share/misc/config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+ ./configure --disable-optimization --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+
+build-stamp: config.status
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ -rm -f config.sub config.guess
+ -$(MAKE) distclean
+
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/fityk.
+ $(MAKE) install prefix=$(CURDIR)/debian/fityk/usr
+ mkdir $(CURDIR)/debian/fityk/usr/share/pixmaps
- cp src/img/fityk.xpm $(CURDIR)/debian/fityk/usr/share/pixmaps/
++ cp src/wxgui/img/fityk.xpm $(CURDIR)/debian/fityk/usr/share/pixmaps/
+ # The first .desktop file is from upstream, the second from Ubuntu
+ # pick your poison...
+ dh_install fityk.desktop usr/share/applications/
+# dh_install debian/fityk.desktop usr/share/applications/
+ dh_desktop
+ cp samples/*.dat $(CURDIR)/debian/fityk/usr/share/doc/fityk/samples/
+ cp samples/*.fit $(CURDIR)/debian/fityk/usr/share/doc/fityk/samples/
+ cp samples/README $(CURDIR)/debian/fityk/usr/share/doc/fityk/samples/
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs NEWS
+ dh_link
+ dh_strip
+ dh_compress --exclude=.dat --exclude=.fit
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--
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