debian/0000755000000000000000000000000012323003005007152 5ustar debian/links0000644000000000000000000000127512261051402010227 0ustar 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 debian/control0000644000000000000000000000315012323002745010566 0ustar Source: fityk Section: science Priority: optional Maintainer: Carlo Segre Build-Depends: autotools-dev (>> 20100122.1~), debhelper (>> 7), dh-autoreconf, 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.5 Package: fityk Architecture: any 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 by a complicated - common to all peaks - formula. . libjs-sphinxdoc is necessary for the Javascript stuff in the documentation. debian/rules0000755000000000000000000000175512323002762010253 0ustar #!/usr/bin/make -f CPPFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) -I/usr/include/lua5.1 CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) CXXFLAGS ?= $(shell dpkg-buildflags --get CXXFLAGS) LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS) # -Wl,--as-needed LIBS ?= -lstdc++ %: dh $@ --with autoreconf --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)" \ LIBS="$(LIBS)" 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 override_dh_compress: dh_compress --exclude=.dat --exclude=.fit debian/install0000644000000000000000000000011612261040666010560 0ustar wxgui/img/fityk.xpm usr/share/pixmaps/ fityk.desktop usr/share/applications/ debian/menu0000644000000000000000000000025411371332157010061 0ustar ?package(fityk):needs="X11" \ section="Applications/Science/Data Analysis" \ title="fityk" \ command="/usr/bin/fityk" \ icon="/usr/share/pixmaps/fityk.xpm" debian/upstream0000644000000000000000000000072412261114433010751 0ustar Name: Fityk Homepage: http://fityk.nieto.pl/ Contact: wojdyr@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 debian/watch0000644000000000000000000000014511542565765010237 0ustar version=3 https://github.com/wojdyr/fityk/downloads \ /downloads/wojdyr/fityk/fityk-(.*)\.tar\.bz2 debian/compat0000644000000000000000000000000211371337757010402 0ustar 7 debian/manpages0000644000000000000000000000001412204514401010670 0ustar doc/fityk.1 debian/copyright0000644000000000000000000000142612204513447011126 0ustar This package was debianized by Carlo Segre 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 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 debian/source/0000755000000000000000000000000011371332254010467 5ustar debian/source/format0000644000000000000000000000001411371332254011675 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000012323002160010602 5ustar debian/patches/fix-link-error.diff0000644000000000000000000000217612323002160014312 0ustar Index: b/fityk/numfuncs.cpp =================================================================== --- a/fityk/numfuncs.cpp +++ b/fityk/numfuncs.cpp @@ -12,14 +12,14 @@ /// returns position pos in sorted vector of points, *pos and *(pos+1) are /// required segment for interpolation -/// optimized for sequenced calling with slowly increasing x's +/// optimized for sequential calls with slowly increasing x's template typename vector::iterator get_interpolation_segment(vector &bb, double x) { - //optimized for sequence of x = x1, x2, x3, x1 < x2 < x3... static typename vector::iterator pos = bb.begin(); assert (size(bb) > 1); + // when outside of the range, use the first or the last segment if (x <= bb.front().x) return bb.begin(); if (x >= bb.back().x) @@ -41,6 +41,10 @@ return pos; } +// explicit instantiation for use in bfunc.cpp in FuncPolyline +template vector::iterator +get_interpolation_segment(vector &bb, double x); + void prepare_spline_interpolation (vector &bb) { //first wroten for bb interpolation, then generalized debian/patches/series0000644000000000000000000000002412323001667012026 0ustar fix-link-error.diff debian/changelog0000644000000000000000000002167312323003002011032 0ustar fityk (1.2.1-0.1ubuntu2) trusty; urgency=medium * Build using dh-autoreconf. * Fix link error, patch provided by Marcin Wojdyr. -- Matthias Klose Mon, 14 Apr 2014 17:53:27 +0200 fityk (1.2.1-0.1ubuntu1) trusty; urgency=medium * Pass -lstdc++ in LIBS instead of LDFLAGS to fix FTBFS with --as-needed -- Andreas Moog Fri, 17 Jan 2014 20:55:51 +0100 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 Wed, 01 Jan 2014 23:44:22 +0100 fityk (0.9.8-3) unstable; urgency=low * Correct home page URL -- Carlo Segre 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 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 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 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 Fri, 02 Jul 2010 13:35:24 -0500 fityk (0.9.3~r750-1) unstable; urgency=low * New upstream prerelease with bugfixes -- Carlo Segre 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 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 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 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 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 " 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 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 . * Restore sourceforge redirector in debian/watch. * Fix reference to GPL-2. -- Carlo Segre 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 Mon, 22 Sep 2008 15:09:25 -0500 fityk (0.8.6-1) unstable; urgency=low * New upstream release -- Carlo Segre 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 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 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 . (Closes: #455180) -- Marc 'HE' Brockschmidt 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 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 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 Wed, 7 Mar 2007 18:58:33 -0600 fityk (0.7.7-1) unstable; urgency=low * New upstream release -- Carlo Segre 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 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 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@debian.org -- Carlo Segre 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 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 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 (Thanks!) -- Carlo Segre Tue, 6 Jun 2006 09:49:14 -0500 fityk (0.7.3-1) unstable; urgency=low * New upstream release (Closes: #360795) -- Carlo Segre 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 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 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 Fri, 22 Jul 2005 07:24:17 -0500 fityk (0.5.0p1-1) unstable; urgency=low * New upstream release -- Carlo Segre 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 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 Sat, 20 Nov 2004 12:11:22 -0600 fityk (0.4.2-1) unstable; urgency=low * Initial Release (Closes: #271166). -- Carlo Segre Fri, 10 Sep 2004 11:23:40 -0500 debian/README.Debian0000644000000000000000000000461011371334512011230 0ustar The freedesktop.org standards put all scientific software into a top level menu category called "Education". This is short-sighted and just plain wrong but until they change it, has to be rectified in the Window Manager configurations. KDE and Gnome already provide for a "Science" top level category but XFCE4 does not. It is relatively easy to make this change, however. 1. in /etc/xdg/menus edit xfce-applications.menu to have an entry which reads: Science xfce-science.directory Science and modify the Education entry to read: Education xfce-education.directory Education Science 2. in /usr/share/desktop-directories add a file called xfce-science.directory with contents as listed below. Icons are taken by default from the /usr/share/icons/gnome/32x32/categories directory and fortunately, there is an applications-science.png icon there. [Desktop Entry] Version=1.0 Encoding=UTF-8 Type=Directory Icon=applications-science Name=Science Name[ar]=العلوم Name[be]=Навука Name[bn]=বিজ্ঞান Name[bs]=Nauka Name[ca]=Ciència Name[cs]=Věda Name[da]=Videnskab Name[de]=Wissenschaft Name[dz]=ཚན་རིག Name[el]=Επιστημονικά Name[en_GB]=Science Name[eo]=Scienco Name[eu]=Zientzia Name[fi]=Tiede Name[fr]=Sciences Name[gl]=Ciencias Name[gu]=વિજ્ઞાન Name[he]=מדע Name[hi]=विज्ञान Name[hr]=Znanost Name[hu]=Tudomány Name[id]=IPTEK Name[it]=Scienza Name[ja]=科学 Name[km]=វិទ្យាសាស្ត្រ​ Name[ko]=과학 Name[ku]=Zanist Name[mk]=Наука Name[ml]=ശാസ്ത്രം Name[mr]=विज्ञान Name[nb]=Vitenskap Name[ne]=विज्ञान Name[nl]=Wetenschap Name[nn]=Vitskap Name[pt]=Ciência Name[ro]=Știință Name[sk]=Veda Name[sq]=Shkencë Name[th]=วิทยาศาสตร์ Name[tl]=Agham Name[tr]=Bilim Name[uk]=Наука Name[vi]=Khoa học Name[zh_TW]=科學 Comment=Scientific applications Comment[it]=Applicazioni scientifiche Comment[fr]=Applicationsxfce-science.directory scientifique Carlo Segre, July 3, 2009 debian/docs0000644000000000000000000000004111371332157010037 0ustar README debian/README.Debian TODO