[Pkg-octave-commit] r2637 - in octave/trunk/debian: . in patches

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-10 21:20:43 +0000 (Tue, 10 Feb 2009)
New Revision: 2637

Removed:
   octave/trunk/debian/patches/suitesparse-3.2.0.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/00list
   octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
Log:
Preparation for new upstream development snapshot


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-09 09:44:19 UTC (rev 2636)
+++ octave/trunk/debian/changelog	2009-02-10 21:20:43 UTC (rev 2637)
@@ -1,5 +1,10 @@
-octave3.0 (1:3.0.4~rc3-2) UNRELEASED; urgency=low
+octave3.1 (3.1.52-1) UNRELEASED; urgency=low
 
+  * New upstream development snapshot
+  * debian/patches/:
+    + dont_set_helvetica.dpatch: Adapt patch for this new release
+    + glpk-new-api.dpatch, sane-file-stat-return.dpatch: Drop patches
+    (applied upstream)
   * debian/rules:
     + In the binary-indep rule, remove the ls-R file installed in the
       /usr/share directory.

Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list	2009-02-09 09:44:19 UTC (rev 2636)
+++ octave/trunk/debian/in/00list	2009-02-10 21:20:43 UTC (rev 2637)
@@ -22,7 +22,4 @@
 50_octave-bug-tempfile
 no_pdf_in_print.dpatch
 dont_set_helvetica-3.1.dpatch
-suitesparse-3.2.0.dpatch
-glpk-new-api.dpatch
-sane-file-stat-return.dpatch
 :]

Modified: octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
===================================================================
--- octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch	2009-02-09 09:44:19 UTC (rev 2636)
+++ octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch	2009-02-10 21:20:43 UTC (rev 2637)
@@ -10,7 +10,7 @@
 diff -urNad octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m
 --- octave3.0-3.0.1~/scripts/plot/__go_draw_axes__.m	2008-04-21 18:00:20.000000000 +0200
 +++ octave3.0-3.0.1/scripts/plot/__go_draw_axes__.m	2008-05-25 17:30:08.000000000 +0200
-@@ -1601,7 +1601,7 @@
+@@ -1570,7 +1570,7 @@
  
  function [f, s, fnt, it, bld] = get_fontname_and_size (t)
    if (isempty (t.fontname))
@@ -30,12 +30,12 @@
      it = false;
 --- octave3.1-3.1.50.orig/src/graphics.cc
 +++ octave3.1-3.1.50/src/graphics.cc
-@@ -2151,7 +2151,7 @@
-   plotboxaspectratio = Matrix (1, 3, 1.0);
-   drawmode = "normal";
-   fontangle = "normal";
--  fontname = "Helvetica";
-+  fontname = "*";
-   fontsize = 12;
-   fontunits = "points";
-   fontweight = "normal";
+@@ -2528,7 +2528,7 @@
+   if (mode != "replace")
+     {
+       fontangle = "normal";
+-      fontname = "Helvetica";
++      fontname = "*";
+       fontsize = 12;
+       fontunits = "points";
+       fontweight = "normal";

Deleted: octave/trunk/debian/patches/suitesparse-3.2.0.dpatch
===================================================================
--- octave/trunk/debian/patches/suitesparse-3.2.0.dpatch	2009-02-09 09:44:19 UTC (rev 2636)
+++ octave/trunk/debian/patches/suitesparse-3.2.0.dpatch	2009-02-10 21:20:43 UTC (rev 2637)
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## polyfit-scaling.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Addapt SparseCholError prototype to SuiteSparse 3.2.0
-
- at DPATCH@
---- octave3.0-3.0.3.orig/liboctave/sparse-util.cc
-+++ octave3.0-3.0.3/liboctave/sparse-util.cc
-@@ -31,7 +31,7 @@
- #include "sparse-util.h"
- 
- void
--SparseCholError (int status, char *file, int line, char *message)
-+SparseCholError (int status, const char *file, int line, const char *message)
- {
-   (*current_liboctave_warning_handler)("warning %i, at line %i in file %s",
- 				     status, line, file);
---- octave3.0-3.0.3.orig/liboctave/sparse-util.h
-+++ octave3.0-3.0.3/liboctave/sparse-util.h
-@@ -24,7 +24,7 @@
- #if !defined (octave_sparse_util_h)
- #define octave_sparse_util_h 1
- 
--extern OCTAVE_API void SparseCholError (int status, char *file, int line, char *message);
-+extern OCTAVE_API void SparseCholError (int status, const char *file, int line, const char *message);
- extern OCTAVE_API int SparseCholPrint (const char *fmt, ...);
- 
- #endif