[fityk] 25/45: Imported Debian patch 0.9.0-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 7319f10a38ddaa82bed2936e656ee3ab59f2a93b
Merge: 09d7168 306c064
Author: Carlo Segre <segre at debian.org>
Date: Tue Feb 9 23:14:36 2010 -0600
Imported Debian patch 0.9.0-1
3rdparty/Makefile.am | 3 -
3rdparty/Makefile.in | 390 -
3rdparty/README | 4 +-
INSTALL | 12 +-
Makefile.am | 23 +-
Makefile.in | 322 +-
NEWS | 13 +-
TODO | 53 +-
aclocal.m4 | 341 +-
config.h.in | 15 +
config/Makefile.am | 3 -
config/Makefile.in | 391 -
config/config.guess | 51 +-
config/config.sub | 54 +-
config/depcomp | 172 +-
config/ltmain.sh | 25 +-
config/missing | 104 +-
config/py-compile | 36 +-
configure | 8481 +++++++++-----------
configure.ac | 97 +-
debian/changelog | 7 +
debian/rules | 2 +-
doc/Makefile.am | 4 +-
doc/Makefile.in | 209 +-
doc/appendix.rst | 11 +-
doc/conf.py | 19 +-
doc/extensions.rst | 2 +-
doc/fityk-manual.rst | 4 +-
doc/fityk.1 | 14 +-
doc/getstarted.rst | 2 +-
.../b72439b28d639f1999aeecd537d21df605ad8db8.png | Bin 0 -> 1462 bytes
doc/html/_images/project-support.jpg | Bin 3788 -> 0 bytes
doc/html/_sources/appendix.txt | 11 +-
doc/html/_sources/extensions.txt | 2 +-
doc/html/_sources/fityk-manual.txt | 4 +-
doc/html/_sources/getstarted.txt | 2 +-
doc/html/_sources/index.txt | 44 +-
doc/html/_sources/intro.txt | 2 +-
doc/html/_sources/ref.txt | 76 +-
doc/html/_static/fityk-banner.png | Bin 8525 -> 11013 bytes
doc/html/appendix.html | 17 +-
doc/html/extensions.html | 12 +-
doc/html/fityk-manual.html | 14 +-
doc/html/getstarted.html | 12 +-
doc/html/index.html | 58 +-
doc/html/intro.html | 20 +-
doc/html/ref.html | 88 +-
doc/html/search.html | 12 +-
doc/html/searchindex.js | 2 +-
doc/index.rst | 44 +-
doc/intro.rst | 2 +-
doc/ref.rst | 76 +-
fityk.iss | 10 +-
fityk.iss.in | 4 +-
{config => m4}/ac_pkg_swig.m4 | 0
{config => m4}/ac_python_devel.m4 | 0
m4/ax_lua.m4 | 184 +
{config => m4}/libtool.m4 | 3 +
{config => m4}/ltoptions.m4 | 0
{config => m4}/ltsugar.m4 | 0
{config => m4}/ltversion.m4 | 0
{config => m4}/lt~obsolete.m4 | 0
{config => m4}/readline.m4 | 2 +-
{config => m4}/wxwin.m4 | 19 +-
python/Makefile.am | 15 -
python/fityk.i | 43 -
samples/Makefile.am | 4 +-
samples/Makefile.in | 108 +-
samples/test_lib.lua | 45 +
samples/test_lib.py | 10 +-
samples/test_syntax.fit | 14 +-
src/Makefile.am | 15 +-
src/Makefile.in | 433 +-
src/ast.cpp | 19 +-
src/ast.h | 4 +-
src/calc.cpp | 5 +-
src/cli/Makefile.am | 6 +-
src/cli/Makefile.in | 160 +-
src/cli/main.cpp | 6 +-
src/cmd.cpp | 18 +-
src/cmd.h | 6 +-
src/cmd2.cpp | 504 +-
src/cmd2.h | 8 +-
src/cmd3.cpp | 22 +-
src/common.cpp | 23 +-
src/common.h | 14 +-
src/data.cpp | 15 +-
src/datatrans.cpp | 4 +-
src/fit.cpp | 16 +-
src/fit.h | 3 +-
src/fityk.cpp | 9 +-
src/func.cpp | 8 +-
src/func.h | 6 +-
src/guess.cpp | 49 +-
src/guess.h | 17 +-
src/info.cpp | 774 ++
src/info.h | 23 +
src/logic.cpp | 4 +-
src/logic.h | 14 +-
src/mgr.cpp | 32 +-
src/mgr.h | 19 +-
src/settings.h | 6 +-
src/ui.cpp | 109 +-
src/ui.h | 17 +-
src/var.cpp | 33 +-
src/var.h | 6 +-
src/view.cpp | 5 +-
src/wxgui/Makefile.am | 81 +-
src/wxgui/Makefile.in | 1011 ++-
src/wxgui/about.cpp | 4 +-
src/wxgui/aplot.cpp | 25 +-
src/wxgui/aplot.h | 6 +-
src/wxgui/app.cpp | 51 +-
src/wxgui/app.h | 4 +-
src/wxgui/atomtables.c | 1017 +++
src/wxgui/atomtables.h | 117 +
src/wxgui/callback.h | 78 -
src/wxgui/ceria.cpp | 781 ++
src/wxgui/ceria.h | 188 +
src/wxgui/cmn.cpp | 28 +-
src/wxgui/cmn.h | 23 +-
src/wxgui/dataedit.cpp | 851 +-
src/wxgui/dataedit.h | 116 +-
src/wxgui/datatable.cpp | 284 +
src/wxgui/datatable.h | 33 +
src/wxgui/dialogs.cpp | 196 +-
src/wxgui/dialogs.h | 27 +-
src/wxgui/dload.cpp | 69 +-
src/wxgui/fancyrc.cpp | 496 +-
src/wxgui/fancyrc.h | 140 +-
src/wxgui/fitinfo.cpp | 72 +-
src/wxgui/fitinfo.h | 4 +
src/wxgui/frame.cpp | 191 +-
src/wxgui/frame.h | 9 +-
src/wxgui/history.cpp | 218 +
src/wxgui/history.h | 43 +
src/wxgui/img/Makefile.am | 16 +-
src/wxgui/img/Makefile.in | 81 +-
src/wxgui/img/correction.h | 179 +
src/wxgui/img/info32.h | 91 +
src/wxgui/img/peak32.h | 109 +
src/wxgui/img/powdifpat.ico | Bin 0 -> 10806 bytes
src/wxgui/img/powdifpat16.xpm | 27 +
src/wxgui/img/powdifpat48.xpm | 163 +
src/wxgui/img/radiation32.h | 137 +
src/wxgui/img/rubik32.h | 23 +
src/wxgui/img/run32.h | 211 +
src/wxgui/img/sbprefs.h | 70 +-
src/wxgui/img/sizes32.h | 36 +
src/wxgui/inputline.cpp | 33 +-
src/wxgui/inputline.h | 22 +-
src/wxgui/mplot.cpp | 323 +-
src/wxgui/mplot.h | 43 +-
src/wxgui/pane.cpp | 18 +-
src/wxgui/pane.h | 10 +-
src/wxgui/plot.cpp | 78 +-
src/wxgui/plot.h | 16 +-
src/wxgui/powdifpat.cpp | 1515 ++++
src/wxgui/powdifpat.h | 96 +
src/wxgui/powdifpat.rc | 7 +
src/wxgui/pplot.cpp | 10 +-
src/wxgui/pplot.h | 4 +-
src/wxgui/sgchooser.cpp | 129 +
src/wxgui/sgchooser.h | 38 +
src/wxgui/sgtables.c | 1353 ++++
src/wxgui/sgtables.h | 60 +
src/wxgui/sidebar.cpp | 301 +-
src/wxgui/sidebar.h | 36 +-
src/wxgui/statbar.cpp | 17 +-
src/wxgui/uplot.cpp | 72 +-
src/wxgui/uplot.h | 30 +-
src/wxgui/xybrowser.cpp | 57 +-
swig/Makefile.am | 36 +
{python => swig}/Makefile.in | 272 +-
swig/fityk.i | 89 +
{python => swig}/fityk.py | 4 +
swig/fityk_lua.cpp | 5523 +++++++++++++
python/fityk_wrap.cpp => swig/fityk_python.cpp | 108 +-
xylib/Makefile.am | 6 +-
xylib/Makefile.in | 338 +-
xylib/README | 13 +-
xylib/TODO | 12 +-
xylib/sample-urls | 113 +
xylib/xyconv.1 | 24 +
xylib/xyconv.cpp | 120 +-
xylib/xylib/Makefile.am | 5 +-
xylib/xylib/Makefile.in | 273 +-
xylib/xylib/cache.h | 13 +-
xylib/xylib/xylib.cpp | 157 +-
xylib/xylib/xylib.h | 6 +-
190 files changed, 23048 insertions(+), 9873 deletions(-)
diff --cc debian/changelog
index 6d423e8,0000000..3bae42f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,197 -1,0 +1,204 @@@
++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 253ee3f,0000000..cb6a7d2
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,88 -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) \
++ --disable-xyconvert --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
--
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