[fityk] 07/45: Imported Debian patch 0.7.3-1
Stuart Prescott
stuart at debian.org
Sun Nov 6 23:35:28 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 62725d5fca7887a1c8a4d7a2617843de51b89b98
Merge: 93d9e61 0efc70b
Author: Carlo Segre <segre at iit.edu>
Date: Tue Apr 11 22:02:48 2006 -0500
Imported Debian patch 0.7.3-1
NEWS | 13 +
TODO | 161 +++++----
config.h.in | 3 +
configure | 74 +++-
configure.ac | 7 +-
debian/changelog | 6 +
debian/rules | 2 +-
debian/watch | 2 +-
doc/fitykhelp.htb | Bin 81159 -> 100754 bytes
doc/fitykhelp.html | 286 ++++++++++------
doc/fitykhelp.xml | 292 +++++++++++-----
doc/fitykhelp_img/Makefile.am | 9 +-
doc/fitykhelp_img/Makefile.in | 9 +-
doc/fitykhelp_img/gaussian.png | Bin 1292 -> 2362 bytes
doc/fitykhelp_img/gaussiana.png | Bin 0 -> 3021 bytes
doc/fitykhelp_img/lorentzian.png | Bin 810 -> 1441 bytes
doc/fitykhelp_img/lorentziana.png | Bin 0 -> 1845 bytes
doc/fitykhelp_img/pearson7.png | Bin 1662 -> 2374 bytes
doc/fitykhelp_img/polynom5.png | Bin 1345 -> 1602 bytes
doc/fitykhelp_img/pseudo_voigt.png | Bin 2166 -> 4098 bytes
doc/fitykhelp_img/pseudo_voigta.png | Bin 0 -> 5183 bytes
doc/fitykhelp_img/t_xa1a2.png | Bin 871 -> 0 bytes
doc/fitykhelp_img/voigt.png | Bin 2275 -> 2994 bytes
doc/fitykhelp_img/voigta.png | Bin 0 -> 3116 bytes
fityk.iss | 6 +-
fityk.spec | 2 +-
samples/Makefile.am | 4 +-
samples/Makefile.in | 4 +-
samples/README | 6 +-
samples/test_syntax.fit | 166 +++++++++
src/GAfit.cpp | 6 +-
src/LMfit.cpp | 16 +-
src/LMfit.h | 9 +-
src/Makefile.am | 17 +-
src/Makefile.in | 35 +-
src/NMfit.cpp | 6 +-
src/calc.cpp | 4 +-
src/calc.h | 4 +-
src/cmd.cpp | 611 +++------------------------------
src/cmd2.cpp | 467 ++++++++++++++++++++++++++
src/cmd2.h | 58 ++++
src/cmd3.cpp | 198 +++++++++++
src/cmd3.h | 38 +++
src/common.cpp | 36 +-
src/common.h | 41 ++-
src/data.cpp | 10 +-
src/data.h | 8 +-
src/datatrans.cpp | 266 ++++++++-------
src/datatrans.h | 23 +-
src/datatrans2.cpp | 54 ++-
src/datatrans2.h | 31 +-
src/datatrans3.cpp | 80 +++++
src/datatrans3.h | 34 ++
src/datatrans4.cpp | 68 ++++
src/datatrans4.h | 33 ++
src/fit.cpp | 178 ++++++----
src/fit.h | 22 +-
src/func.cpp | 650 +++++++++++++++++++++++++++++-------
src/func.h | 107 ++++--
src/logic.cpp | 14 +-
src/logic.h | 5 +-
src/numfuncs.cpp | 3 +-
src/numfuncs.h | 9 +-
src/settings.cpp | 28 +-
src/settings.h | 6 +-
src/sum.cpp | 31 +-
src/sum.h | 6 +-
src/u_gnuplot.cpp | 20 +-
src/u_main.cpp | 170 +++++++---
src/ui.cpp | 4 +-
src/var.cpp | 137 +++++---
src/var.h | 41 ++-
src/wx_dlg.cpp | 44 ++-
src/wx_dlg.h | 6 +-
src/wx_gui.cpp | 67 ++--
src/wx_gui.h | 18 +-
src/wx_mplot.cpp | 88 ++---
src/wx_mplot.h | 4 +-
src/wx_pane.cpp | 19 +-
src/wx_plot.cpp | 115 ++++---
src/wx_plot.h | 27 +-
81 files changed, 3428 insertions(+), 1596 deletions(-)
diff --cc configure
index ee7660a,a6680cb..dfa07c0
--- a/configure
+++ b/configure
@@@ -5633,9 -5633,81 +5633,81 @@@ echo "$as_me: error: You don't have an
fi
+ echo "$as_me:$LINENO: checking for finite in -lm" >&5
+ echo $ECHO_N "checking for finite in -lm... $ECHO_C" >&6
+ if test "${ac_cv_lib_m_finite+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+ char finite ();
+ int
+ main ()
+ {
+ finite ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_m_finite=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_m_finite=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_m_finite" >&5
+ echo "${ECHO_T}$ac_cv_lib_m_finite" >&6
+ if test $ac_cv_lib_m_finite = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FINITE 1
+ _ACEOF
+
+ fi
+
+
test "x$prefix" = xNONE && prefix=$ac_default_prefix
- ac_config_files="$ac_config_files Makefile fityk.spec fityk.iss src/Makefile src/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile 3rdparty/Makefile"
+ ac_config_files="$ac_config_files Makefile fityk.spec fityk.iss src/Makefile src/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
diff --cc debian/changelog
index e4d65e6,0000000..f71609d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,0 +1,51 @@@
++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 04d8d95,0000000..1ccc5ba
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,82 -1,0 +1,82 @@@
+#!/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 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
++ ./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 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
diff --cc debian/watch
index ab5004d,0000000..d115595
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,3 @@@
+version=3
- ftp://heanet.dl.sourceforge.net/f/fi/fityk/fityk-(.*)\.tar\.gz \
++ftp://heanet.dl.sourceforge.net/f/fi/fityk/fityk-(.*)\.tar\.bz2 \
+ debian uupdate
--
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