[fityk] 24/45: Imported Debian patch 0.8.9-1

Stuart Prescott stuart at debian.org
Sun Nov 6 23:35:31 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 09d7168c80262f62fead432b2b0021126fd891e6
Merge: b03fba5 002b2e1
Author: Carlo Segre <segre at debian.org>
Date:   Sun Nov 15 21:52:50 2009 -0600

    Imported Debian patch 0.8.9-1

 NEWS                                               |   16 +-
 TODO                                               |   23 +-
 configure                                          |  158 +-
 configure.ac                                       |   22 +-
 debian/changelog                                   |   11 +
 debian/control                                     |   10 +-
 debian/docs                                        |    1 -
 debian/links                                       |    1 +
 debian/rules                                       |    9 +-
 doc/Makefile.am                                    |  128 +-
 doc/Makefile.in                                    |  389 +--
 doc/README                                         |   12 -
 doc/appendix.rst                                   |  218 ++
 doc/conf.py                                        |   57 +
 doc/extensions.rst                                 |  181 ++
 doc/fityk-manual.rst                               |   17 +
 doc/fityk.1                                        |    2 +-
 doc/fitykhelp.html                                 | 1780 ------------
 doc/fitykhelp.xml                                  | 2852 --------------------
 doc/fitykhelp_img/2theta.png                       |  Bin 361 -> 0 bytes
 doc/fitykhelp_img/LoweMa.png                       |  Bin 1769 -> 0 bytes
 doc/fitykhelp_img/Makefile.am                      |   12 -
 doc/fitykhelp_img/Makefile.in                      |  431 ---
 doc/fitykhelp_img/a3pearson.png                    |  Bin 1286 -> 0 bytes
 doc/fitykhelp_img/a3psvoigt.png                    |  Bin 1031 -> 0 bytes
 doc/fitykhelp_img/chi2.png                         |  Bin 2860 -> 0 bytes
 doc/fitykhelp_img/doniachs.png                     |  Bin 2921 -> 0 bytes
 doc/fitykhelp_img/emg.png                          |  Bin 3886 -> 0 bytes
 doc/fitykhelp_img/gauss_example.png                |  Bin 1906 -> 0 bytes
 doc/fitykhelp_img/gaussian.png                     |  Bin 2362 -> 0 bytes
 doc/fitykhelp_img/gaussiana.png                    |  Bin 3021 -> 0 bytes
 doc/fitykhelp_img/lorentzian.png                   |  Bin 1441 -> 0 bytes
 doc/fitykhelp_img/lorentziana.png                  |  Bin 1845 -> 0 bytes
 doc/fitykhelp_img/modtchpv.png                     |  Bin 8666 -> 0 bytes
 doc/fitykhelp_img/note.png                         |  Bin 386 -> 0 bytes
 doc/fitykhelp_img/pearson7.png                     |  Bin 2374 -> 0 bytes
 doc/fitykhelp_img/pearson7a.png                    |  Bin 5814 -> 0 bytes
 doc/fitykhelp_img/polynom5.png                     |  Bin 1602 -> 0 bytes
 doc/fitykhelp_img/pseudo_voigt.png                 |  Bin 4098 -> 0 bytes
 doc/fitykhelp_img/pseudo_voigta.png                |  Bin 5183 -> 0 bytes
 doc/fitykhelp_img/sigma.png                        |  Bin 211 -> 0 bytes
 doc/fitykhelp_img/splitgaussian.png                |  Bin 6861 -> 0 bytes
 doc/fitykhelp_img/splitpearson7.png                |  Bin 6829 -> 0 bytes
 doc/fitykhelp_img/sum_f.png                        |  Bin 758 -> 0 bytes
 doc/fitykhelp_img/sum_f_x_z.png                    |  Bin 1555 -> 0 bytes
 doc/fitykhelp_img/voigt.png                        |  Bin 2994 -> 0 bytes
 doc/fitykhelp_img/voigt2.png                       |  Bin 4897 -> 0 bytes
 doc/fitykhelp_img/voigta.png                       |  Bin 3116 -> 0 bytes
 doc/fitykhelp_img/w_1_sigma.png                    |  Bin 687 -> 0 bytes
 doc/fitykhelp_img/z_x_a.png                        |  Bin 1039 -> 0 bytes
 doc/fo.xsl                                         |   71 -
 doc/getstarted.rst                                 |  219 ++
 doc/hh-mod.xsl                                     |   24 -
 doc/html.css                                       |   63 -
 doc/html/_images/fityk076.png                      |  Bin 0 -> 75330 bytes
 .../19f15eacccc345c3179259320491956f3f23887a.png   |  Bin 0 -> 1551 bytes
 .../1ab39d761413804680d26d972381f028001562f5.png   |  Bin 0 -> 188 bytes
 .../23decadd8b245289f5fa993f2c99e0ac9cff56dc.png   |  Bin 0 -> 1464 bytes
 .../349202f044a9aca8885d8084005ea099f1816b94.png   |  Bin 0 -> 820 bytes
 .../412787c048e28774dc63fc27db42dc52ca858de7.png   |  Bin 0 -> 190 bytes
 .../441e7ddea6580ae19be0583f35b648340340f789.png   |  Bin 0 -> 1578 bytes
 .../486938d1819df5972cb80ef2d101517b20412366.png   |  Bin 0 -> 181 bytes
 .../566b01428cbc7f85e5dcac822761913d6fd48795.png   |  Bin 0 -> 465 bytes
 .../572b65ebc3f438b176b4ca4a890799f2f72564af.png   |  Bin 0 -> 205 bytes
 .../5e97a8af68fbc8e357d3ee0eba452022b06c1875.png   |  Bin 0 -> 206 bytes
 .../61c594c97b61f72af93af4e61894b3f16a3bbb30.png   |  Bin 0 -> 214 bytes
 .../695f416425dbcafe8c762a1e8c533023350a525d.png   |  Bin 0 -> 1810 bytes
 .../6e4754d11ef093459abaf1935c69be98b7cf1430.png   |  Bin 0 -> 628 bytes
 .../707fc7dbf98d8f4f39c6bdf3f6c025ed948789c9.png   |  Bin 0 -> 907 bytes
 .../727873d2cbeda3d30f41bee18cb2bf5ea1071fa1.png   |  Bin 0 -> 714 bytes
 .../7508455f7c089e149392451dec57d771370d63ce.png   |  Bin 0 -> 2681 bytes
 .../7532b41a34c9ca592694135d1de65eeb8d9ce036.png   |  Bin 0 -> 183 bytes
 .../7567e40901ed423f42f5fc972bca0fd2d311ec40.png   |  Bin 0 -> 1342 bytes
 .../75870e6ce52429cdac61f596a15826f179ae817e.png   |  Bin 0 -> 420 bytes
 .../8863e0082a6f43362818a581cde27eaeced7fe3a.png   |  Bin 0 -> 393 bytes
 .../98327fe212a6e72966017a3e21780935b66080f8.png   |  Bin 0 -> 1414 bytes
 .../9e9c8a0fb6a92d4c3f969ab7a959a80f3069e3c9.png   |  Bin 0 -> 1118 bytes
 .../9f4a323840470c45eb00c5896ba579edc0f0799f.png   |  Bin 0 -> 1882 bytes
 .../9fabdcba50c720ea1ae42cd0b4f1d3eb5f367e56.png   |  Bin 0 -> 1968 bytes
 .../a1f49d0ef1ed40eddc5de7055dc1378db1e4a95c.png   |  Bin 0 -> 1732 bytes
 .../a61c1e51680e27d35d05bebed87d474972fc70bd.png   |  Bin 0 -> 227 bytes
 .../bcdaf43e7130e8f85d7721440139a9481b23e631.png   |  Bin 0 -> 731 bytes
 .../c104a975652392e8192a26551dc776a5fbdcf9c7.png   |  Bin 0 -> 1444 bytes
 .../c2ec895a1a42f04814ac1e370c4b8ca8fb702167.png   |  Bin 0 -> 2122 bytes
 .../ce4588fd900d02afcbd260bc07f54cce49a7dc4a.png   |  Bin 0 -> 182 bytes
 .../d3d29774850d1fa81d750fef3ed9b65ee66c524e.png   |  Bin 0 -> 986 bytes
 .../d3e7d7cd926970086d34700ac3f979eac398132a.png   |  Bin 0 -> 833 bytes
 .../d953af3188b3c252a5220e76255e375ee0afaf07.png   |  Bin 0 -> 406 bytes
 .../db7ec4a5b3fa9a0f1eaefb781da25807d831f2c5.png   |  Bin 0 -> 289 bytes
 .../ee5c7c921b3334f6ecf58c241eeea42acf0ce71e.png   |  Bin 0 -> 200 bytes
 .../fa35d9fc104207e09a712110ac81612c5b279a6c.png   |  Bin 0 -> 172 bytes
 doc/html/_images/project-support.jpg               |  Bin 0 -> 3788 bytes
 doc/html/_sources/appendix.txt                     |  218 ++
 doc/html/_sources/extensions.txt                   |  181 ++
 doc/html/_sources/fityk-manual.txt                 |   17 +
 doc/html/_sources/getstarted.txt                   |  219 ++
 doc/html/_sources/index.txt                        |  154 ++
 doc/html/_sources/intro.txt                        |   70 +
 doc/html/_sources/ref.txt                          | 1591 +++++++++++
 doc/html/_static/basic.css                         |  405 +++
 doc/html/_static/contents.png                      |  Bin 0 -> 202 bytes
 doc/html/_static/doctools.js                       |  232 ++
 doc/html/_static/file.png                          |  Bin 0 -> 392 bytes
 doc/html/_static/fityk-banner.png                  |  Bin 0 -> 8525 bytes
 doc/html/_static/fityk.css                         |   11 +
 doc/html/_static/fityk.ico                         |  Bin 0 -> 326 bytes
 doc/html/_static/jquery.js                         |   32 +
 doc/html/_static/minus.png                         |  Bin 0 -> 199 bytes
 doc/html/_static/navigation.png                    |  Bin 0 -> 218 bytes
 doc/html/_static/plus.png                          |  Bin 0 -> 199 bytes
 doc/html/_static/pygments.css                      |   59 +
 doc/html/_static/searchtools.js                    |  476 ++++
 doc/html/_static/sphinxdoc.css                     |  323 +++
 doc/html/_static/unipress-button.png               |  Bin 0 -> 376 bytes
 doc/html/_static/wxwidgets_powered.png             |  Bin 0 -> 702 bytes
 doc/html/appendix.html                             |  253 ++
 doc/html/extensions.html                           |  257 ++
 doc/html/fityk-manual.html                         |  168 ++
 doc/html/getstarted.html                           |  313 +++
 doc/html/index.html                                |  173 ++
 doc/html/intro.html                                |  176 ++
 doc/html/ref.html                                  | 1495 ++++++++++
 doc/html/search.html                               |   97 +
 doc/html/searchindex.js                            |    1 +
 doc/index.rst                                      |  154 ++
 doc/intro.rst                                      |   70 +
 doc/layout.html                                    |   14 +
 doc/ref.rst                                        | 1591 +++++++++++
 fityk.desktop                                      |    7 +-
 fityk.iss                                          |   12 +-
 fityk.iss.in                                       |    6 +-
 python/Makefile                                    |   34 +-
 src/GAfit.cpp                                      |    4 +-
 src/LMfit.cpp                                      |   16 +-
 src/NMfit.cpp                                      |    6 +-
 src/cmd.cpp                                        |   26 +-
 src/cmd2.cpp                                       |   14 +-
 src/cmd2.h                                         |    3 +-
 src/cmd3.cpp                                       |   14 +-
 src/common.h                                       |    8 +-
 src/datatrans2.cpp                                 |   36 +-
 src/datatrans2.h                                   |    7 +-
 src/datatrans3.cpp                                 |    8 +-
 src/fit.cpp                                        |   75 +-
 src/fit.h                                          |   35 +-
 src/func.cpp                                       |   44 +-
 src/func.h                                         |    5 +-
 src/logic.cpp                                      |   18 +-
 src/logic.h                                        |   18 +-
 src/optional_suffix.h                              |    9 +-
 src/settings.cpp                                   |   17 +-
 src/settings.h                                     |   17 +-
 src/ui.cpp                                         |   16 +-
 src/ui.h                                           |   52 +-
 src/var.cpp                                        |    4 +-
 src/wxgui/Makefile.am                              |    4 +-
 src/wxgui/Makefile.in                              |    9 +-
 src/wxgui/aplot.cpp                                |   23 +-
 src/wxgui/app.cpp                                  |   25 +-
 src/wxgui/cmn.h                                    |    4 +-
 src/wxgui/dataedit.cpp                             |    6 +-
 src/wxgui/defmgr.cpp                               |    9 +-
 src/wxgui/dload.cpp                                |    4 +-
 src/wxgui/fitinfo.cpp                              |   84 +
 src/wxgui/fitinfo.h                                |   25 +
 src/wxgui/frame.cpp                                |   53 +-
 src/wxgui/frame.h                                  |    7 +-
 src/wxgui/mplot.cpp                                |   34 +-
 src/wxgui/plot.cpp                                 |    4 +-
 src/wxgui/plot.h                                   |    3 +-
 src/wxgui/pplot.cpp                                |   22 +-
 src/wxgui/pplot.h                                  |    4 +-
 src/wxgui/setdlg.cpp                               |   14 +-
 src/wxgui/setdlg.h                                 |    4 +-
 src/wxgui/sidebar.cpp                              |   27 +-
 src/wxgui/statbar.h                                |    4 +-
 src/wxgui/uplot.cpp                                |   69 +-
 src/wxgui/uplot.h                                  |   33 +-
 xylib/README                                       |    6 +-
 xylib/TODO                                         |    6 +
 180 files changed, 10541 insertions(+), 5910 deletions(-)

