[plplot] 34/68: Import Debian changes 5.8.0-5

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit f31fda36e8ca0f36d22eb5fbdce25ecaa39fe63a
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Dec 14 12:12:21 2007 +0100

    Import Debian changes 5.8.0-5
    
    plplot (5.8.0-5) unstable; urgency=low
    
      [ Andrew Ross ]
      * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for
        the c++ examples. This patch should ensure the examples build with gcc 4.3.
        (closes: #456040)
      * debian/control: Add Build-Depends-Indep section for those packages
        only used in building the documentation. Reduces package dependencies
        for autobuilders.
    
      [ Rafael Laboissiere ]
      * debian/control: Tighten build-dependency on libqhull-dev to version
        equal or greater 2003.1-8 because versions previous to that one were
        terribly broken.
---
 debian/changelog                                   | 17 ++++++++++
 debian/control                                     | 10 +++---
 debian/patches/00list                              |  1 +
 .../patches/06_build_dir_use_physical_path.dpatch  |  3 +-
 debian/patches/07_octave_prune_examples.dpatch     |  3 +-
 debian/patches/08_fix_cxx_includes.dpatch          | 36 ++++++++++++++++++++++
 6 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 462a1f8..144864c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+plplot (5.8.0-5) unstable; urgency=low
+
+  [ Andrew Ross ]
+  * debian/patches/08_fix_cxx_includes: Add patch to fix the include files for
+    the c++ examples. This patch should ensure the examples build with gcc 4.3.
+    (closes: #456040)
+  * debian/control: Add Build-Depends-Indep section for those packages
+    only used in building the documentation. Reduces package dependencies
+    for autobuilders.
+
+  [ Rafael Laboissiere ]
+  * debian/control: Tighten build-dependency on libqhull-dev to version
+    equal or greater 2003.1-8 because versions previous to that one were
+    terribly broken.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 14 Dec 2007 12:12:21 +0100
+
 plplot (5.8.0-4) unstable; urgency=low
 
   * debian/rules: rewrite the rules so the documentation is only built for
diff --git a/debian/control b/debian/control
index 2dca856..53288a8 100644
--- a/debian/control
+++ b/debian/control
@@ -9,14 +9,14 @@ Build-Depends: cmake (>= 2.4.5), debhelper (>= 5.0.38),
  libxi-dev, gfortran, itk3-dev, octave2.9-headers,
  libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev,
  libgnomeprintui2.2-dev, libgnomeui-dev,
- m4, libqhull-dev, libxml-parser-perl, libxml-dom-perl,
+ m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl,
  libltdl3-dev, pkg-config, dpatch, atlas3-base-dev
  [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k],
  python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev,
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
- python-numpy, ttf-freefont,
- docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x,
- opensp, jadetex, java-gcj-compat-dev, fastjar, swig
+ python-numpy, ttf-freefont, java-gcj-compat-dev, fastjar, swig
+Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
+ docbook2x, opensp, jadetex
 Build-Conflicts: libplplot5,  octave2.1-headers
 XS-Python-Version: all
 Homepage: http://www.plplot.org
@@ -80,8 +80,6 @@ Depends: java-gcj-compat, ${shlibs:Depends}
 Description: Scientific plotting library
  This packages contains the Java bindings for PLplot, a scientific
  plotting library.
- .
- Homepage: http://www.plplot.org
 
 Package: libcsiro0
 Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
index b9cc1e6..c65fc37 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,3 +4,4 @@
 05_octave_documentation
 06_build_dir_use_physical_path
 07_octave_prune_examples
+08_fix_cxx_includes
diff --git a/debian/patches/06_build_dir_use_physical_path.dpatch b/debian/patches/06_build_dir_use_physical_path.dpatch
index 6ab13af..0404193 100644
--- a/debian/patches/06_build_dir_use_physical_path.dpatch
+++ b/debian/patches/06_build_dir_use_physical_path.dpatch
@@ -1,6 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_build_dir_use_physical_path.dpatch by Andrew Ross <andrewross at users.sourceforge.n
-et>
+## 06_build_dir_use_physical_path.dpatch by Andrew Ross <andrewross at users.sourceforge.net>
 ##
 ## DP: Use physical path (resolve symlinks) when checking whether in build
 ## DP: directory. (This patch was taken from the upstream SVN repository.)
diff --git a/debian/patches/07_octave_prune_examples.dpatch b/debian/patches/07_octave_prune_examples.dpatch
index eaf2dd7..c370f69 100644
--- a/debian/patches/07_octave_prune_examples.dpatch
+++ b/debian/patches/07_octave_prune_examples.dpatch
@@ -1,6 +1,5 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_octave_prune_examples.dpatch by Andrew Ross <andrewross at users.sourceforge.n
-et>
+## 07_octave_prune_examples.dpatch by Andrew Ross <andrewross at users.sourceforge.net>
 ##
 ## DP: Don't run example p7 as part of ctest. It does not work well with postscript
 ## DP: and also fails on the alpha architecure, for reasons as yet unknown.
diff --git a/debian/patches/08_fix_cxx_includes.dpatch b/debian/patches/08_fix_cxx_includes.dpatch
new file mode 100644
index 0000000..997cdc3
--- /dev/null
+++ b/debian/patches/08_fix_cxx_includes.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_cxx_includes.dpatch by Andrew Ross <andrewross at users.sourceforge.net>
+##
+## DP: Add in missing include files for C++ examples to fix compile errors
+## DP: with gcc 4.3. (This patch was taken from the upstream SVN repository.)
+
+ at DPATCH@
+
+--- plplot-5.8.0.orig/examples/c++/plc++demos.h	(revision 8091)
++++ plplot-5.8.0/examples/c++/plc++demos.h	(working copy)
+@@ -8,7 +8,14 @@
+ 
+ /* common includes */
+ #include "plstream.h"
++
++/* plplot actually includes the C versions of these 2, but
++ * add here for completeness */
++#include <cstdio>
++#include <cstdlib>
++
+ #include <iostream>
++#include <cstring>
+ #include <cmath>
+ 
+ /* common defines */
+--- plplot-5.8.0.orig/examples/c++/x21.cc	(revision 8092)
++++ plplot-5.8.0/examples/c++/x21.cc	(working copy)
+@@ -27,7 +27,7 @@
+ //---------------------------------------------------------------------------//
+ 
+ #include "plc++demos.h"
+-#include <time.h>
++#include <ctime>
+ 
+ #if !defined(HAVE_ISNAN)
+   #define isnan(x) ((x) != (x))

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