[Pkg-octave-commit] rev 518 - in trunk/packages/octplot/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-03-18 09:06:32 +0000 (Sat, 18 Mar 2006)
New Revision: 518

Added:
   trunk/packages/octplot/debian/patches/g++-4.1-fixes.patch
Modified:
   trunk/packages/octplot/debian/changelog
Log:
Debian release octplot_0.3.5-2

Modified: trunk/packages/octplot/debian/changelog
===================================================================
--- trunk/packages/octplot/debian/changelog	2006-03-17 07:50:31 UTC (rev 517)
+++ trunk/packages/octplot/debian/changelog	2006-03-18 09:06:32 UTC (rev 518)
@@ -1,6 +1,13 @@
+octplot (0.3.5-2) unstable; urgency=low
+
+  * debian/patches/g++-4.1-fixes.patch: Fix compilation problems with g++
+    4.1 (thanks to Martin Michlmayr <tbm at cyrius.com>, closes: #357565)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 18 Mar 2006 09:09:55 +0100
+
 octplot (0.3.5-1) unstable; urgency=low
 
-   [ Thomas Weber ]
+  [ Thomas Weber ]
   * new upstream version
   * removed patches (applied upstream)
     - octplot.figure.cpp.patch
@@ -71,7 +78,7 @@
     (save-excursion
       (forward-line -1)
       (beginning-of-line)
-      (insert "\n   NOT YET RELEASED!\n\n   [ "
+      (insert "\n   NOT YET RELEASED!\n\n  [ "
         (or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
   nil t)
 End:

Added: trunk/packages/octplot/debian/patches/g++-4.1-fixes.patch
===================================================================
--- trunk/packages/octplot/debian/patches/g++-4.1-fixes.patch	2006-03-17 07:50:31 UTC (rev 517)
+++ trunk/packages/octplot/debian/patches/g++-4.1-fixes.patch	2006-03-18 09:06:32 UTC (rev 518)
@@ -0,0 +1,22 @@
+--- octplot-0.3.5/src/FTGL/FTTextureGlyph.h	2006-03-18 06:15:19.000000000 +0000
++++ octplot-0.3.5-new/src/FTGL/FTTextureGlyph.h	2006-03-18 06:15:23.000000000 +0000
+@@ -52,7 +52,7 @@
+          * Reset the currently active texture to zero to get into a known state before
+          * drawing a string. This is to get round possible threading issues.
+          */
+-        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
++        static void ResetActiveTexture(){ activeTextureID = 0;}
+         
+     private:
+         /**
+--- octplot-0.3.5/src/axes.h	2006-03-18 06:12:16.000000000 +0000
++++ octplot-0.3.5-new/src/axes.h	2006-03-18 06:12:21.000000000 +0000
+@@ -40,7 +40,7 @@
+ 		 ocpl::Real& axis_x, ocpl::Real& axis_y);
+ 
+   //! size of a screen pixel in axes coordinates
+-  void Axes::GetPixel(ocpl::Real& dx, ocpl::Real& dy);
++  void GetPixel(ocpl::Real& dx, ocpl::Real& dy);
+   //! Sets the x-y axes limits 
+   void SetLimits(ocpl::Real x1,ocpl::Real y1,ocpl::Real x2,ocpl::Real y2);
+   //! Sets up limits if they are automatic


Property changes on: trunk/packages/octplot/debian/patches/g++-4.1-fixes.patch
___________________________________________________________________
Name: svn:executable
   + *