[fityk] 34/45: Imported Debian patch 1.2.1-0.1
Stuart Prescott
stuart at debian.org
Sun Nov 6 23:35:33 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 3a0684034defa27f80a8f2c78fbcd6d5542f6849
Merge: 446be70 4c813cc
Author: Daniel Leidert <dleidert at debian.org>
Date: Wed Jan 1 23:44:22 2014 +0100
Imported Debian patch 1.2.1-0.1
INSTALL | 321 +-
Makefile.am | 62 +-
Makefile.in | 657 +-
NEWS | 43 +-
README | 8 +-
TODO | 79 +-
aclocal.m4 | 288 +-
build-aux/compile | 343 +
{config => build-aux}/config.guess | 258 +-
{config => build-aux}/config.sub | 209 +-
{config => build-aux}/depcomp | 190 +-
{config => build-aux}/install-sh | 29 +-
{config => build-aux}/ltmain.sh | 4038 ++--
{config => build-aux}/missing | 53 +-
{config => build-aux}/py-compile | 51 +-
{src/cli => cli}/gnuplot.cpp | 101 +-
{src/cli => cli}/gnuplot.h | 5 +-
cli/main.cpp | 350 +
config.h.in | 30 +-
configure | 8091 +++----
configure.ac | 290 +-
debian/changelog | 15 +
debian/control | 24 +-
debian/copyright | 2 +-
debian/dirs | 3 -
debian/install | 3 +
debian/links | 11 +-
debian/rules | 116 +-
debian/upstream | 15 +
doc/Makefile | 25 +
doc/Makefile.am | 117 -
doc/Makefile.in | 620 -
doc/conf.py | 20 +-
doc/data.rst | 46 +-
doc/fit.rst | 32 +-
doc/fityk.css | 29 +-
doc/fityk_ext.py | 27 +
doc/html/_images/eq_fwhm_icon.png | Bin 0 -> 386 bytes
doc/html/_images/eq_shape_icon.png | Bin 0 -> 655 bytes
.../23decadd8b245289f5fa993f2c99e0ac9cff56dc.png | Bin 1466 -> 1465 bytes
.../340fc244db3ba9529e48c3b43d3e3d1d56ab13ac.png | Bin 978 -> 980 bytes
.../3dd0773863fdeacd262d797c931a040801c71e90.png | Bin 1564 -> 1564 bytes
.../441e7ddea6580ae19be0583f35b648340340f789.png | Bin 1476 -> 1479 bytes
.../695f416425dbcafe8c762a1e8c533023350a525d.png | Bin 1738 -> 1738 bytes
.../727873d2cbeda3d30f41bee18cb2bf5ea1071fa1.png | Bin 650 -> 650 bytes
.../7508455f7c089e149392451dec57d771370d63ce.png | Bin 2753 -> 2754 bytes
.../75870e6ce52429cdac61f596a15826f179ae817e.png | Bin 427 -> 428 bytes
.../98327fe212a6e72966017a3e21780935b66080f8.png | Bin 1365 -> 1366 bytes
.../9f4a323840470c45eb00c5896ba579edc0f0799f.png | Bin 1908 -> 1909 bytes
.../9fabdcba50c720ea1ae42cd0b4f1d3eb5f367e56.png | Bin 1965 -> 1966 bytes
.../c224f922a1176ca851240223d573afca6e90ab38.png | Bin 0 -> 2033 bytes
.../d3e7d7cd926970086d34700ac3f979eac398132a.png | Bin 849 -> 848 bytes
.../e847b12d44bdb9991047fa3001a2d1f23a077769.png | Bin 1780 -> 1783 bytes
doc/html/_sources/data.txt | 46 +-
doc/html/_sources/fit.txt | 32 +-
doc/html/_sources/intro.txt | 13 +-
doc/html/_sources/lang.txt | 20 +-
doc/html/_sources/model.txt | 48 +-
doc/html/_sources/ref.txt | 180 +-
doc/html/_static/ajax-loader.gif | Bin 0 -> 673 bytes
doc/html/_static/basic.css | 16 +-
doc/html/_static/comment-bright.png | Bin 0 -> 3500 bytes
doc/html/_static/comment-close.png | Bin 0 -> 3578 bytes
doc/html/_static/comment.png | Bin 0 -> 3445 bytes
doc/html/_static/doctools.js | 10 +-
doc/html/_static/down-pressed.png | Bin 0 -> 368 bytes
doc/html/_static/down.png | Bin 0 -> 363 bytes
doc/html/_static/fityk.css | 29 +-
doc/html/_static/mouse16.png | Bin 0 -> 712 bytes
doc/html/_static/searchtools.js | 140 +-
doc/html/_static/sphinxdoc.css | 2 +-
doc/html/_static/underscore.js | 7 +
doc/html/_static/up-pressed.png | Bin 0 -> 372 bytes
doc/html/_static/up.png | Bin 0 -> 363 bytes
doc/html/_static/websupport.js | 808 +
doc/html/data.html | 75 +-
doc/html/fit.html | 48 +-
doc/html/fityk-manual.html | 24 +-
doc/html/getstarted.html | 33 +-
doc/html/intro.html | 35 +-
doc/html/lang.html | 39 +-
doc/html/model.html | 110 +-
doc/html/ref.html | 210 +-
doc/html/search.html | 18 +-
doc/html/searchindex.js | 2 +-
doc/index.rst | 56 +-
doc/intro.rst | 13 +-
doc/lang.rst | 20 +-
doc/layout.html | 7 +-
doc/model.rst | 48 +-
doc/ref.rst | 180 +-
fityk.iss | 8 +-
fityk.iss.in | 2 +-
fityk/CMPfit.cpp | 161 +
fityk/CMPfit.h | 35 +
{src => fityk}/GAfit.cpp | 81 +-
{src => fityk}/GAfit.h | 4 +-
{src => fityk}/LMfit.cpp | 70 +-
{src => fityk}/LMfit.h | 19 +-
fityk/Makefile.am | 91 +
fityk/Makefile.in | 1182 +
fityk/NLfit.cpp | 116 +
fityk/NLfit.h | 42 +
{src => fityk}/NMfit.cpp | 42 +-
{src => fityk}/NMfit.h | 6 +-
{src => fityk}/ast.cpp | 117 +-
{src => fityk}/ast.h | 19 +-
{src => fityk}/bfunc.cpp | 52 +-
{src => fityk}/bfunc.h | 8 +-
fityk/cmpfit/mpfit.c | 2295 ++
fityk/cmpfit/mpfit.h | 197 +
{src => fityk}/common.cpp | 4 +-
{src => fityk}/common.h | 223 +-
{src => fityk}/cparser.cpp | 108 +-
{src => fityk}/cparser.h | 10 +-
{src => fityk}/data.cpp | 149 +-
{src => fityk}/data.h | 37 +-
{src => fityk}/eparser.cpp | 126 +-
{src => fityk}/eparser.h | 18 +-
{src => fityk}/fit.cpp | 304 +-
{src => fityk}/fit.h | 34 +-
fityk/fityk.cpp | 516 +
fityk/fityk.h | 355 +
{src => fityk}/func.cpp | 59 +-
{src => fityk}/func.h | 34 +-
{src => fityk}/guess.cpp | 21 +-
{src => fityk}/guess.h | 9 +-
{src => fityk}/info.cpp | 268 +-
{src => fityk}/info.h | 9 +-
{src => fityk}/lexer.cpp | 14 +-
{src => fityk}/lexer.h | 3 +
{src => fityk}/logic.cpp | 61 +-
{src => fityk}/logic.h | 40 +-
{src => fityk}/mgr.cpp | 67 +-
{src => fityk}/mgr.h | 17 +-
{src => fityk}/model.cpp | 58 +-
{src => fityk}/model.h | 11 +-
{src => fityk}/numfuncs.cpp | 7 +-
{src => fityk}/numfuncs.h | 17 +-
{src => fityk}/runner.cpp | 181 +-
{src => fityk}/runner.h | 8 +-
{src => fityk}/settings.cpp | 44 +-
{src => fityk}/settings.h | 15 +-
fityk/swig/Fityk.pm | 584 +
fityk/swig/fityk.i | 194 +
fityk/swig/fityk.py | 1485 ++
{swig => fityk/swig}/fityk_lua.cpp | 3440 ++-
fityk/swig/fityk_perl.cpp | 10336 +++++++++
fityk/swig/fityk_python.cpp | 21474 +++++++++++++++++++
fityk/swig/fityk_ruby.cpp | 21095 ++++++++++++++++++
fityk/swig/java/java/ExecuteError.java | 42 +
fityk/swig/java/java/ExitRequestedException.java | 42 +
fityk/swig/java/java/Fityk.java | 190 +
fityk/swig/java/java/FitykModule.java | 20 +
fityk/swig/java/java/FitykModuleConstants.java | 14 +
fityk/swig/java/java/FitykModuleJNI.java | 103 +
fityk/swig/java/java/Point.java | 86 +
fityk/swig/java/java/PointVector.java | 78 +
fityk/swig/java/java/RealVector.java | 78 +
fityk/swig/java/java/SWIGTYPE_p_Ftk.java | 26 +
fityk/swig/java/java/SWIGTYPE_p_std__FILE.java | 26 +
...TYPE_p_std__vectorT_std__vectorT_realt_t_t.java | 26 +
fityk/swig/java/java/SyntaxError.java | 46 +
fityk/swig/java/java/fityk_java.cpp | 1997 ++
fityk/swig/java/java/invalid_argument.java | 42 +
fityk/swig/java/java/runtime_error.java | 42 +
fityk/swig/luarun.h | 1667 ++
{src => fityk}/tplate.cpp | 7 +-
{src => fityk}/tplate.h | 9 +-
fityk/transform.cpp | 248 +
fityk/transform.h | 22 +
{src => fityk}/udf.cpp | 53 +-
{src => fityk}/udf.h | 17 +-
fityk/ui.cpp | 613 +
fityk/ui.h | 115 +
fityk/ui_api.cpp | 246 +
fityk/ui_api.h | 96 +
{src => fityk}/var.cpp | 71 +-
{src => fityk}/var.h | 82 +-
{src => fityk}/view.cpp | 8 +-
{src => fityk}/view.h | 5 +-
{src => fityk}/vm.cpp | 34 +-
{src => fityk}/vm.h | 15 +-
{src => fityk}/voigt.cpp | 3 +-
{src => fityk}/voigt.h | 0
m4/ax_lib_readline.m4 | 107 +
m4/ax_lua.m4 | 77 +-
m4/ax_pkg_swig.m4 | 6 +-
m4/ax_python_devel.m4 | 10 +-
m4/libtool.m4 | 2046 +-
m4/ltoptions.m4 | 13 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 12 +-
m4/readline.m4 | 56 -
samples/Makefile.am | 19 -
samples/Makefile.in | 592 -
samples/README | 7 +-
samples/SiC_Zn.fit | 4 +-
samples/cfityk.py | 187 +
samples/enso.fit | 4 +-
samples/hello.c | 39 +
samples/hello.cc | 4 +-
samples/hello.java | 60 +
samples/hello.lua | 63 +-
samples/hello.py | 18 +-
samples/hello.rb | 39 +
samples/nacl01.fit | 4 +-
samples/test_syntax.fit | 28 +-
src/Makefile.am | 23 -
src/Makefile.in | 798 -
src/cli/Makefile.am | 7 -
src/cli/Makefile.in | 567 -
src/cli/main.cpp | 598 -
src/fityk.cpp | 307 -
src/fityk.h | 200 -
src/ui.cpp | 315 -
src/ui.h | 133 -
src/wxgui/Makefile.in | 1367 --
src/wxgui/about.cpp | 151 -
src/wxgui/dialogs.cpp | 277 -
src/wxgui/dialogs.h | 61 -
src/wxgui/dload.cpp | 470 -
src/wxgui/dload.h | 59 -
src/wxgui/img/open.xpm | 200 -
src/wxgui/pplot.cpp | 147 -
src/wxgui/pplot.h | 43 -
src/wxgui/print.cpp | 404 -
src/wxgui/sdebug.cpp | 237 -
src/wxgui/sdebug.h | 37 -
swig/Makefile.am | 48 -
swig/Makefile.in | 706 -
swig/fityk.i | 125 -
swig/fityk.py | 736 -
swig/fityk_python.cpp | 12555 -----------
{src/wxgui => wxgui}/Makefile.am | 26 +-
wxgui/Makefile.in | 1476 ++
wxgui/about.cpp | 86 +
{src/wxgui => wxgui}/about.h | 7 -
{src/wxgui => wxgui}/aplot.cpp | 20 +-
{src/wxgui => wxgui}/aplot.h | 2 +-
{src/wxgui => wxgui}/app.cpp | 151 +-
{src/wxgui => wxgui}/app.h | 10 +-
{src/wxgui => wxgui}/atomtables.c | 0
{src/wxgui => wxgui}/atomtables.h | 0
{src/wxgui => wxgui}/bgm.cpp | 53 +-
{src/wxgui => wxgui}/bgm.h | 11 +-
{src/wxgui => wxgui}/ceria.cpp | 0
{src/wxgui => wxgui}/ceria.h | 0
{src/wxgui => wxgui}/cmn.cpp | 33 +-
{src/wxgui => wxgui}/cmn.h | 22 +-
{src/wxgui => wxgui}/dataedit.cpp | 15 +-
{src/wxgui => wxgui}/dataedit.h | 4 +-
{src/wxgui => wxgui}/datatable.cpp | 75 +-
{src/wxgui => wxgui}/datatable.h | 9 +-
{src/wxgui => wxgui}/defmgr.cpp | 17 +-
{src/wxgui => wxgui}/defmgr.h | 10 +-
wxgui/dload.cpp | 123 +
wxgui/dload.h | 30 +
wxgui/editor.cpp | 343 +
wxgui/editor.h | 41 +
{src/wxgui => wxgui}/exportd.cpp | 40 +-
{src/wxgui => wxgui}/exportd.h | 6 +
{src/wxgui => wxgui}/fancyrc.cpp | 0
{src/wxgui => wxgui}/fancyrc.h | 2 +-
{src/wxgui => wxgui}/fitinfo.cpp | 40 +-
{src/wxgui => wxgui}/fitinfo.h | 3 +-
wxgui/fitrun.cpp | 153 +
wxgui/fitrun.h | 31 +
{src/wxgui => wxgui}/frame.cpp | 1020 +-
{src/wxgui => wxgui}/frame.h | 97 +-
{src/wxgui => wxgui}/gradient.cpp | 2 +-
{src/wxgui => wxgui}/gradient.h | 0
{src/wxgui => wxgui}/history.cpp | 19 +-
{src/wxgui => wxgui}/history.h | 6 +-
{src/wxgui => wxgui}/img/active_mode.xpm | 0
{src/wxgui => wxgui}/img/add.xpm | 0
{src/wxgui => wxgui}/img/add_peak.xpm | 0
{src/wxgui => wxgui}/img/addpeak_mode.xpm | 0
{src/wxgui => wxgui}/img/bg_mode.xpm | 0
{src/wxgui => wxgui}/img/book16.h | 0
{src/wxgui => wxgui}/img/close.xpm | 0
{src/wxgui => wxgui}/img/color.xpm | 0
{src/wxgui => wxgui}/img/colorsel.xpm | 0
{src/wxgui => wxgui}/img/cont_fit.xpm | 0
{src/wxgui => wxgui}/img/convert.xpm | 0
{src/wxgui => wxgui}/img/copyfunc.xpm | 0
{src/wxgui => wxgui}/img/correction.h | 0
{src/wxgui => wxgui}/img/dpsize.xpm | 0
{src/wxgui => wxgui}/img/edit_data.xpm | 0
{src/wxgui => wxgui}/img/editf.xpm | 0
{src/wxgui => wxgui}/img/editor16.h | 0
wxgui/img/eq_fwhm.h | 33 +
wxgui/img/eq_shape.h | 57 +
{src/wxgui => wxgui}/img/exec_down.xpm | 0
{src/wxgui => wxgui}/img/exec_selected.xpm | 0
{src/wxgui => wxgui}/img/export16.h | 0
{src/wxgui => wxgui}/img/fileopen16.h | 0
{src/wxgui => wxgui}/img/filereload16.h | 0
{src/wxgui => wxgui}/img/filesaveas16.h | 0
{src/wxgui => wxgui}/img/filter.xpm | 0
{src/wxgui => wxgui}/img/fityk.ico | Bin
{src/wxgui => wxgui}/img/fityk.xpm | 0
{src/wxgui => wxgui}/img/fityk96.h | 0
{src/wxgui => wxgui}/img/function16.h | 0
{src/wxgui => wxgui}/img/goto.xpm | 0
{src/wxgui => wxgui}/img/image16.h | 0
{src/wxgui => wxgui}/img/info16.h | 0
{src/wxgui => wxgui}/img/info32.h | 0
{src/wxgui => wxgui}/img/lock.xpm | 0
{src/wxgui => wxgui}/img/lock_open.xpm | 0
{src/wxgui => wxgui}/img/manual.xpm | 0
{src/wxgui => wxgui}/img/mouse16.h | 0
{src/wxgui => wxgui}/img/ok24.h | 0
{src/wxgui => wxgui}/img/open_data.xpm | 0
{src/wxgui => wxgui}/img/open_data_custom.xpm | 0
{src/wxgui => wxgui}/img/peak32.h | 0
{src/wxgui => wxgui}/img/powdifpat.ico | Bin
{src/wxgui => wxgui}/img/powdifpat16.xpm | 0
{src/wxgui => wxgui}/img/powdifpat48.xpm | 0
{src/wxgui => wxgui}/img/preferences16.h | 0
{src/wxgui => wxgui}/img/radiation32.h | 0
{src/wxgui => wxgui}/img/recordmacro16.h | 0
{src/wxgui => wxgui}/img/redo16.h | 0
{src/wxgui => wxgui}/img/reload16.h | 0
{src/wxgui => wxgui}/img/rename.xpm | 0
{src/wxgui => wxgui}/img/revert16.h | 0
{src/wxgui => wxgui}/img/right_pane.xpm | 0
{src/wxgui => wxgui}/img/rubik32.h | 0
{src/wxgui => wxgui}/img/run16.h | 0
{src/wxgui => wxgui}/img/run32.h | 0
{src/wxgui => wxgui}/img/run_fit.xpm | 0
{src/wxgui => wxgui}/img/run_script.xpm | 0
{src/wxgui => wxgui}/img/runmacro16.h | 0
{src/wxgui => wxgui}/img/save.xpm | 0
{src/wxgui => wxgui}/img/save_as.xpm | 0
{src/wxgui => wxgui}/img/save_data.xpm | 0
{src/wxgui => wxgui}/img/save_script.xpm | 0
{src/wxgui => wxgui}/img/sbprefs.h | 0
{src/wxgui => wxgui}/img/shiftup.xpm | 0
{src/wxgui => wxgui}/img/sizes32.h | 0
{src/wxgui => wxgui}/img/stopmacro16.h | 0
{src/wxgui => wxgui}/img/strip_bg.xpm | 0
{src/wxgui => wxgui}/img/sum.xpm | 0
{src/wxgui => wxgui}/img/undo16.h | 0
{src/wxgui => wxgui}/img/undo_fit.xpm | 0
{src/wxgui => wxgui}/img/unused.xpm | 0
{src/wxgui => wxgui}/img/web16.h | 0
{src/wxgui => wxgui}/img/xyconvert.ico | Bin
{src/wxgui => wxgui}/img/xyconvert16.xpm | 0
{src/wxgui => wxgui}/img/xyconvert48.xpm | 0
{src/wxgui => wxgui}/img/zoom-fit16.h | 0
{src/wxgui => wxgui}/img/zoom_all.xpm | 0
{src/wxgui => wxgui}/img/zoom_left.xpm | 0
{src/wxgui => wxgui}/img/zoom_mode.xpm | 0
{src/wxgui => wxgui}/img/zoom_prev.xpm | 0
{src/wxgui => wxgui}/img/zoom_right.xpm | 0
{src/wxgui => wxgui}/img/zoom_up.xpm | 0
{src/wxgui => wxgui}/img/zoom_vert.xpm | 0
{src/wxgui => wxgui}/img/zshift.xpm | 0
{src/wxgui => wxgui}/inputline.cpp | 8 +-
{src/wxgui => wxgui}/inputline.h | 0
{src/wxgui => wxgui}/listptxt.cpp | 18 +-
{src/wxgui => wxgui}/listptxt.h | 2 +-
wxgui/merge.cpp | 102 +
wxgui/merge.h | 27 +
wxgui/modelinfo.cpp | 168 +
wxgui/modelinfo.h | 32 +
{src/wxgui => wxgui}/mplot.cpp | 314 +-
{src/wxgui => wxgui}/mplot.h | 43 +-
{src/wxgui => wxgui}/plot.cpp | 261 +-
{src/wxgui => wxgui}/plot.h | 42 +-
wxgui/plotpane.cpp | 180 +
wxgui/plotpane.h | 54 +
{src/wxgui => wxgui}/powdifpat.cpp | 91 +-
{src/wxgui => wxgui}/powdifpat.h | 4 +-
{src/wxgui => wxgui}/powdifpat.rc | 0
wxgui/print.cpp | 261 +
{src/wxgui => wxgui}/print.h | 37 +-
{src/wxgui => wxgui}/setdlg.cpp | 45 +-
{src/wxgui => wxgui}/setdlg.h | 9 +-
{src/wxgui => wxgui}/sgchooser.cpp | 0
{src/wxgui => wxgui}/sgchooser.h | 0
{src/wxgui => wxgui}/sgtables.c | 0
{src/wxgui => wxgui}/sgtables.h | 0
{src/wxgui => wxgui}/sidebar.cpp | 149 +-
{src/wxgui => wxgui}/sidebar.h | 6 +-
{src/wxgui => wxgui}/statbar.cpp | 6 +-
{src/wxgui => wxgui}/statbar.h | 5 +-
src/wxgui/pane.cpp => wxgui/textpane.cpp | 30 +-
src/wxgui/pane.h => wxgui/textpane.h | 14 +-
{src/wxgui => wxgui}/uplot.cpp | 49 +-
{src/wxgui => wxgui}/uplot.h | 8 +-
{src/wxgui => wxgui}/winres.rc | 0
{src/wxgui => wxgui}/xybrowser.cpp | 412 +-
wxgui/xybrowser.h | 66 +
{src/wxgui => wxgui}/xyconvert.rc | 0
396 files changed, 88964 insertions(+), 32551 deletions(-)
diff --cc debian/changelog
index c10d1e8,0000000..cee62bf
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,267 -1,0 +1,282 @@@
++fityk (1.2.1-0.1) unstable; urgency=low
++
++ * Non-maintainer upload.
++ * New upstream release (closes: #703150).
++ * debian/control (Standards-Version): Bumped to 3.9.5.
++ (Build-Depends): Replaced WX 2.8 by version 3.0. Added autotools-dev, lua.
++ * debian/copyright: Minor update.
++ * debian/dirs: Dropped.
++ * debian/install: Added.
++ * debian/links: Added link for samples.
++ * debian/rules: Rewritten for dh 7 and enabled hardening.
++ * debian/upstream: Added.
++
++ -- Daniel Leidert <dleidert at debian.org> Wed, 01 Jan 2014 23:44:22 +0100
++
+fityk (0.9.8-3) unstable; urgency=low
+
+ * Correct home page URL
+
+ -- Carlo Segre <segre at debian.org> Sat, 19 Nov 2011 15:10:51 -0600
+
+fityk (0.9.8-2) unstable; urgency=low
+
+ * Remove Suggests dependency on menu (Closes: #647368)
+ * Add build-arch and build-indep targets in debian/rules
+
+ -- Carlo Segre <segre at debian.org> Sat, 12 Nov 2011 14:58:15 -0600
+
+fityk (0.9.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Link manual in /usr/share/fityk/html to
+ /usr/share/doc/fityk/html (Closes: #627331)
+ * Upgrade to Standards-Version 3.9.2 (no changes)
+
+ -- Carlo Segre <segre at debian.org> Sat, 11 Jun 2011 14:51:15 -0500
+
+fityk (0.9.7-1) unstable; urgency=low
+
+ * New upstream release (Closes: #619385)
+ * Update URLs in debian/control and debian/copyright
+ * Update debian/watch to point to github
+ * Upgrade for Standards-Version 3.9.1 (no changes)
+
+ -- Carlo Segre <segre at debian.org> Thu, 24 Mar 2011 02:00:20 -0500
+
+fityk (0.9.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Upgrade to Standards-Version 3.9.0 (no changes)
+
+ -- Carlo Segre <segre at debian.org> Fri, 02 Jul 2010 13:35:24 -0500
+
+fityk (0.9.3~r750-1) unstable; urgency=low
+
+ * New upstream prerelease with bugfixes
+
+ -- Carlo Segre <segre at debian.org> Fri, 18 Jun 2010 00:58:26 -0500
+
+fityk (0.9.3~r740-1) unstable; urgency=low
+
+ * Prerelease version with powder diffraction plugin
+ * Make sure sample files are in right location and do not include
+ the scripts for now.
+
+ -- Carlo Segre <segre at debian.org> Sun, 06 Jun 2010 22:52:48 -0500
+
+fityk (0.9.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Add Build-Dep to xylib-dev, boost libraries as these are no longer
+ shipped with the source.
+ * Add Build-Dep to zlib1g-dev, libbz2-dev libraries
+ * Upgrade to Standards-Version 3.8.4 (no changes)
+ * Move to package format 3.0 (quilt)
+
+ -- Carlo Segre <segre at debian.org> Sun, 09 May 2010 18:27:20 -0500
+
+fityk (0.9.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Add --disable-xyconvert flag until wxwidgets 2.9 is in Debian
+
+ -- Carlo Segre <segre at debian.org> Tue, 09 Feb 2010 23:14:36 -0600
+
+fityk (0.8.9-1) unstable; urgency=low
+
+ * New upstream release
+ * Update Standards-Version to 3.8.3 (no changes)
+ * Remove libreadline5-dev Build-Dep (see Bug #553754)
+ * Clean up all lintian errors:
+ - add ${misc:Depends} in all binary packages
+ - add dependence to libjs-jquery and make symlink to jquery.js
+
+ -- Carlo Segre <segre at debian.org> Sun, 15 Nov 2009 21:52:50 -0600
+
+fityk (0.8.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Compiltion tested with gcc-4.4 and g++-4.4
+ * Upgrade to Standards-Version 3.8.2 (no changes).
+ * Added --with-xylibs --with-samples configuration flags.
+ * Removed patch of "#include <cstring>" from src/ui.cpp.
+ * Insert Education top level menu item in *.desktop file
+ NOTE: This is not the right solution but conforms to the freedesktop.org
+ standard. KDE and Gnome provide a "Science" top level menu through
+ their own configuration files. XFCE4 currently does not but can be
+ configured to do so. See README.Debian for this information.
+
+ -- Carlo Segre <segre at debian.org> Sat, 04 Jul 2009 14:58:31 -0500
+
+fityk (0.8.6-3) unstable; urgency=low
+
+ * Removed leftover debian/fityk.desktop (Closes: #500090) - thanks
+ to David Futcher <bobbo at ubuntu.com>.
+ * Restore sourceforge redirector in debian/watch.
+ * Fix reference to GPL-2.
+
+ -- Carlo Segre <segre at debian.org> Sun, 12 Apr 2009 13:55:45 -0500
+
+fityk (0.8.6-2) unstable; urgency=high
+
+ * Compile against libwxgtk2.8-dev so Help/Manual works (Closes: #499734).
+ * Upgrade to Standards-Version 3.8.0 (no changes).
+
+ -- Carlo Segre <segre at debian.org> Mon, 22 Sep 2008 15:09:25 -0500
+
+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 debian/control
index 04db5ae,0000000..02f7eca
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,0 +1,39 @@@
+Source: fityk
+Section: science
+Priority: optional
+Maintainer: Carlo Segre <segre at debian.org>
- Build-Depends: debhelper (>> 7), libwxgtk2.8-dev (>> 2.8.0),
- libreadline-dev, libxy-dev, libboost-dev, zlib1g-dev, libbz2-dev
++Build-Depends: autotools-dev (>> 20100122.1~),
++ debhelper (>> 7),
++ libboost-dev,
++ libbz2-dev,
++ liblua5.1-0-dev,
++ libreadline-dev,
++ libwxgtk3.0-dev,
++ libxy-dev,
++ zlib1g-dev
+Homepage: http://fityk.nieto.pl/
- Standards-Version: 3.9.2
++Standards-Version: 3.9.5
+
+Package: fityk
+Architecture: any
- Tag: field::chemistry, field::physics, implemented-in::c++, interface::x11,
- role::program, scope::utility, uitoolkit::wxwidgets, x11::application
- Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery
++Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: gnuplot
++Suggests: libjs-sphinxdoc
+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
++ 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.
++ .
++ libjs-sphinxdoc is necessary for the Javascript stuff in the documentation.
diff --cc debian/copyright
index 8133e44,0000000..b5f8b7c
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,24 -1,0 +1,24 @@@
+This package was debianized by Carlo Segre <segre at iit.edu> on
+Wed, 23 Jul 2003 23:32:33 -0500.
+
+Project homepage
+http://fityk.nieto.pl
+
+Downloaded from SourceForge
+https://github.com/wojdyr/fityk/downloads
+
+Upstream Author: Marcin Wojdyr <wojdyr at gmail.com>
+
- Copyright 2003-2011 Marcin Wojdyr
++Copyright 2003-2012 Marcin Wojdyr
+
+This is free software; you can redistribute it and/or modify it under the
+terms of version 2 of the GNU General Public License as published by the
+Free Software Foundation.
+
+This is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+In Debian GNU/Linux, the full text of the GPL may be found in:
+/usr/share/common-licenses/GPL-2
diff --cc debian/install
index 0000000,0000000..ee5e8a1
new file mode 100644
--- /dev/null
+++ b/debian/install
@@@ -1,0 -1,0 +1,3 @@@
++wxgui/img/fityk.xpm usr/share/pixmaps/
++fityk.desktop usr/share/applications/
++
diff --cc debian/links
index 98ae6c3,0000000..883448a
mode 100644,000000..100644
--- a/debian/links
+++ b/debian/links
@@@ -1,3 -1,0 +1,8 @@@
- usr/share/man/man1/fityk.1.gz usr/share/man/man1/cfityk.1.gz
- usr/share/javascript//jquery/jquery.js usr/share/fityk/html/_static/jquery.js
- usr/share/fityk/html usr/share/doc/fityk/html
++usr/share/man/man1/fityk.1.gz usr/share/man/man1/cfityk.1.gz
++usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/fityk/html/_static/doctools.js
++usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/fityk/html/_static/searchtools.js
++usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/fityk/html/_static/jquery.js
++usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/fityk/html/_static/underscore.js
++usr/share/javascript/sphinxdoc/1.0/websupport.js usr/share/fityk/html/_static/websupport.js
++usr/share/fityk/html usr/share/doc/fityk/html
++usr/share/fityk/samples usr/share/doc/fityk/examples
diff --cc debian/rules
index a91b65f,0000000..e4d1030
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,95 -1,0 +1,29 @@@
+#!/usr/bin/make -f
+
- 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-shared --enable-static \
- --disable-xyconvert --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
- build: build-arch build-indep
-
- build-arch: build-stamp
-
- build-indep: 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
- [ ! -f Makefile ] || $(MAKE) distclean
-
-
- dh_clean
-
- install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/fityk.
- $(MAKE) install prefix=$(CURDIR)/debian/fityk/usr
- mkdir -p $(CURDIR)/debian/fityk/usr/share/pixmaps
- cp src/wxgui/img/fityk.xpm $(CURDIR)/debian/fityk/usr/share/pixmaps/
- dh_install fityk.desktop usr/share/applications/
- # Move samples into documentation directory. Since the shared
- # libraries are not built, do not install the C, lua and python
- # test scripts. If libfityk is built as a standalone library
- # then the scripts should be installed.
- 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/
- # Remove static libraries and headers for now
- rm -rf $(CURDIR)/debian/fityk/usr/lib
- rm -rf $(CURDIR)/debian/fityk/usr/include
- # Remove jquery.js and use the Debian packages instead
- rm -rf $(CURDIR)/debian/fityk/usr/share/fityk/html/_static/jquery.js
-
- # 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
++CPPFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) -I/usr/include/lua5.1
++CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS)
++CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS ?= -lstdc++ $(shell dpkg-buildflags --get LDFLAGS) # -Wl,--as-needed
++
++%:
++ dh $@ --with autotools_dev --parallel
++
++override_dh_auto_configure:
++ dh_auto_configure -- --disable-shared --enable-static \
++ --disable-xyconvert --with-lua-suffix=5.1 \
++ CPPFLAGS="$(CPPFLAGS)" \
++ CFLAGS="$(CFLAGS)" \
++ CXXFLAGS="$(CXXFLAGS)" \
++ LDFLAGS="$(LDFLAGS)"
++
++override_dh_auto_install:
++ dh_auto_install
++ $(RM) -r $(CURDIR)/debian/fityk/usr/lib \
++ $(CURDIR)/debian/fityk/usr/include \
++ $(CURDIR)/debian/fityk/usr/share/fityk/html/_static/*.js
++
++override_dh_installchangelogs:
+ 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
++override_dh_compress:
++ dh_compress --exclude=.dat --exclude=.fit
diff --cc debian/upstream
index 0000000,0000000..ceb323c
new file mode 100644
--- /dev/null
+++ b/debian/upstream
@@@ -1,0 -1,0 +1,15 @@@
++Name: Fityk
++Homepage: http://fityk.nieto.pl/
++Contact: wojdyr at gmail.com
++Reference:
++ - Author: M. Wojdyr
++ Title: "Fityk: a general-purpose peak fitting program"
++ Journal: J. Appl. Cryst.
++ Year: 2010
++ Volume: 43
++ Number: 5
++ Pages: 1126-1128
++ URL: http://scripts.iucr.org/cgi-bin/paper?S0021889810030499
++ eprint: http://www.unipress.waw.pl/fityk/fityk-JAC-10-reprint.pdf
++ DOI: 10.1107/S0021889810030499
++Repository-Browse: https://github.com/wojdyr/fityk
--
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