[fityk] 15/45: Imported Debian patch 0.7.8-2

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository fityk.

commit 0f9b34572f806698a908c195536be689de4a0298
Author: Carlo Segre <segre at debian.org>
Date:   Sat Aug 18 11:08:05 2007 -0500

    Imported Debian patch 0.7.8-2
---
 debian/changelog     | 10 ++++++++++
 debian/compat        |  1 +
 debian/fityk.desktop | 16 +++++++++-------
 debian/menu          |  2 +-
 debian/rules         |  7 +------
 fityk.desktop        | 10 +++++-----
 src/numfuncs.h       |  2 ++
 7 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f9770e..620b035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/fityk.desktop b/debian/fityk.desktop
index ff9771f..cb9496c 100644
--- a/debian/fityk.desktop
+++ b/debian/fityk.desktop
@@ -1,10 +1,12 @@
 [Desktop Entry]
-Version=1.0
+Type=Application
 Encoding=UTF-8
-Name=Fityk Curve Fitting
+Name=Fityk
 GenericName=Curve Fitter
-Comment=Fit analytical functions to data
-Type=Application
-Exec=fityk
-Icon=fityk
-Categories=Application;Math;Physics;Science;
+Icon=/usr/share/pixmaps/fityk.xpm
+Comment=Peak fitting and data analysis
+Exec=fityk %F
+Terminal=False
+StartupNotify=True
+MimeType=application/x-fityk;
+Categories=Education;Science;DataVisualization;
diff --git a/debian/menu b/debian/menu
index b8479a2..038b226 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,5 +1,5 @@
 ?package(fityk):needs="X11"				\
-		section="Apps/Science"			\
+		section="Applications/Science/Data Analysis"	\
 		title="fityk"				\
 		command="/usr/bin/fityk"		\
 		icon="/usr/share/pixmaps/fityk.xpm"
diff --git a/debian/rules b/debian/rules
index 6fe8a6d..ef34a42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/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)
 
@@ -34,7 +32,7 @@ clean:
 	dh_testroot
 	rm -f build-stamp 
 	-rm -f config.sub config.guess
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 
 	dh_clean
@@ -49,10 +47,7 @@ install: build
 	$(MAKE) install prefix=$(CURDIR)/debian/fityk/usr
 	mkdir $(CURDIR)/debian/fityk/usr/share/pixmaps
 	cp src/wxgui/img/fityk.xpm $(CURDIR)/debian/fityk/usr/share/pixmaps/
-	# 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/
diff --git a/fityk.desktop b/fityk.desktop
index 2d65a90..cb9496c 100644
--- a/fityk.desktop
+++ b/fityk.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=fityk
-Comment=peak fitting and data analysis
+Name=Fityk
 GenericName=Curve Fitter
-Icon=fityk
+Icon=/usr/share/pixmaps/fityk.xpm
+Comment=Peak fitting and data analysis
 Exec=fityk %F
 Terminal=False
-StartupNotify=true
+StartupNotify=True
 MimeType=application/x-fityk;
-Categories=Application;Science;GTK;
+Categories=Education;Science;DataVisualization;
diff --git a/src/numfuncs.h b/src/numfuncs.h
index 8380d30..93111f7 100644
--- a/src/numfuncs.h
+++ b/src/numfuncs.h
@@ -8,6 +8,8 @@
 #define FITYK__NUMFUNCS__H__
 
 #include "common.h"
+#include <cstdlib>
+#include <climits>
 
 
 struct B_point;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fityk.git