[fityk] 08/45: Imported Debian patch 0.7.4-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 cf13f7303c01ca0ba5c4741c2563e46db458e4a7
Merge: 62725d5 b8bea0a
Author: Carlo Segre <segre at iit.edu>
Date: Tue Jun 6 09:49:14 2006 -0500
Imported Debian patch 0.7.4-1
3rdparty/Makefile.am | 2 +-
3rdparty/Makefile.in | 4 +-
Makefile.in | 2 +-
NEWS | 16 +
TODO | 158 ++--
aclocal.m4 | 4 +-
config.h.in | 3 +
config/Makefile.in | 2 +-
configure | 75 +-
configure.ac | 8 +-
debian/changelog | 9 +
debian/control | 2 +-
debian/dirs | 1 +
debian/fityk.desktop | 10 +
debian/rules | 2 +
doc/Makefile.in | 2 +-
doc/fitykhelp.htb | Bin 100754 -> 123349 bytes
doc/fitykhelp.html | 266 +++++--
doc/fitykhelp.xml | 254 ++++++-
doc/fitykhelp_img/Makefile.am | 7 +-
doc/fitykhelp_img/Makefile.in | 9 +-
doc/fitykhelp_img/pearson7a.png | Bin 0 -> 5814 bytes
doc/fitykhelp_img/splitgaussian.png | Bin 0 -> 6861 bytes
doc/fitykhelp_img/splitpearson7.png | Bin 0 -> 6829 bytes
fityk.iss | 6 +-
fityk.spec | 6 +-
fityk.spec.in | 4 +-
samples/Makefile.in | 2 +-
samples/test_syntax.fit | 70 +-
src/GAfit.h | 7 +-
src/LMfit.h | 7 +-
src/Makefile.am | 4 +-
src/Makefile.in | 11 +-
src/NMfit.h | 8 +-
src/calc.cpp | 150 ++--
src/calc.h | 29 +-
src/cmd.cpp | 57 +-
src/cmd.h | 5 +-
src/cmd2.cpp | 69 +-
src/cmd2.h | 58 +-
src/cmd3.cpp | 38 +-
src/cmd3.h | 5 +-
src/data.cpp | 38 +-
src/data.h | 9 +-
src/datatrans.cpp | 287 ++++---
src/datatrans.h | 9 +-
src/datatrans2.cpp | 19 +-
src/datatrans2.h | 35 +-
src/datatrans3.cpp | 27 +-
src/datatrans3.h | 5 +-
src/datatrans4.cpp | 12 +-
src/datatrans4.h | 3 +-
src/fit.cpp | 20 +-
src/fit.h | 11 +-
src/func.cpp | 163 ++--
src/func.h | 27 +-
src/guess.h | 18 +-
src/img/Makefile.in | 2 +-
src/logic.cpp | 8 +-
src/logic.h | 9 +-
src/nmath.cpp | 1418 +++++++++++++++++++++++++++++++++++
src/numfuncs.h | 9 +-
src/settings.cpp | 18 +-
src/settings.h | 22 +-
src/sum.cpp | 138 +---
src/sum.h | 11 +-
src/u_main.cpp | 114 ++-
src/ui.cpp | 8 +-
src/ui.h | 7 +-
src/var.cpp | 23 +-
src/var.h | 11 +-
src/wx_IO.cpp | 9 +-
src/wx_dlg.cpp | 6 +-
src/wx_fdlg.cpp | 135 +++-
src/wx_fdlg.h | 19 +
src/wx_gui.cpp | 276 ++++---
src/wx_gui.h | 27 +-
src/wx_mplot.cpp | 89 ++-
src/wx_mplot.h | 15 +-
src/wx_pane.cpp | 43 +-
src/wx_pane.h | 8 +-
src/wx_plot.cpp | 97 ++-
src/wx_plot.h | 25 +-
83 files changed, 3610 insertions(+), 992 deletions(-)
diff --cc debian/changelog
index f71609d,0000000..5896f8e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,51 -1,0 +1,60 @@@
++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 6b3bbf0,0000000..531de45
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,30 @@@
+Source: fityk
+Section: science
+Priority: optional
+Maintainer: Carlo Segre <segre at iit.edu>
+Build-Depends: debhelper (>> 4.0.0), libwxgtk2.6-dev, libreadline5-dev | libreadline-dev, libboost-dev
- Standards-Version: 3.6.2
++Standards-Version: 3.7.2
+
+Package: fityk
+Architecture: any
+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/
diff --cc debian/dirs
index b70f812,0000000..a9636e8
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,2 -1,0 +1,3 @@@
+usr/bin
+usr/share/doc/fityk/samples
++usr/share/applications
diff --cc debian/fityk.desktop
index 0000000,0000000..ff9771f
new file mode 100644
--- /dev/null
+++ b/debian/fityk.desktop
@@@ -1,0 -1,0 +1,10 @@@
++[Desktop Entry]
++Version=1.0
++Encoding=UTF-8
++Name=Fityk Curve Fitting
++GenericName=Curve Fitter
++Comment=Fit analytical functions to data
++Type=Application
++Exec=fityk
++Icon=fityk
++Categories=Application;Math;Physics;Science;
diff --cc debian/rules
index 1ccc5ba,0000000..5f4fa66
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,82 -1,0 +1,84 @@@
+#!/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/
++ 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