diff --cc debian/changelog
index 768f8fd,0000000..6d423e8
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,186 -1,0 +1,197 @@@
++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 fc14886,0000000..9c4f87a
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,32 @@@
 +Source: fityk
 +Section: science
 +Priority: optional
 +Maintainer: Carlo Segre <segre at debian.org>
- Build-Depends: debhelper (>> 5.0.0), libwxgtk2.8-dev (>> 2.8.0), libreadline5-dev
++Build-Depends: debhelper (>> 5.0.0), libwxgtk2.8-dev (>> 2.8.0), 
++   libreadline-dev
 +Homepage: http://www.unipress.waw.pl/fityk/
- Standards-Version: 3.8.2
++Standards-Version: 3.8.3
 +
 +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}
++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
 +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.
diff --cc debian/docs
index 1c1fee3,0000000..9ee92c3
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,4 -1,0 +1,3 @@@
 +README
 +debian/README.Debian
 +TODO
- doc/fitykhelp.html
diff --cc debian/links
index cbe4d90,0000000..d905e23
mode 100644,000000..100644
--- a/debian/links
+++ b/debian/links
@@@ -1,1 -1,0 +1,2 @@@
 +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
diff --cc debian/rules
index eab8189,0000000..253ee3f
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,87 -1,0 +1,88 @@@
 +#!/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 --with-xylib --with-samples	\
