[fityk] 04/45: Imported Debian patch 0.5.1-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 9adf5f8602351ece52f3fbaa291c69d7ba74965f
Merge: a35f02e 28dcdaf
Author: Carlo Segre <segre at iit.edu>
Date: Fri Jul 22 07:24:17 2005 -0500
Imported Debian patch 0.5.1-1
3rdparty/Makefile.in | 81 ++-
INSTALL | 159 +++--
Makefile.in | 269 +++++---
NEWS | 6 +
TODO | 16 +-
aclocal.m4 | 1514 ++++++++++++++++++++---------------------
config/Makefile.in | 81 ++-
config/config.guess | 374 ++++++----
config/config.sub | 199 ++++--
config/depcomp | 125 +++-
config/install-sh | 496 ++++++++------
config/missing | 139 ++--
config/mkinstalldirs | 156 ++++-
config/readline.m4 | 2 +-
configure | 345 +++++++---
configure.ac | 9 +-
debian/changelog | 8 +
debian/control | 4 +-
debian/watch | 2 +
doc/Makefile.in | 225 +++---
doc/fitykhelp_img/Makefile.in | 79 ++-
fityk.iss | 6 +-
fityk.spec | 2 +-
samples/Makefile.in | 79 ++-
samples/SiC_Zn.fit | 6 +-
samples/nacl01.fit | 4 +-
src/Makefile.in | 310 +++++----
src/datatrans.cpp | 15 +-
src/datatrans.h | 48 +-
src/img/Makefile.am | 84 +--
src/img/Makefile.in | 161 ++---
src/img/active_mode.xpm | 31 +
src/img/add_peak.xpm | 49 ++
src/img/addpeak_mode.xpm | 82 +++
src/img/addpeak_t.xpm | 23 -
src/img/addpoint.xpm | 22 -
src/img/aparam.xpm | 20 -
src/img/autoadd.xpm | 22 -
src/img/backv.xpm | 22 -
src/img/baseline_t.xpm | 23 -
src/img/bg_mode.xpm | 31 +
src/img/center.xpm | 22 -
src/img/clear.xpm | 24 -
src/img/clickadd.xpm | 23 -
src/img/close.xpm | 21 -
src/img/cont_fit.xpm | 95 +++
src/img/delpeak.xpm | 21 -
src/img/delpoint.xpm | 25 -
src/img/dpane.xpm | 32 -
src/img/dump.xpm | 34 -
src/img/edit_data.xpm | 89 +++
src/img/execute.xpm | 34 -
src/img/exportb.xpm | 25 -
src/img/exportd.xpm | 25 -
src/img/fitcont.xpm | 34 -
src/img/fitrun.xpm | 34 -
src/img/fitundo.xpm | 34 -
src/img/freeze.xpm | 21 -
src/img/fwhm.xpm | 22 -
src/img/gparam.xpm | 21 -
src/img/height.xpm | 22 -
src/img/hwhm.xpm | 22 -
src/img/importb.xpm | 26 -
src/img/info.xpm | 23 -
src/img/left_2arrows.xpm | 23 -
src/img/left_arrow.xpm | 23 -
src/img/leftscroll.xpm | 25 -
src/img/log.xpm | 34 -
src/img/manual.xpm | 282 +++++++-
src/img/open_data.xpm | 208 ++++++
src/img/open_data_custom.xpm | 178 +++++
src/img/openfile.xpm | 34 -
src/img/plusbg.xpm | 22 -
src/img/pparam.xpm | 21 -
src/img/range_t.xpm | 22 -
src/img/reset.xpm | 34 -
src/img/right_2arrows.xpm | 23 -
src/img/right_arrow.xpm | 23 -
src/img/right_pane.xpm | 41 ++
src/img/rightscroll.xpm | 24 -
src/img/run_fit.xpm | 104 +++
src/img/run_script.xpm | 98 +++
src/img/save_data.xpm | 299 ++++++++
src/img/save_script.xpm | 227 ++++++
src/img/spline.xpm | 22 -
src/img/strip_bg.xpm | 59 ++
src/img/sum.xpm | 29 +
src/img/test.xpm | 21 -
src/img/todo.xpm | 21 -
src/img/tree.xpm | 20 -
src/img/undo_fit.xpm | 132 ++++
src/img/vertic.xpm | 24 -
src/img/whole.xpm | 26 -
src/img/zoom_all.xpm | 167 +++++
src/img/zoom_left.xpm | 164 +++++
src/img/zoom_mode.xpm | 158 +++++
src/img/zoom_prev.xpm | 171 +++++
src/img/zoom_right.xpm | 163 +++++
src/img/zoom_t.xpm | 20 -
src/img/zoom_vert.xpm | 168 +++++
src/wx_dlg.cpp | 29 +-
src/wx_dlg.h | 7 +-
src/wx_gui.cpp | 215 +++---
src/wx_gui.h | 5 +-
src/wx_mplot.cpp | 4 +-
src/wx_plot.cpp | 6 +-
106 files changed, 6098 insertions(+), 3336 deletions(-)
diff --cc Makefile.in
index d0aa645,f047cfb..7b9cf0b
--- a/Makefile.in
+++ b/Makefile.in
@@@ -148,27 -189,9 +189,9 @@@ target_alias = @target_alias
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-
EXTRA_DIST = fityk.spec fityk.iss fityk.url
AUTOMAKE_OPTIONS = dist-zip dist-bzip2
--SUBDIRS = @DOC@ src samples config 3rdparty
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = fityk.spec fityk.iss
- DIST_SOURCES =
-
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
- DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS TODO aclocal.m4 \
- config.h.in configure configure.ac fityk.iss.in fityk.spec.in \
- install-sh missing mkinstalldirs
- DIST_SUBDIRS = $(SUBDIRS)
++SUBDIRS = @DOC@ src samples config
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --cc configure
index a2a859d,2912236..14e321c
--- a/configure
+++ b/configure
@@@ -1876,7 -1912,7 +1912,7 @@@ if test "$enable_optimization" = "yes"
LDFLAGS="-s $LDFLAGS"
fi
--CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/3rdparty"
++#CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/3rdparty"
# Check whether --enable-sharedwx or --disable-sharedwx was given.
@@@ -5105,7 -5290,7 +5290,7 @@@ f
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
@@@ -5686,7 -5871,7 +5871,7 @@@ d
"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" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --cc debian/changelog
index 334a336,0000000..e685887
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,0 +1,31 @@@
++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 7062c75,0000000..479cdcf
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 (>> 3.0.0), libwxgtk2.4-dev, libreadline4-dev
- Standards-Version: 3.6.1
++Build-Depends: debhelper (>> 3.0.0), libwxgtk2.4-dev, libreadline4-dev, libboost-dev
++Standards-Version: 3.6.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/watch
index 0000000,0000000..6b116cd
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=2
++ftp://heanet.dl.sourceforge.net/f/fi/fityk/ fityk-(.*)\.tar\.gz 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