Bug#377372: libphp-phplot: Still mentions and depends PHP3

[Barry deFreese]

tags 377372 + patch

thank you

Hi,

Attach is an NMU that resolves this bug as well as #435176 and #450253.

Thanks,

Barry deFreese



diff -u libphp-phplot-4.4.6+5.0rc1.dfsg/debian/changelog libphp-phplot-4.4.6+5.0rc1.dfsg/debian/changelog
--- libphp-phplot-4.4.6+5.0rc1.dfsg/debian/changelog
+++ libphp-phplot-4.4.6+5.0rc1.dfsg/debian/changelog
@@ -1,3 +1,13 @@
+libphp-phplot (4.4.6+5.0rc1.dfsg-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Change depends to PHP5. (Closes: #377372).
+  * phplot.php: ensure that array_merge gets array params. (Closes: #435176).
+    + Thanks to dAniel hAhler.
+  * Fix watch file. (Closes: #450253).
+
+ -- Barry deFreese <[EMAIL PROTECTED]>  Mon, 31 Mar 2008 12:28:35 -0400
+
 libphp-phplot (4.4.6+5.0rc1.dfsg-0.1) unstable; urgency=high
 
   * Non-maintainer upload.
diff -u libphp-phplot-4.4.6+5.0rc1.dfsg/debian/control libphp-phplot-4.4.6+5.0rc1.dfsg/debian/control
--- libphp-phplot-4.4.6+5.0rc1.dfsg/debian/control
+++ libphp-phplot-4.4.6+5.0rc1.dfsg/debian/control
@@ -7,10 +7,10 @@
 
 Package: libphp-phplot
 Architecture: all
-Depends: php4 | php4-cli | php3 | php3-cgi, php4-gd | php3-gd | php3-cgi-gd
+Depends: php5 | php5-cli, php5-gd
 Description: The graphic library for PHP
  A library for PHP, to allow for dynamic scientific, business and 
- stock-market charts. Currently supports PHP3, PHP4, TTF (or no ttf)
+ stock-market charts. Currently supports PHP5, TTF (or no ttf)
  and GD version 1.2 - latest. Includes Pie, Line, Area, Point and 
  combination plots.
 
diff -u libphp-phplot-4.4.6+5.0rc1.dfsg/debian/watch libphp-phplot-4.4.6+5.0rc1.dfsg/debian/watch
--- libphp-phplot-4.4.6+5.0rc1.dfsg/debian/watch
+++ libphp-phplot-4.4.6+5.0rc1.dfsg/debian/watch
@@ -1,2 +1,3 @@
-version=2
-http://dl.sourceforge.net/p/ph/phplot/ (?:.*/)?phplot-?_?([\w+\d+\.]+|\d+)(\.tar|\.tgz)(\.gz|\.bz2|) debian 
+version=3
+
+http://sf.net/phplot/phplot-([\d.]+)\.tar\.gz
only in patch2:
unchanged:
--- libphp-phplot-4.4.6+5.0rc1.dfsg.orig/phplot.php
+++ libphp-phplot-4.4.6+5.0rc1.dfsg/phplot.php
@@ -4077,6 +4077,10 @@
  */
 function array_pad_array(&$arr, $size, $arr2=NULL)
 {
+    // Fix for "is not an array" warnings in PHP5:
+    if (! is_array($arr)) {
+        $arr = array($arr);
+    }
     if (! is_array($arr2)) {
         $arr2 = $arr;                           // copy the original array
     }