[fityk] 09/45: Imported Debian patch 0.7.5-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 9064bfc45b0c07c43ec6f3364ee14be7b05a498e
Merge: cf13f73 25d4aa0
Author: Carlo Segre <segre at debian.org>
Date: Wed Aug 2 13:30:07 2006 -0500
Imported Debian patch 0.7.5-1
INSTALL | 10 +-
NEWS | 15 +
TODO | 64 ++-
configure | 2 +-
configure.ac | 4 +-
debian/changelog | 13 +
debian/fityk.1 | 61 ---
debian/rules | 5 +-
doc/fitykhelp.htb | Bin 123349 -> 124183 bytes
doc/fitykhelp.html | 250 +++++----
doc/fitykhelp.xml | 202 ++++---
fityk.desktop | 2 +-
fityk.iss | 6 +-
fityk.spec | 2 +-
samples/test_syntax.fit | 2 +
src/GAfit.cpp | 9 +-
src/GAfit.h | 4 +-
src/LMfit.cpp | 72 ++-
src/LMfit.h | 14 +-
src/Makefile.am | 9 +-
src/Makefile.in | 23 +-
src/NMfit.cpp | 9 +-
src/NMfit.h | 8 +-
src/{calc.cpp => ast.cpp} | 38 +-
src/{calc.h => ast.h} | 57 +-
src/{func.cpp => bfunc.cpp} | 741 +-------------------------
src/{func.h => bfunc.h} | 144 +----
src/calc.cpp | 1118 +++++++++------------------------------
src/calc.h | 119 ++---
src/cmd.cpp | 16 +-
src/cmd2.cpp | 87 ++-
src/common.cpp | 9 +-
src/common.h | 15 +-
src/datatrans.cpp | 674 +++++++++++++++++++-----
src/datatrans.h | 3 +-
src/datatrans2.h | 9 +-
src/fit.cpp | 113 +++-
src/fit.h | 14 +-
src/func.cpp | 1230 ++++++++-----------------------------------
src/func.h | 288 +++-------
src/guess.cpp | 56 +-
src/guess.h | 6 +-
src/img/Makefile.am | 4 +-
src/img/Makefile.in | 4 +-
src/img/exec_selected.xpm | 209 ++++++++
src/img/open.xpm | 200 +++++++
src/logic.cpp | 4 +-
src/logic.h | 25 +-
src/numfuncs.cpp | 4 +-
src/settings.cpp | 17 +-
src/sum.cpp | 10 +-
src/u_main.cpp | 34 +-
src/ui.h | 9 +-
src/var.cpp | 380 ++++++-------
src/var.h | 65 ++-
src/wx_common.cpp | 12 +-
src/wx_common.h | 3 +-
src/wx_dlg.cpp | 608 ++++++++++++++++++++-
src/wx_dlg.h | 72 ++-
src/wx_fdlg.cpp | 130 ++++-
src/wx_fdlg.h | 22 +-
src/wx_gui.cpp | 161 ++++--
src/wx_gui.h | 9 +-
src/wx_mplot.cpp | 225 ++++----
src/wx_mplot.h | 14 +-
src/wx_pane.cpp | 393 +++++++++++---
src/wx_pane.h | 112 +++-
src/wx_plot.cpp | 46 +-
src/wx_plot.h | 4 +-
69 files changed, 4013 insertions(+), 4286 deletions(-)
diff --cc debian/changelog
index 5896f8e,0000000..a3dde3e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,60 -1,0 +1,73 @@@
++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/rules
index 5f4fa66,0000000..bdffe20
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,84 -1,0 +1,87 @@@
+#!/usr/bin/make -f
+
+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 --disable-optimization --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/
- dh_install debian/fityk.desktop usr/share/applications/
++ # The first .desktop file is from upstream, the second from Ubuntu
++ # pick your poison...
++ dh_install fityk.desktop usr/share/applications/
++# dh_install debian/fityk.desktop usr/share/applications/
+ dh_desktop
+ 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
--
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