[fityk] 12/45: Imported Debian patch 0.7.6-1

Stuart Prescott stuart at debian.org
Sun Nov 6 23:35:29 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 c34f28467b958b55e3293b6ab1c1515d987bb586
Merge: a775a89 e9694c4
Author: Carlo Segre <segre at debian.org>
Date:   Sat Sep 16 08:32:03 2006 -0500

    Imported Debian patch 0.7.6-1

 INSTALL                  |    7 +
 NEWS                     |   12 +
 TODO                     |   99 +++--
 configure                |   10 +-
 configure.ac             |    4 +-
 debian/changelog         |    7 +
 debian/control           |    2 +-
 doc/fitykhelp.htb        |  Bin 124183 -> 125352 bytes
 doc/fitykhelp.html       | 1083 +++++++++++++++++++++++----------------------
 doc/fitykhelp.xml        | 1093 +++++++++++++++++++++++++---------------------
 fityk.iss                |    6 +-
 fityk.png                |  Bin 748 -> 961 bytes
 fityk.spec               |    2 +-
 samples/test_syntax.fit  |   27 +-
 src/Makefile.am          |    8 +-
 src/Makefile.in          |   19 +-
 src/ast.cpp              |   61 ++-
 src/ast.h                |    5 +-
 src/bfunc.cpp            |   53 +--
 src/bfunc.h              |   20 +-
 src/calc.cpp             |   30 +-
 src/calc.h               |   12 +-
 src/cmd.cpp              |   10 +-
 src/cmd.h                |    4 +-
 src/cmd2.cpp             |   89 ++--
 src/cmd3.cpp             |    7 +-
 src/common.h             |   36 +-
 src/data.cpp             |   30 +-
 src/data.h               |    3 +-
 src/datatrans.cpp        |   46 +-
 src/datatrans.h          |    6 +-
 src/datatrans2.h         |    9 +-
 src/datatrans4.cpp       |    4 +-
 src/fit.cpp              |   22 +-
 src/func.cpp             |  110 +++--
 src/func.h               |   32 +-
 src/guess.cpp            |  238 +++++++---
 src/guess.h              |   32 +-
 src/img/Makefile.am      |    7 +-
 src/img/Makefile.in      |    7 +-
 src/img/exec_down.xpm    |  205 +++++++++
 src/img/fityk.ico        |  Bin 4286 -> 4286 bytes
 src/img/fityk.xpm        |   62 ++-
 src/img/lock.xpm         |  107 +++++
 src/img/lock_open.xpm    |   83 ++++
 src/img/save.xpm         |  247 +++++++++++
 src/img/save_as.xpm      |  289 ++++++++++++
 src/logic.cpp            |  108 +++--
 src/logic.h              |   15 +-
 src/{var.cpp => mgr.cpp} |  261 ++---------
 src/mgr.h                |  110 +++++
 src/settings.cpp         |    6 +-
 src/sum.cpp              |   15 +-
 src/sum.h                |    6 +-
 src/u_main.cpp           |    3 +-
 src/ui.cpp               |    5 +-
 src/var.cpp              |  694 ++---------------------------
 src/var.h                |  116 +----
 src/wx_IO.cpp            |    5 +-
 src/wx_dlg.cpp           |   28 +-
 src/wx_dlg.h             |    4 +-
 src/wx_fdlg.cpp          |  222 ++++++++--
 src/wx_fdlg.h            |   15 +-
 src/wx_gui.cpp           |  232 +++++++++-
 src/wx_gui.h             |   46 +-
 src/wx_mplot.cpp         |  303 +++++++++----
 src/wx_mplot.h           |   83 +++-
 src/wx_pane.cpp          |   82 +++-
 src/wx_pane.h            |    3 +-
 src/wx_plot.cpp          |  113 +++--
 src/wx_plot.h            |   15 +-
 71 files changed, 4023 insertions(+), 2712 deletions(-)

diff --cc configure
index 1733371,91aa489..82c032e
--- a/configure
+++ b/configure
@@@ -2517,13 -2517,13 +2517,13 @@@ if test "$ac_test_CXXFLAGS" = set; the
    CXXFLAGS=$ac_save_CXXFLAGS
  elif test $ac_cv_prog_cxx_g = yes; then
    if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
++    CXXFLAGS="-g -O1"
    else
      CXXFLAGS="-g"
    fi
  else
    if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
++    CXXFLAGS="-O1"
    else
      CXXFLAGS=
    fi
@@@ -3265,13 -3265,13 +3265,13 @@@ if test "$ac_test_CFLAGS" = set; the
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
++    CFLAGS="-g -O1"
    else
      CFLAGS="-g"
    fi
  else
    if test "$GCC" = yes; then
--    CFLAGS="-O2"
++    CFLAGS="-O1"
    else
      CFLAGS=
    fi
diff --cc debian/changelog
index 6bbfda2,0000000..0c5f43e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,86 -1,0 +1,93 @@@
++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 filr 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 de6e8c9,0000000..443f064
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,0 +1,31 @@@
 +Source: fityk
 +Section: science
 +Priority: optional
 +Maintainer: Carlo Segre <segre at debian.org>
 +Build-Depends: debhelper (>> 4.0.0), libwxgtk2.6-dev (>> 2.6.0), libreadline5-dev | libreadline-dev, libboost-dev
 +Standards-Version: 3.7.2
 +
 +Package: fityk
 +Architecture: any
- Tag: field::chemistry, field::physics, implemented-in::c++, interface::x11, legacy::science, role::program, uitoolkit::wxwidgets, x11::application
++Tag: field::chemistry, field::physics, implemented-in::c++, interface::x11, role::program, scope::utility, uitoolkit::wxwidgets, x11::application
 +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/

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