[plplot] 49/68: Import Debian changes 5.9.5-3

Mon Jul 10 07:38:35 UTC 2017

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

olebole pushed a commit to branch master
in repository plplot.

commit 5acfd221255da4b45da09996a32012dce663f2ea
Author: Andrew Ross <andrewross at users.sourceforge.net>
Date:   Mon Mar 1 14:03:40 2010 +0000

    Import Debian changes 5.9.5-3
    
    plplot (5.9.5-3) unstable; urgency=low
    
      * debian/control.in:
          + Remove Rafael Laboissiere from the list of uploaders as he has
            now retired from Debian (closes: #571874).
          + Bump Debian standards version to 3.8.4.
      * debian/control.in, debian/rules: Correctly disable ada support for
        sh4 (closes: #572028). Enable ada support on armel now that gnat is
        available (closes: #568451).
      * debian/rules: Force tclsh to /usr/bin/tclsh8.5 - avoids problems if
        tcl8.4 is also installed so /usr/bin/tclsh points to a different
        version.
      * debian/patches/17_fix_cmap_support.diff, debian/patches/series: Add
        bug fix patch from upstream to fix cmap palette support. This fixes
        the blank pages in the ada examples (and possibly user code).
---
 debian/changelog                        | 18 +++++++++++++++++
 debian/control                          |  5 ++---
 debian/control.in                       |  5 ++---
 debian/patches/17_fix_cmap_support.diff | 34 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 debian/rules                            |  3 ++-
 6 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 224f961..658beb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+plplot (5.9.5-3) unstable; urgency=low
+
+  * debian/control.in: 
+      + Remove Rafael Laboissiere from the list of uploaders as he has 
+        now retired from Debian (closes: #571874).
+      + Bump Debian standards version to 3.8.4.
+  * debian/control.in, debian/rules: Correctly disable ada support for 
+    sh4 (closes: #572028). Enable ada support on armel now that gnat is 
+    available (closes: #568451).
+  * debian/rules: Force tclsh to /usr/bin/tclsh8.5 - avoids problems if 
+    tcl8.4 is also installed so /usr/bin/tclsh points to a different 
+    version.
+  * debian/patches/17_fix_cmap_support.diff, debian/patches/series: Add
+    bug fix patch from upstream to fix cmap palette support. This fixes
+    the blank pages in the ada examples (and possibly user code).
+
+ -- Andrew Ross <andrewross at users.sourceforge.net>  Tue, 01 Mar 2010 14:03:40 +0000
+
 plplot (5.9.5-2) unstable; urgency=low
 
   * debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be 
diff --git a/debian/control b/debian/control
index 8067778..3fcd373 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: plplot
 Section: math
 Priority: optional
 Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
-Uploaders: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), 
  tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
  libxi-dev, gfortran, itk3-dev, octave3.2-headers,
@@ -12,7 +11,7 @@ Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
  quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, 
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
  python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
- fastjar, swig, gnat [!armel !sh4]
+ fastjar, swig, gnat [!sh4]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex, ghostscript
 Build-Conflicts: libplplot5, octave3.0-headers
diff --git a/debian/control.in b/debian/control.in
index 1fa2ccd..89ede35 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,8 +2,7 @@ Source: plplot
 Section: math
 Priority: optional
 Maintainer: Andrew Ross <andrewross at users.sourceforge.net>
-Uploaders: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), 
  tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev,
  libxi-dev, gfortran, itk3-dev, octave3.2-headers,
@@ -12,7 +11,7 @@ Build-Depends: cmake (>= 2.6.3), debhelper (>= 7),
  quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, 
  python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6),
  python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk,
- fastjar, swig, gnat [!armel !sh4]
+ fastjar, swig, gnat [!sh4]
 Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl,
  docbook2x, opensp, jadetex, ghostscript
 Build-Conflicts: libplplot5, octave3.0-headers
diff --git a/debian/patches/17_fix_cmap_support.diff b/debian/patches/17_fix_cmap_support.diff
new file mode 100644
index 0000000..5b1dc3b
--- /dev/null
+++ b/debian/patches/17_fix_cmap_support.diff
@@ -0,0 +1,34 @@
+# Patch from upstream to fix bug with cmap palette support - causes problems with ada examples.
+
+diff -ur plplot-5.9.5-orig/src/plctrl.c plplot-5.9.5/src/plctrl.c
+--- plplot-5.9.5.orig/src/plctrl.c     2009-01-18 20:24:12.000000000 +0000
++++ plplot-5.9.5/src/plctrl.c          2010-01-18 23:52:40.000000000 +0000
+@@ -836,7 +836,8 @@
+ /*--------------------------------------------------------------------------*\
+  * plcmap0_def()
+  *
+- * Initializes specified color map 0 color entry to its default.
++ * Initializes specified color map 0 color entry to its default for
++ * index range from imin to imax.
+ \*--------------------------------------------------------------------------*/
+ 
+ void
+@@ -847,6 +848,9 @@
+   int number_colors;
+   if(imin <= imax) {
+     cmap0_palette_read("", &number_colors, &r, &g, &b, &a);
++    for (i = imin; i <= MIN((number_colors-1),imax); i++)
++      color_def(i, r[i], g[i], b[i], a[i],
++              "colors defined by default cmap0 palette file");
+     free(r);
+     free(g);
+     free(b);
+@@ -860,7 +864,7 @@
+      to opaque red as a warning. */
+   for (i = MAX(number_colors, imin); i <= imax; i++)
+     color_def(i, 255, 0, 0, 1.0,
+-              "opaque red to mark not defined by palette file");
++              "opaque red colour to mark not defined by palette file");
+ }
+ 
+ /*--------------------------------------------------------------------------*\
diff --git a/debian/patches/series b/debian/patches/series
index d8057e6..b2c4abf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 07_octave_prune_examples.diff
 11_minus-sign-manpage.diff
 16_wxwidget-with-cmake-2.8.diff
+17_fix_cmap_support.diff
diff --git a/debian/rules b/debian/rules
index fa6f0ce..4c5df9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 # Disable Ada build on armel - gnat not available on armel at the moment.
 
-ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:armel:))
+ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:sh4:))
 BUILD_ADA = no
 else
 BUILD_ADA = yes
@@ -59,6 +59,7 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \
 	-DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON  -DENABLE_ocaml=OFF \
 	-DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \
         -DDEFAULT_NO_QT_DEVICES=ON \
+        -DTCL_TCLSH=/usr/bin/tclsh8.5 \
 	$(ADA_OPTIONS) $(JAVA_OPTIONS) 
 
 BUILD_DIR = $(debbase)/build_tmp

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

