[fityk] 06/45: Imported Debian patch 0.7.2-1
Stuart Prescott
stuart at debian.org
Sun Nov 6 23:35:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
stuart pushed a commit to branch master
in repository fityk.
commit 93d9e61e365f93c9227bf5b422912950e3fb8152
Merge: 25883ce 4a1d0bd
Author: Carlo Segre <segre at iit.edu>
Date: Sun Mar 12 00:44:52 2006 -0600
Imported Debian patch 0.7.2-1
3rdparty/Makefile.in | 1 -
3rdparty/boost/config/compiler/gcc.hpp | 20 +-
.../boost/spirit/core/composite/no_actions.hpp | 8 +-
INSTALL | 29 +-
Makefile.am | 9 +-
Makefile.in | 90 +-
NEWS | 32 +-
TODO | 224 +-
aclocal.m4 | 263 +-
config.h.in | 3 +
config/Makefile.in | 1 -
config/readline.m4 | 17 +-
configure | 482 +-
configure.ac | 58 +-
debian/changelog | 8 +
debian/control | 2 +-
debian/rules | 2 +-
debian/watch | 5 +-
doc/Makefile.am | 31 +-
doc/Makefile.in | 34 +-
doc/README | 8 +-
doc/cmdidx.xsl | 104 -
doc/fityk.1 | 28 +-
doc/fityk_tips.txt | 12 +-
doc/fitykhelp.htb | Bin 79143 -> 81159 bytes
doc/fitykhelp.html | 1946 +++----
doc/fitykhelp.xml | 2282 ++++----
doc/fitykhelp_img/Makefile.am | 4 +-
doc/fitykhelp_img/Makefile.in | 5 +-
doc/fitykhelp_img/doniachs.png | Bin 0 -> 2921 bytes
doc/fitykhelp_img/emg.png | Bin 0 -> 3886 bytes
fityk.desktop | 12 +
fityk.iss | 9 +-
fityk.iss.in | 3 +-
fityk.png | Bin 0 -> 748 bytes
fityk.spec | 2 +-
samples/Makefile.in | 1 -
samples/SiC_Zn.fit | 110 +-
samples/nacl01.fit | 20 +-
src/GAfit.cpp | 18 +-
src/GAfit.h | 10 +-
src/LMfit.cpp | 20 +-
src/LMfit.h | 10 +-
src/Makefile.am | 45 +-
src/Makefile.in | 87 +-
src/NMfit.cpp | 14 +-
src/NMfit.h | 10 +-
src/calc.cpp | 921 +++
src/calc.h | 85 +
src/cmd.cpp | 797 +++
src/cmd.h | 14 +
src/common.cpp | 51 +-
src/common.h | 158 +-
src/crystal.cpp | 944 ----
src/crystal.h | 116 -
src/data.cpp | 179 +-
src/data.h | 72 +-
src/datatrans.cpp | 384 +-
src/datatrans.h | 332 +-
src/datatrans2.cpp | 200 +
src/datatrans2.h | 128 +
src/dotset.cpp | 258 -
src/dotset.h | 54 -
src/ffunc.cpp | 549 --
src/ffunc.h | 287 -
src/fileroutines.h | 4 +-
src/fit.cpp | 402 ++
src/fit.h | 82 +
src/func.cpp | 1214 ++++
src/func.h | 277 +
src/fzgbase.cpp | 300 -
src/fzgbase.h | 109 -
src/gfunc.cpp | 286 -
src/gfunc.h | 253 -
src/guess.cpp | 260 +
src/guess.h | 50 +
src/img/Makefile.am | 76 +-
src/img/Makefile.in | 75 +-
src/img/add.xpm | 51 +
src/img/close.xpm | 29 +
src/img/color.xpm | 21 +
src/img/colorsel.xpm | 250 +
src/img/convert.xpm | 155 +
src/img/copyfunc.xpm | 109 +
src/img/editf.xpm | 71 +
src/img/filter.xpm | 84 +
src/img/fityk.ico | Bin 2238 -> 4286 bytes
src/img/fityk.xpm | 73 +-
src/img/rename.xpm | 29 +
src/img/shiftup.xpm | 31 +
src/img/unused.xpm | 22 +
src/img/zoom_up.xpm | 155 +
src/img/zoom_vert.xpm | 179 +-
src/img/zshift.xpm | 22 +
src/logic.cpp | 269 +
src/logic.h | 131 +
src/manipul.cpp | 225 -
src/manipul.h | 75 -
src/numfuncs.cpp | 55 +-
src/numfuncs.h | 17 +-
src/optional_suffix.h | 151 +
src/other.cpp | 200 -
src/other.h | 57 -
src/pag.h | 74 -
src/parser.cpp | 2479 --------
src/parser.tab.hh | 176 -
src/parser.yy | 362 --
src/pcore.cpp | 532 --
src/pcore.h | 185 -
src/scanner.cpp | 5894 --------------------
src/scanner.ll | 186 -
src/settings.cpp | 244 +
src/settings.h | 90 +
src/sum.cpp | 1029 +---
src/sum.h | 154 +-
src/u_gnuplot.cpp | 37 +-
src/u_gnuplot.h | 9 +-
src/u_main.cpp | 114 +-
src/ui.cpp | 286 +-
src/ui.h | 130 +-
src/v_fit.cpp | 521 --
src/v_fit.h | 87 -
src/var.cpp | 868 +++
src/var.h | 275 +
src/wx_IO.cpp | 36 +-
src/wx_common.cpp | 196 +
src/wx_common.h | 109 +-
src/wx_dlg.cpp | 1418 ++---
src/wx_dlg.h | 180 +-
src/wx_fdlg.cpp | 738 +++
src/wx_fdlg.h | 111 +
src/wx_gui.cpp | 1612 +++---
src/wx_gui.h | 116 +-
src/wx_mplot.cpp | 1293 +++--
src/wx_mplot.h | 126 +-
src/wx_pane.cpp | 1453 +++--
src/wx_pane.h | 177 +-
src/wx_plot.cpp | 619 +-
src/wx_plot.h | 72 +-
139 files changed, 16712 insertions(+), 22733 deletions(-)
diff --cc Makefile.in
index 7b9cf0b,2009f91..dcb9ae5
--- a/Makefile.in
+++ b/Makefile.in
@@@ -190,8 -201,12 +201,12 @@@ target_cpu = @target_cpu
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = fityk.spec fityk.iss fityk.url
- AUTOMAKE_OPTIONS = dist-zip dist-bzip2
- SUBDIRS = @DOC@ src samples config
+ AUTOMAKE_OPTIONS = dist-bzip2
-SUBDIRS = @DOC@ src samples config 3rdparty
++SUBDIRS = @DOC@ src samples config
+ dist_icon_DATA = fityk.png
+ icondir = $(datadir)/pixmaps
+ dist_desktop_DATA = fityk.desktop
+ desktopdir = $(datadir)/applications
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --cc configure
index 14e321c,3c14d6b..ee7660a
--- a/configure
+++ b/configure
@@@ -4526,6 -4523,10 +4523,10 @@@ echo "$as_me: error: You don't have a <
fi
+
+ OLD_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$srcdir/3rdparty"
++#CPPFLAGS="$CPPFLAGS -I$srcdir/3rdparty"
+
if test "${ac_cv_header_boost_spirit_core_hpp+set}" = set; then
echo "$as_me:$LINENO: checking for boost/spirit/core.hpp" >&5
echo $ECHO_N "checking for boost/spirit/core.hpp... $ECHO_C" >&6
@@@ -4677,6 -4678,9 +4678,9 @@@ echo "$as_me: error: Boost::Spirit head
fi
+
-CPPFLAGS="$OLD_CPPFLAGS -I\$(top_srcdir)/3rdparty"
++#CPPFLAGS="$OLD_CPPFLAGS -I\$(top_srcdir)/3rdparty"
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --cc configure.ac
index 4897c52,ca085cd..1f27249
--- a/configure.ac
+++ b/configure.ac
@@@ -100,11 -92,24 +92,24 @@@ AC_LANG_PUSH([C++]
AC_CHECK_HEADER(sstream, [], [AC_MSG_ERROR(
[You don't have a <sstream> header. It is a part of standard C++ library.
Either you have too old compiler, or standard C++ library can't be found.])])
+
+ dnl use headers from 3rdparty/
+ dnl CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/3rdparty" #doesn't work here(?),
+ dnl or substitutes top_srcdir only in Makefile's(?)
+ OLD_CPPFLAGS=$CPPFLAGS
+ dnl it's an ugly hack, that can cause problems...
+ dnl CPPFLAGS is set here only for this test, and it is changed later
-CPPFLAGS="$CPPFLAGS -I$srcdir/3rdparty"
++dnl CPPFLAGS="$CPPFLAGS -I$srcdir/3rdparty" #not for Debian (CUS)
+
AC_CHECK_HEADER([boost/spirit/core.hpp], [], [AC_MSG_ERROR(
[Boost::Spirit headers were not found
or your compiler can't compile it.
If you use CVS version, make sure you have Spirit installed (see INSTALL).
])])
+
+ dnl see comments above...
-CPPFLAGS="$OLD_CPPFLAGS -I\$(top_srcdir)/3rdparty"
++dnl CPPFLAGS="$OLD_CPPFLAGS -I\$(top_srcdir)/3rdparty" #not for Debian (CUS)
+
AC_LANG_POP([C++]) dnl C is faster than C++
dnl Checks for version specific libraries and headers.
@@@ -170,7 -166,7 +166,7 @@@ AC_CHECK_LIB([m], [erfc], [], [AC_MSG_E
dnl in generated configure script, this line is too late
test "x$prefix" = xNONE && prefix=$ac_default_prefix
--AC_CONFIG_FILES([Makefile fityk.spec fityk.iss src/Makefile src/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile 3rdparty/Makefile])
++AC_CONFIG_FILES([Makefile fityk.spec fityk.iss src/Makefile src/img/Makefile doc/Makefile doc/fitykhelp_img/Makefile samples/Makefile config/Makefile])
AC_OUTPUT
diff --cc debian/changelog
index 305a478,0000000..e4d65e6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,37 -1,0 +1,45 @@@
++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 7189591,0000000..6b3bbf0
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,30 @@@
+Source: fityk
+Section: science
+Priority: optional
+Maintainer: Carlo Segre <segre at iit.edu>
- Build-Depends: debhelper (>> 3.0.0), libwxgtk2.4-dev, libreadline5-dev | libreadline-dev, libboost-dev
++Build-Depends: debhelper (>> 4.0.0), libwxgtk2.6-dev, libreadline5-dev | libreadline-dev, libboost-dev
+Standards-Version: 3.6.2
+
+Package: fityk
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: gnuplot
+Suggests: menu
+Description: general-purpose nonlinear curve fitting and data analysis
+ Fityk is a flexible and portable program for nonlinear fitting of analytical
+ functions (especially peak-shaped) to data (usually experimental data). In
+ other words, for nonlinear peak separation and analysis.
+ .
+ It was developed for analyzing diffraction patterns, but can be also used in
+ other fields, since concepts and operations specific for crystallography are
+ separated from the rest of the program.
+ .
+ Fityk offers various nonlinear fitting methods, subtracting background,
+ calibrating data, easy placement of peaks and changing peak parameters,
+ automation of common tasks with scripts, and much more. The main advantage
+ of the program is flexibility - parameters of peaks can be arbitrarily
+ bound to each other, eg. the width of a peak can be an independent
+ variable, can be the same as the width of another peak or can be given
+ by a complicated - common to all peaks - formula.
+ .
+ Homepage: http://www.unipress.waw.pl/fityk/
diff --cc debian/rules
index 4905f54,0000000..04d8d95
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,82 -1,0 +1,82 @@@
+#!/usr/bin/make -f
+
- export DH_COMPAT=3
++export DH_COMPAT=4
+
+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 --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
+ -$(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 $(CURDIR)/debian/fityk/usr/share/pixmaps
+ cp src/img/fityk.xpm $(CURDIR)/debian/fityk/usr/share/pixmaps/
+ 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/
+
+
+# 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 debian/watch
index 6b116cd,0000000..ab5004d
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,3 @@@
- version=2
- ftp://heanet.dl.sourceforge.net/f/fi/fityk/ fityk-(.*)\.tar\.gz debian uupdate
++version=3
++ftp://heanet.dl.sourceforge.net/f/fi/fityk/fityk-(.*)\.tar\.gz \
++ debian uupdate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git
More information about the debian-science-commits
mailing list