[plplot] 06/68: Import Debian changes 5.3.1-5

Ole Streicher olebole at moszumanska.debian.org
Mon Jul 10 07:38:24 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 f808d021e01dbd9d006d52b3947b50d49832e5b1
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Sep 16 22:46:28 2005 +0200

    Import Debian changes 5.3.1-5
    
    plplot (5.3.1-5) unstable; urgency=low
    
      * First build with gcc/g++ 4.0.  This should complete the C++ ABI
        transition for the octave-plplot package (closes: #328198).
    
      * debian/rules: Avoid compilation problem of unrecognized type
        '__builtin_va_list' when building the Octave binding
        (closes: #274359).  I am fixing this bug using the hack of setting the
        CC variable of the Makefile, instead applying the patch suggested by
        Kaare Hviid <ukh_at_id.cbs.dk>, because otherwise I would have to run
        automake/libtool/autoconf to build the package. Lame, But It Works (TM).
    
      * debian/control: Upgraded Standards-Version to 3.6.2 (no changes needed).
    
      * debian/copyright: New FSF address.
    
      * debian/patches/50_simplelist-in-man-page.dpatch: Added patch to fix
        processing of plcol0.3plplot man page.
---
 debian/changelog                                | 25 ++++++++-
 debian/control                                  |  2 +-
 debian/copyright                                |  5 +-
 debian/patches/00list                           |  1 +
 debian/patches/50_simplelist-in-man-page.dpatch | 72 +++++++++++++++++++++++++
 debian/rules                                    |  6 +++
 6 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68e1b7a..71bb63c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+plplot (5.3.1-5) unstable; urgency=low
+
+  * First build with gcc/g++ 4.0.  This should complete the C++ ABI
+    transition for the octave-plplot package (closes: #328198).
+
+  * debian/rules: Avoid compilation problem of unrecognized type
+    '__builtin_va_list' when building the Octave binding
+    (closes: #274359).  I am fixing this bug using the hack of setting the
+    CC variable of the Makefile, instead applying the patch suggested by
+    Kaare Hviid <ukh_at_id.cbs.dk>, because otherwise I would have to run
+    automake/libtool/autoconf to build the package. Lame, But It Works (TM).
+
+  * debian/control: Upgraded Standards-Version to 3.6.2 (no changes needed).
+
+  * debian/copyright: New FSF address.
+
+  * debian/patches/50_simplelist-in-man-page.dpatch: Added patch to fix
+    processing of plcol0.3plplot man page.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 16 Sep 2005 22:46:28 +0200
+
 plplot (5.3.1-4) unstable; urgency=low
 
   * debian/rules: Added --with-freefont option to configure
@@ -1117,7 +1138,7 @@ plplot (4.99j-8) frozen unstable; urgency=low
 
  -- Rafael Laboissiere <rafael at icp.inpg.fr>  Fri, 11 Dec 1998 22:20:08 +0100
 
-plplot (4.99j-7) frozen unstable; urgency=low, closes=29694 29704
+plplot (4.99j-7) frozen unstable; urgency=low
 
   * Set Conflicts relationship because files were moved around in the
     latest release (Fixes Bug#29694, reported by  Francesco Potorti`
@@ -1127,7 +1148,7 @@ plplot (4.99j-7) frozen unstable; urgency=low, closes=29694 29704
 
  -- Rafael Laboissiere <rafael at icp.inpg.fr>  Thu, 19 Nov 1998 16:33:24 +0100
 
-plplot (4.99j-6) frozen unstable; urgency=low, closes=28534
+plplot (4.99j-6) frozen unstable; urgency=low
 
   * Uploading to frozen and unstable.  (The previous release, 4.99j-5, was
     rejected and I never reuploaded it.)
diff --git a/debian/control b/debian/control
index ce6f78b..7024d6c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: plplot
 Section: math
 Priority: optional
 Maintainer: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2
 Build-Depends: debhelper (>= 4.1.67), tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, g77, fort77 [m68k], itk3-dev, python-numeric | python2.3-numeric, python-dev | python2.3-dev, octave2.1-headers (>= 2.1.65), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome-dev, m4, perl, libqhull-dev, libxml-parser-perl, libxml-dom-perl, matwrap, autotools-dev, libltdl3-dev, pkg-config, dpatch, atlas3-base-dev [!arm !m68k], refblas3-dev [arm m68k], lapack3-dev [arm m68k]
 Build-Conflicts: libplplot5
 
diff --git a/debian/copyright b/debian/copyright
index ec3fb7a..8aab3f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,9 +30,8 @@ The PLplot package may be distributed under the following terms:
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc. [59 Temple Place - Suite 330, Boston, MA
-    02111-1307, USA.]
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 The text of this license is given in the file COPYING.LIB in the
 distribution directory.  [In Debian systems, see the file
diff --git a/debian/patches/00list b/debian/patches/00list
index 8b13789..3a7b29f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
 
+50_simplelist-in-man-page
diff --git a/debian/patches/50_simplelist-in-man-page.dpatch b/debian/patches/50_simplelist-in-man-page.dpatch
new file mode 100644
index 0000000..74d4fbb
--- /dev/null
+++ b/debian/patches/50_simplelist-in-man-page.dpatch
@@ -0,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_simplelist-in-man-page.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fix processing of simplelist in plcol0 man page
+
+ at DPATCH@
+
+--- plplot-5.3.1.orig/doc/docbook/src/plcol0.3plplot
++++ plplot-5.3.1/doc/docbook/src/plcol0.3plplot
+@@ -12,7 +12,61 @@
+ .SH ARGUMENTS
+ .TP
+ \fIcolor\fP (PLINT, input) 
+-Integer representing the color.  The defaults at present are (these may change): 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 black (default background)red (default foreground)yellowgreenaquamarinepinkwheatgreybrownblueBlueVioletcyanturquoisemagentasalmonwhite Use \fBplscmap0\fP(3plplot) to change the entire map0 color palette and \fBplscol0\fP(3plplot) to change an individual color in the map0 color palette. 
++Integer representing the color.  The defaults at present are (these may change): 
++.RS
++.P
++.PD 0
++.P
++0  
++black (default background) 
++.P
++1  
++red (default foreground) 
++.P
++2  
++yellow 
++.P
++3  
++green 
++.P
++4  
++aquamarine 
++.P
++5  
++pink 
++.P
++6  
++wheat 
++.P
++7  
++grey 
++.P
++8  
++brown 
++.P
++9  
++blue 
++.P
++10  
++BlueViolet 
++.P
++11  
++cyan 
++.P
++12  
++turquoise 
++.P
++13  
++magenta 
++.P
++14  
++salmon 
++.P
++15  
++white 
++.PD
++.P
++ Use \fBplscmap0\fP(3plplot) to change the entire map0 color palette and \fBplscol0\fP(3plplot) to change an individual color in the map0 color palette. 
+ 
+ .SH AUTHORS
+ Geoffrey Furnish and Maurice LeBrun wrote and maintain PLplot.  This man page
diff --git a/debian/rules b/debian/rules
index 3df802a..8857bbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,12 @@ config-stamp: autotools-stamp
 build: build-stamp
 build-stamp: patch config-stamp
 	dh_testdir
+	# The hack below is to go around a bug in matwrap that was
+	# preventing the Octave binding to compile with g++ 4.0
+	( cd lib ; $(MAKE) )
+	( cd src ; $(MAKE) )
+	( cd bindings/octave ; \
+	  $(MAKE) CC="gcc -D__builtin_va_list=void" plplot_octave.oct )
 	$(MAKE)
 	touch build-stamp
 

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

More information about the debian-science-commits mailing list