Tags: 485894 +pending thanks As I had said, I'll do an NMU to fix this bug.
I have taken the opportunity to fix a number of pending easy patches
(outdated build-dependencies, gcc 4.4 compatibility, etc)
I'm attaching the interdiff output for the changes I made
--
Bezos, (o.
Marga. (/)_
diff -u gnudatalanguage-0.9~rc1/configure gnudatalanguage-0.9~rc1/configure
--- gnudatalanguage-0.9~rc1/configure
+++ gnudatalanguage-0.9~rc1/configure
@@ -20655,16 +20655,16 @@
INCLUDES="$INCLUDES -I$with_Magick/include"
else
LIBS="$LIBS -lMagick++"
- INCLUDES="$INCLUDES -I/usr/include/magick"
+ INCLUDES="$INCLUDES `Magick-config --cppflags`"
fi
- { echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagick" >&5
-echo $ECHO_N "checking for GetMagickVersion in -lMagick... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for GetMagickVersion in -lMagickCore" >&5
+echo $ECHO_N "checking for GetMagickVersion in -lMagickCore... $ECHO_C" >&6; }
if test "${ac_cv_lib_Magick_GetMagickVersion+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lMagick $LIBS"
+LIBS="`Magick-config --libs` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
diff -u gnudatalanguage-0.9~rc1/src/antlr/CharScanner.hpp gnudatalanguage-0.9~rc1/src/antlr/CharScanner.hpp
--- gnudatalanguage-0.9~rc1/src/antlr/CharScanner.hpp
+++ gnudatalanguage-0.9~rc1/src/antlr/CharScanner.hpp
@@ -10,6 +10,7 @@
#include <antlr/config.hpp>
+#include <cstdio>
#include <map>
#include <cstring>
diff -u gnudatalanguage-0.9~rc1/debian/changelog gnudatalanguage-0.9~rc1/debian/changelog
--- gnudatalanguage-0.9~rc1/debian/changelog
+++ gnudatalanguage-0.9~rc1/debian/changelog
@@ -1,3 +1,18 @@
+gnudatalanguage (0.9~rc1-1.2) unstable; urgency=low
+
+ * Non-maintainer upload to fix FTBFS and other bugs.
+ * Applied patch provided by naoliv to make gnudatalanguage compile with
+ the new imagemagick (Closes: #485894)
+ * Applied patch provided by Martin Michlmayr to make gnudatalanguage
+ compile with gcc 4.4 (Closes: #504861)
+ * Applied improved watch file, thanks to Daniel Leidert for the file.
+ (Closes: #480455)
+ * Changed fftw3-dev to libfftw3-dev at Build-Depends, thanks to Marco
+ Rodrigues for the report. (Closes: #488169)
+ * Changed netcdfg-dev to libnetcdfg-dev at Build-Depends.
+
+ -- Margarita Manterola <[email protected]> Wed, 27 May 2009 00:14:58 +0000
+
gnudatalanguage (0.9~rc1-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -u gnudatalanguage-0.9~rc1/debian/watch gnudatalanguage-0.9~rc1/debian/watch
--- gnudatalanguage-0.9~rc1/debian/watch
+++ gnudatalanguage-0.9~rc1/debian/watch
@@ -1,5 +1,3 @@
-# Compulsory line, this is a version 3 file
version=3
-
-# Uncomment to find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/gnudatalanguage/gdl-(.*)\.tar\.gz
+opts=uversionmangle=s/(pre|rc)([^.]*)/~$1$2/ \
+ http://sf.net/gnudatalanguage/gdl-(.*)\.tar\.gz
diff -u gnudatalanguage-0.9~rc1/debian/control gnudatalanguage-0.9~rc1/debian/control
--- gnudatalanguage-0.9~rc1/debian/control
+++ gnudatalanguage-0.9~rc1/debian/control
@@ -3,7 +3,7 @@
Uploaders: Juan A. Añel <[email protected]>
Section: interpreters
Priority: optional
-Build-Depends: debhelper (>= 5), autotools-dev, python-support, fftw3-dev, libgsl0-dev, libhdf4g-dev, libhdf5-serial-dev, libmagick++9-dev, libplplot-dev, libreadline5-dev, zlib1g-dev, netcdfg-dev, python-all-dev, python-numarray
+Build-Depends: debhelper (>= 5), autotools-dev, python-support, libfftw3-dev, libgsl0-dev, libhdf4g-dev, libhdf5-serial-dev, libmagick++-dev, libplplot-dev, libreadline5-dev, zlib1g-dev, libnetcdfg-dev, python-all-dev, python-numarray
Standards-Version: 3.7.3
Homepage: http://gnudatalanguage.sourceforge.net/
signature.asc
Description: Digital signature