- 	  --enable-static --host=$(DEB_HOST_GNU_TYPE)		\
- 	  --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr 		\
++	./configure --disable-shared --with-xylib --with-samples \
++	  --enable-static --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
 +	[ ! -f Makefile ] || $(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 -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/
 +	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
 +	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 doc/fityk.1
index 709b726,709b726..dc40028
--- a/doc/fityk.1
+++ b/doc/fityk.1
@@@ -44,7 -44,7 +44,7 @@@ A user manual fo
  .B fityk
  and
  .B cfityk
--can be found in /usr/share/doc/fityk/fitykhelp.html.
++can be found in /usr/share/doc/fityk/html.
  .PP
  .SH OPTIONS
  .IP "-h, --help"
diff --cc python/Makefile
index 470163c,0000000..0ac0f57
mode 100644,000000..100644
--- a/python/Makefile
+++ b/python/Makefile
@@@ -1,586 -1,0 +1,586 @@@
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# python/Makefile.  Generated from Makefile.in by configure.
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008  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.
 +
 +
 +
 +
 +pkgdatadir = $(datadir)/fityk
 +pkglibdir = $(libdir)/fityk
 +pkgincludedir = $(includedir)/fityk
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +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 = python
 +DIST_COMMON = $(python_PYTHON) $(srcdir)/Makefile.am \
 +	$(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/config/ac_pkg_swig.m4 \
 +	$(top_srcdir)/config/ac_python_devel.m4 \
 +	$(top_srcdir)/config/libtool.m4 \
 +	$(top_srcdir)/config/ltoptions.m4 \
 +	$(top_srcdir)/config/ltsugar.m4 \
 +	$(top_srcdir)/config/ltversion.m4 \
 +	$(top_srcdir)/config/lt~obsolete.m4 \
 +	$(top_srcdir)/config/readline.m4 $(top_srcdir)/config/wxwin.m4 \
 +	$(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/config.h
 +CONFIG_CLEAN_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 +am__installdirs = "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"
 +pyexecLTLIBRARIES_INSTALL = $(INSTALL)
 +LTLIBRARIES = $(pyexec_LTLIBRARIES)
 +_fityk_la_DEPENDENCIES = ../src/libfityk.la
 +am__objects_1 =
 +am__fityk_la_OBJECTS = _fityk_la-fityk_wrap.lo $(am__objects_1)
 +_fityk_la_OBJECTS = $(am__fityk_la_OBJECTS)
 +_fityk_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(_fityk_la_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I. -I$(top_builddir)
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +	$(LDFLAGS) -o $@
 +SOURCES = $(_fityk_la_SOURCES)
 +DIST_SOURCES = $(_fityk_la_SOURCES)
 +pythonPYTHON_INSTALL = $(INSTALL_DATA)
 +py_compile = $(top_srcdir)/config/py-compile
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.8.8/config/missing --run aclocal-1.10
- AMTAR = ${SHELL} /home/debian/fityk/fityk-0.8.8/config/missing --run tar
++ACLOCAL = ${SHELL} /home/debian/fityk/fityk-0.8.9/config/missing --run aclocal-1.10
++AMTAR = ${SHELL} /home/debian/fityk/fityk-0.8.9/config/missing --run tar
 +AR = ar
- AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.8.8/config/missing --run autoconf
- AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.8.8/config/missing --run autoheader
- AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.8.8/config/missing --run automake-1.10
++AUTOCONF = ${SHELL} /home/debian/fityk/fityk-0.8.9/config/missing --run autoconf
++AUTOHEADER = ${SHELL} /home/debian/fityk/fityk-0.8.9/config/missing --run autoheader
++AUTOMAKE = ${SHELL} /home/debian/fityk/fityk-0.8.9/config/missing --run automake-1.10
 +AWK = gawk
 +CC = i486-linux-gnu-gcc
 +CCDEPMODE = depmode=gcc3
 +CFLAGS = -g -O2
 +CPP = i486-linux-gnu-gcc -E
 +CPPFLAGS = 
 +CPPFLAGS_3RDPARTY = -I$(top_srcdir)/3rdparty
 +CXX = i486-linux-gnu-g++
 +CXXCPP = i486-linux-gnu-g++ -E
 +CXXDEPMODE = depmode=gcc3
 +CXXFLAGS = -g -O2
 +CYGPATH_W = echo
 +DEFS = -DHAVE_CONFIG_H
 +DEPDIR = .deps
 +DOC = doc
 +DSYMUTIL = 
 +DUMPBIN = 
 +ECHO_C = 
 +ECHO_N = -n
 +ECHO_T = 
 +EGREP = /bin/grep -E
 +EXEEXT = 
 +FGREP = /bin/grep -F
 +GREP = /bin/grep
 +INSTALL = /usr/bin/install -c
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_PROGRAM = ${INSTALL}
 +INSTALL_SCRIPT = ${INSTALL}
 +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 +LD = /usr/bin/ld
 +LDFLAGS = 
 +LIBOBJS = 
- LIBRARY_VERSION_FLAG = -version-info 1:0:0
- LIBS = -lm -lm 
++LIBRARY_VERSION_FLAG = -version-info 2:0:0
++LIBS = -lm -lm -lm 
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LIPO = 
 +LN_S = ln -s
 +LTLIBOBJS = 
 +MAINT = #
- MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.8.8/config/missing --run makeinfo
++MAKEINFO = ${SHELL} /home/debian/fityk/fityk-0.8.9/config/missing --run makeinfo
 +MKDIR_P = /bin/mkdir -p
 +NM = /usr/bin/nm -B
 +NMEDIT = 
 +NO_READLINE = 
 +OBJDUMP = objdump
 +OBJEXT = o
 +OTOOL = 
 +OTOOL64 = 
 +PACKAGE = fityk
 +PACKAGE_BUGREPORT = 
 +PACKAGE_NAME = fityk
- PACKAGE_STRING = fityk 0.8.8
++PACKAGE_STRING = fityk 0.8.9
 +PACKAGE_TARNAME = fityk
- PACKAGE_VERSION = 0.8.8
++PACKAGE_VERSION = 0.8.9
 +PATH_SEPARATOR = :
 +PYBINDINGDIR = 
 +PYTHON = 
 +PYTHON_CPPFLAGS = 
 +PYTHON_EXEC_PREFIX = 
 +PYTHON_EXTRA_LDFLAGS = 
 +PYTHON_EXTRA_LIBS = 
 +PYTHON_LDFLAGS = 
 +PYTHON_PLATFORM = 
 +PYTHON_PREFIX = 
 +PYTHON_SITE_PKG = 
 +PYTHON_VERSION = 
 +RANLIB = ranlib
 +RC = 
 +READLINE_LIBS = -lreadline 
 +SAMPLES_DIR = samples
 +SED = /bin/sed
 +SET_MAKE = 
 +SHELL = /bin/sh
 +SRCSUBDIRS =  wxgui cli
 +STRIP = strip
 +SWIG = 
 +SWIG_LIB = 
 +SWIG_PYTHON_CPPFLAGS = 
 +SWIG_PYTHON_OPT = 
- VERSION = 0.8.8
++VERSION = 0.8.9
 +WX_CFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
 +WX_CFLAGS_ONLY = -pthread
 +WX_CONFIG_PATH = /usr/bin/wx-config
 +WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__
 +WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
 +WX_CXXFLAGS_ONLY = 
 +WX_LIBS = -pthread   -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu-2.8 
 +WX_LIBS_STATIC = 
 +WX_RESCOMP = 
 +WX_VERSION = 2.8.7
 +WX_VERSION_MAJOR = 2
 +WX_VERSION_MICRO = 7
 +WX_VERSION_MINOR = 8
 +XYLIB_CPPFLAGS = -I$(top_srcdir)/xylib
 +XYLIB_DIR = xylib
 +XYLIB_LDADD = $(top_builddir)/xylib/xylib/libxy.la
- abs_builddir = /home/debian/fityk/fityk-0.8.8/python
- abs_srcdir = /home/debian/fityk/fityk-0.8.8/python
- abs_top_builddir = /home/debian/fityk/fityk-0.8.8
- abs_top_srcdir = /home/debian/fityk/fityk-0.8.8
++abs_builddir = /home/debian/fityk/fityk-0.8.9/python
++abs_srcdir = /home/debian/fityk/fityk-0.8.9/python
++abs_top_builddir = /home/debian/fityk/fityk-0.8.9
++abs_top_srcdir = /home/debian/fityk/fityk-0.8.9
 +ac_ct_CC = 
 +ac_ct_CXX = 
 +ac_ct_DUMPBIN = 
 +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
 +builddir = .
 +datadir = ${datarootdir}
 +datarootdir = ${prefix}/share
 +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 +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 = $(SHELL) /home/debian/fityk/fityk-0.8.8/config/install-sh
++install_sh = $(SHELL) /home/debian/fityk/fityk-0.8.9/config/install-sh
 +libdir = ${exec_prefix}/lib
 +libexecdir = ${exec_prefix}/libexec
 +localedir = ${datarootdir}/locale
 +localstatedir = ${prefix}/var
 +lt_ECHO = echo
 +mandir = ${prefix}/share/man
 +mkdir_p = /bin/mkdir -p
 +oldincludedir = /usr/include
 +pdfdir = ${docdir}
 +pkgpyexecdir = 
 +pkgpythondir = 
 +prefix = /usr
 +program_transform_name = s,x,x,
 +psdir = ${docdir}
 +pyexecdir = 
 +pythondir = 
 +sbindir = ${exec_prefix}/sbin
 +sharedstatedir = ${prefix}/com
 +srcdir = .
 +sysconfdir = ${prefix}/etc
 +target = i486-pc-linux-gnu
 +target_alias = 
 +target_cpu = i486
 +target_os = linux-gnu
 +target_vendor = pc
 +top_build_prefix = ../
 +top_builddir = ..
 +top_srcdir = ..
 +
 +# $Id: Makefile.am 238 2007-01-21 01:44:04Z wojdyr $
 +EXTRA_DIST = 
 +BUILT_SOURCES = $(srcdir)/fityk_wrap.cpp
 +SWIG_SOURCES = fityk.i
 +python_PYTHON = fityk.py
 +pyexec_LTLIBRARIES = _fityk.la
 +_fityk_la_SOURCES = $(srcdir)/fityk_wrap.cpp $(SWIG_SOURCES)
 +_fityk_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
- _fityk_la_LDFLAGS = -version-info 1:0:0 -module 
++_fityk_la_LDFLAGS = -version-info 2:0:0 -module 
 +_fityk_la_LIBADD = ../src/libfityk.la
 +all: $(BUILT_SOURCES)
 +	$(MAKE) $(AM_MAKEFLAGS) all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(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 ) \
 +	        && { if test -f $@; then exit 0; else break; fi; }; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  python/Makefile'; \
 +	cd $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign  python/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
 +install-pyexecLTLIBRARIES: $(pyexec_LTLIBRARIES)
 +	@$(NORMAL_INSTALL)
 +	test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
 +	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
 +	  if test -f $$p; then \
 +	    f=$(am__strip_dir) \
 +	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pyexecdir)/$$f'"; \
 +	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pyexecLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pyexecdir)/$$f"; \
 +	  else :; fi; \
 +	done
 +
 +uninstall-pyexecLTLIBRARIES:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
 +	  p=$(am__strip_dir) \
 +	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pyexecdir)/$$p'"; \
 +	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pyexecdir)/$$p"; \
 +	done
 +
 +clean-pyexecLTLIBRARIES:
 +	-test -z "$(pyexec_LTLIBRARIES)" || rm -f $(pyexec_LTLIBRARIES)
 +	@list='$(pyexec_LTLIBRARIES)'; for p in $$list; do \
 +	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +	  test "$$dir" != "$$p" || dir=.; \
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
 +_fityk.la: $(_fityk_la_OBJECTS) $(_fityk_la_DEPENDENCIES) 
 +	$(_fityk_la_LINK) -rpath $(pyexecdir) $(_fityk_la_OBJECTS) $(_fityk_la_LIBADD) $(LIBS)
 +
 +mostlyclean-compile:
 +	-rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +	-rm -f *.tab.c
 +
 +include ./$(DEPDIR)/_fityk_la-fityk_wrap.Plo
 +
 +.cpp.o:
 +	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +#	source='$<' object='$@' libtool=no \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +#	source='$<' object='$@' libtool=no \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +#	source='$<' object='$@' libtool=yes \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(LTCXXCOMPILE) -c -o $@ $<
 +
 +_fityk_la-fityk_wrap.lo: $(srcdir)/fityk_wrap.cpp
 +	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT _fityk_la-fityk_wrap.lo -MD -MP -MF $(DEPDIR)/_fityk_la-fityk_wrap.Tpo -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
 +	mv -f $(DEPDIR)/_fityk_la-fityk_wrap.Tpo $(DEPDIR)/_fityk_la-fityk_wrap.Plo
 +#	source='$(srcdir)/fityk_wrap.cpp' object='_fityk_la-fityk_wrap.lo' libtool=yes \
 +#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
 +#	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(_fityk_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o _fityk_la-fityk_wrap.lo `test -f '$(srcdir)/fityk_wrap.cpp' || echo '$(srcdir)/'`$(srcdir)/fityk_wrap.cpp
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +install-pythonPYTHON: $(python_PYTHON)
 +	@$(NORMAL_INSTALL)
 +	test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
 +	@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
 +	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 +	  if test -f $$b$$p; then \
 +	    f=$(am__strip_dir) \
 +	    dlist="$$dlist $$f"; \
 +	    echo " $(pythonPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pythondir)/$$f'"; \
 +	    $(pythonPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pythondir)/$$f"; \
 +	  else :; fi; \
 +	done; \
 +	if test -n "$$dlist"; then \
 +	  if test -z "$(DESTDIR)"; then \
 +	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pythondir)" $$dlist; \
 +	  else \
 +	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(pythondir)" $$dlist; \
 +	  fi; \
 +	else :; fi
 +
 +uninstall-pythonPYTHON:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(python_PYTHON)'; dlist=''; for p in $$list; do\
 +	  f=$(am__strip_dir) \
 +	  rm -f "$(DESTDIR)$(pythondir)/$$f"; \
 +	  rm -f "$(DESTDIR)$(pythondir)/$${f}c"; \
 +	  rm -f "$(DESTDIR)$(pythondir)/$${f}o"; \
 +	done
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
 +	tags=; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
 +
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
 +	  && gtags -i $(GTAGS_ARGS) $$here
 +
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +distdir: $(DISTFILES)
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
 +	  dist_files=`for file in $$list; do echo $$file; done | \
 +	  sed -e "s|^$$srcdirstrip/||;t" \
 +	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +	case $$dist_files in \
 +	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 +			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +			   sort -u` ;; \
 +	esac; \
 +	for file in $$dist_files; do \
 +	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +	  if test -d $$d/$$file; then \
 +	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    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: $(BUILT_SOURCES)
 +	$(MAKE) $(AM_MAKEFLAGS) check-am
 +all-am: Makefile $(LTLIBRARIES)
 +installdirs:
 +	for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(pythondir)"; do \
 +	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +	done
 +install: $(BUILT_SOURCES)
 +	$(MAKE) $(AM_MAKEFLAGS) 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."
 +	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 +clean: clean-am
 +
 +clean-am: clean-generic clean-libtool clean-pyexecLTLIBRARIES \
 +	mostlyclean-am
 +
 +distclean: distclean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-pythonPYTHON
 +
 +install-dvi: install-dvi-am
 +
 +install-exec-am: install-pyexecLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-info: install-info-am
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-ps: install-ps-am
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +	mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-pyexecLTLIBRARIES uninstall-pythonPYTHON
 +
 +.MAKE: install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 +	clean-libtool clean-pyexecLTLIBRARIES ctags distclean \
 +	distclean-compile distclean-generic distclean-libtool \
 +	distclean-tags distdir dvi dvi-am html html-am info info-am \
 +	install install-am install-data install-data-am install-dvi \
 +	install-dvi-am install-exec install-exec-am install-html \
 +	install-html-am install-info install-info-am install-man \
 +	install-pdf install-pdf-am install-ps install-ps-am \
 +	install-pyexecLTLIBRARIES install-pythonPYTHON install-strip \
 +	installcheck installcheck-am installdirs maintainer-clean \
 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +	tags uninstall uninstall-am uninstall-pyexecLTLIBRARIES \
 +	uninstall-pythonPYTHON
 +
 +
 +$(srcdir)/fityk_wrap.cpp : $(SWIG_SOURCES) $(top_srcdir)/src/fityk.h
 +	$(SWIG) $(SWIG_PYTHON_OPT) -I$(top_srcdir)/src -o $@ $<
 +# 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:

-- 
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