[fityk] 27/45: Imported Debian patch 0.9.3~r740-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 2f7f330368ebc6619c61797a6008663afdd8d696
Merge: 4fdfe7e 6f142c5
Author: Carlo Segre <segre at debian.org>
Date: Sun Jun 6 22:52:48 2010 -0500
Imported Debian patch 0.9.3~r740-1
Makefile.in | 17 +-
NEWS | 15 +-
TODO | 14 +-
aclocal.m4 | 26 +-
config/config.guess | 58 +-
config/config.sub | 15 +-
config/install-sh | 5 +-
config/ltmain.sh | 8 +-
configure | 313 ++-
configure.ac | 19 +-
debian/changelog | 8 +
debian/rules | 6 +-
doc/Makefile.in | 2 +-
doc/appendix.rst | 10 +-
doc/conf.py | 2 +-
doc/extensions.rst | 14 +-
.../19f15eacccc345c3179259320491956f3f23887a.png | Bin 1551 -> 1551 bytes
.../23decadd8b245289f5fa993f2c99e0ac9cff56dc.png | Bin 1464 -> 1463 bytes
.../441e7ddea6580ae19be0583f35b648340340f789.png | Bin 1578 -> 1577 bytes
.../695f416425dbcafe8c762a1e8c533023350a525d.png | Bin 1810 -> 1809 bytes
.../727873d2cbeda3d30f41bee18cb2bf5ea1071fa1.png | Bin 714 -> 714 bytes
.../7508455f7c089e149392451dec57d771370d63ce.png | Bin 2681 -> 2680 bytes
.../75870e6ce52429cdac61f596a15826f179ae817e.png | Bin 420 -> 420 bytes
.../98327fe212a6e72966017a3e21780935b66080f8.png | Bin 1414 -> 1414 bytes
.../9e9c8a0fb6a92d4c3f969ab7a959a80f3069e3c9.png | Bin 1118 -> 1119 bytes
.../9f4a323840470c45eb00c5896ba579edc0f0799f.png | Bin 1882 -> 1883 bytes
.../9fabdcba50c720ea1ae42cd0b4f1d3eb5f367e56.png | Bin 1968 -> 1970 bytes
.../b72439b28d639f1999aeecd537d21df605ad8db8.png | Bin 1462 -> 1463 bytes
.../c104a975652392e8192a26551dc776a5fbdcf9c7.png | Bin 1444 -> 1444 bytes
.../c2ec895a1a42f04814ac1e370c4b8ca8fb702167.png | Bin 2122 -> 2123 bytes
.../d3e7d7cd926970086d34700ac3f979eac398132a.png | Bin 833 -> 833 bytes
doc/html/_sources/appendix.txt | 10 +-
doc/html/_sources/extensions.txt | 14 +-
doc/html/_sources/index.txt | 7 +-
doc/html/_sources/ref.txt | 96 +-
doc/html/appendix.html | 20 +-
doc/html/extensions.html | 24 +-
doc/html/fityk-manual.html | 15 +-
doc/html/getstarted.html | 12 +-
doc/html/index.html | 17 +-
doc/html/intro.html | 18 +-
doc/html/ref.html | 110 +-
doc/html/search.html | 12 +-
doc/html/searchindex.js | 2 +-
doc/index.rst | 7 +-
doc/ref.rst | 96 +-
fityk.iss | 6 +-
m4/libtool.m4 | 13 +-
m4/ltversion.m4 | 10 +-
m4/readline.m4 | 2 +-
samples/Makefile.in | 2 +-
samples/SiC_Zn.fit | 7 +-
samples/nacl01.fit | 2 +-
samples/test_syntax.fit | 65 +-
src/Makefile.am | 20 +-
src/Makefile.in | 40 +-
src/ast.cpp | 15 +-
src/ast.h | 8 +-
src/bfunc.cpp | 275 +-
src/bfunc.h | 67 +-
src/calc.cpp | 9 +-
src/cli/Makefile.in | 2 +-
src/cmd.cpp | 25 +-
src/cmd2.cpp | 16 +-
src/cmd2.h | 8 +-
src/cmd3.cpp | 16 +-
src/cmd3.h | 6 +-
src/common.h | 15 +-
src/datatrans.cpp | 72 +-
src/datatrans.h | 6 +-
src/datatrans2.cpp | 137 +-
src/datatrans2.h | 59 +-
src/datatrans3.cpp | 13 +-
src/datatrans3.h | 8 +-
src/datatrans4.h | 6 +-
src/erf.c | 88 -
src/fityk.cpp | 5 +-
src/func.cpp | 729 +-----
src/func.h | 167 +-
src/guess.cpp | 60 +-
src/guess.h | 4 +-
src/info.cpp | 3 +-
src/lexer.cpp | 346 +++
src/lexer.h | 119 +
src/logic.cpp | 3 +-
src/mgr.cpp | 145 +-
src/mgr.h | 8 +-
src/nmath.cpp | 1420 -----------
src/numfuncs.cpp | 48 +-
src/numfuncs.h | 45 +-
src/optional_suffix.h | 21 +-
src/{func.cpp => udf.cpp} | 633 +----
src/udf.h | 156 ++
src/ui.cpp | 35 +-
src/ui.h | 3 +-
src/var.cpp | 6 +-
src/var.h | 8 +-
src/wxgui/Makefile.am | 4 +-
src/wxgui/Makefile.in | 10 +-
src/wxgui/aplot.cpp | 4 +-
src/wxgui/ceria.cpp | 102 +-
src/wxgui/ceria.h | 13 +-
src/wxgui/defmgr.cpp | 3 +-
src/wxgui/fancyrc.cpp | 11 +-
src/wxgui/fancyrc.h | 3 +-
src/wxgui/frame.cpp | 71 +-
src/wxgui/frame.h | 6 +-
src/wxgui/img/Makefile.in | 2 +-
src/wxgui/mplot.cpp | 381 +--
src/wxgui/mplot.h | 43 +-
src/wxgui/plot.cpp | 19 +-
src/wxgui/plot.h | 6 +-
src/wxgui/powdifpat.cpp | 910 +++++--
src/wxgui/powdifpat.h | 34 +-
src/wxgui/sidebar.cpp | 54 +-
src/wxgui/sidebar.h | 3 +-
src/wxgui/statbar.cpp | 112 +-
src/wxgui/statbar.h | 14 +-
swig/Makefile.in | 2 +-
swig/fityk.py | 578 +++--
swig/fityk_lua.cpp | 143 +-
swig/fityk_python.cpp | 2624 +++++++++++++-------
122 files changed, 5359 insertions(+), 5767 deletions(-)
diff --cc debian/changelog
index edc7907,0000000..6097f67
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,215 -1,0 +1,223 @@@
++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/rules
index a160867,0000000..2f59790
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,88 -1,0 +1,92 @@@
+#!/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 --with-samples \
++ ./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-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
+ 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
--
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