[Pkg-octave-commit] r2763 - in octave/trunk/debian: . in patches
Rafael Laboissiere
rafael at alioth.debian.org
Thu Mar 26 21:02:46 UTC 2009
Author: rafael
Date: 2009-03-26 21:02:46 +0000 (Thu, 26 Mar 2009)
New Revision: 2763
Removed:
octave/trunk/debian/patches/pretty-png-svg-print.dpatch
octave/trunk/debian/patches/remove-y.tab.h-in-maintainer-clean.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 release
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2009-03-25 22:37:48 UTC (rev 2762)
+++ octave/trunk/debian/changelog 2009-03-26 21:02:46 UTC (rev 2763)
@@ -1,3 +1,12 @@
+octave3.1 (3.1.55-1) UNRELEASED; urgency=low
+
+ * New upstream development snapshot
+ * debian/patches/dont_set_helvetica-3.1.dpatch: Adjust
+ * debian/patches/remove-y.tab.h-in-maintainer-clean.dpatch,
+ debian/patches/pretty-png-svg-print.dpatch: Remove (applied upstream)
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 26 Mar 2009 07:24:23 +0100
+
octave3.1 (3.1.54-3) experimental; urgency=low
* debian/in/control: Add libarpack2-dev to the list of build
Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list 2009-03-25 22:37:48 UTC (rev 2762)
+++ octave/trunk/debian/in/00list 2009-03-26 21:02:46 UTC (rev 2763)
@@ -12,7 +12,5 @@
no_pdf_in_print.dpatch
dont_set_helvetica-3.1.dpatch
normal-markersize.dpatch
-remove-y.tab.h-in-maintainer-clean.dpatch
-pretty-png-svg-print.dpatch
termios-h-check-3.1.dpatch
:]
Modified: octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch
===================================================================
--- octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch 2009-03-25 22:37:48 UTC (rev 2762)
+++ octave/trunk/debian/patches/dont_set_helvetica-3.1.dpatch 2009-03-26 21:02:46 UTC (rev 2763)
@@ -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
-@@ -1570,7 +1570,7 @@
+@@ -1619,7 +1619,7 @@
function [f, s, fnt, it, bld] = get_fontname_and_size (t)
if (isempty (t.fontname))
@@ -19,7 +19,7 @@
else
fnt = t.fontname;
endif
-@@ -1639,7 +1639,7 @@
+@@ -1657,7 +1657,7 @@
if (strcmp (fld, "string"))
[f, s, fnt, it, bld] = get_fontname_and_size (obj);
else
@@ -28,34 +28,3 @@
s = 10;
fnt = f;
it = false;
---- octave3.1-3.1.50.orig/src/graphics.cc
-+++ octave3.1-3.1.50/src/graphics.cc
-@@ -2528,7 +2528,7 @@
- if (mode != "replace")
- {
- fontangle = "normal";
-- fontname = "Helvetica";
-+ fontname = "*";
- fontsize = 12;
- fontunits = "points";
- fontweight = "normal";
---- octave3.1-3.1.52.orig/src/graphics.h.in
-+++ octave3.1-3.1.52/src/graphics.h.in
-@@ -2686,7 +2686,7 @@
- array_property currentpoint , Matrix (2, 3, 0.0)
- radio_property drawmode , "{normal}|fast"
- radio_property fontangle , "{normal}|italic|oblique"
-- string_property fontname , "Helvetica"
-+ string_property fontname , "*"
- double_property fontsize , 12
- radio_property fontunits , "{points}|normalized|inches|centimeters|pixels"
- radio_property fontweight , "{normal}|light|demi|bold"
-@@ -2966,7 +2966,7 @@
- double_property rotation , 0
- radio_property horizontalalignment , "{left}|center|right"
- color_property color , color_values (0, 0, 0)
-- string_property fontname , "Helvetica"
-+ string_property fontname , "*"
- double_property fontsize , 10
- radio_property fontangle , "{normal}|italic|oblique"
- radio_property fontweight , "light|{normal}|demi|bold"
Deleted: octave/trunk/debian/patches/pretty-png-svg-print.dpatch
===================================================================
--- octave/trunk/debian/patches/pretty-png-svg-print.dpatch 2009-03-25 22:37:48 UTC (rev 2762)
+++ octave/trunk/debian/patches/pretty-png-svg-print.dpatch 2009-03-26 21:02:46 UTC (rev 2763)
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## pretty-png-svg-print.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Restore pretty printing in png and svg formats (closes: Bug#519572).
-## DP: Thanks to Ben Abbott for the patch.
-
- at DPATCH@
-# HG changeset patch
-# User Ben Abbott <bpabbott at mac.com>
-# Date 1236938898 -28800
-# Node ID 258596f5071a4c350450f289116053582a2699d0
-# Parent 3ecbc236e2e0dc9c435e2b76667715c998fc5714
-print.m: Revert to old behavior for -S<num>,<num>.
-
-diff -r 3ecbc236e2e0 -r 258596f5071a scripts/plot/print.m
---- a/scripts/plot/print.m Tue Mar 10 21:54:49 2009 -0400
-+++ b/scripts/plot/print.m Fri Mar 13 18:08:18 2009 +0800
-@@ -427,11 +427,36 @@
- endif
- set (gcf, "__pixels_per_inch__", resolution)
-
-- if (debug)
-- drawnow (new_terminal, name, mono, debug_file);
-- else
-- drawnow (new_terminal, name, mono);
-- endif
-+ unwind_protect
-+ if (! isempty (size))
-+ size_in_pixels = sscanf (size ,"%d, %d");
-+ size_in_pixels = reshape (size_in_pixels, [1, numel(size_in_pixels)]);
-+ size_in_inches = size_in_pixels ./ resolution;
-+ p.paperunits = get (gcf, "paperunits");
-+ p.papertype = get (gcf, "papertype");
-+ p.papersize = get (gcf, "papersize");
-+ p.paperposition = get (gcf, "paperposition");
-+ p.paperpositionmode = get (gcf, "paperpositionmode");
-+ set (gcf, "paperunits", "inches");
-+ set (gcf, "papertype", "<custom>");
-+ set (gcf, "papersize", size_in_inches);
-+ set (gcf, "paperposition", [0, 0, size_in_inches]);
-+ set (gcf, "paperpositionmode", "manual");
-+ endif
-+ if (debug)
-+ drawnow (new_terminal, name, mono, debug_file);
-+ else
-+ drawnow (new_terminal, name, mono);
-+ endif
-+ unwind_protect_cleanup
-+ ## FIXME - it would be preferred to delete the added properties here.
-+ if (! isempty (size))
-+ props = fieldnames (p);
-+ for n = 1:numel(props)
-+ set (gcf, props{n}, p.(props{n}))
-+ endfor
-+ endif
-+ end_unwind_protect
-
- if (! isempty (convertname))
- command = sprintf ("convert '%s' '%s'", name, convertname);
Deleted: octave/trunk/debian/patches/remove-y.tab.h-in-maintainer-clean.dpatch
===================================================================
--- octave/trunk/debian/patches/remove-y.tab.h-in-maintainer-clean.dpatch 2009-03-25 22:37:48 UTC (rev 2762)
+++ octave/trunk/debian/patches/remove-y.tab.h-in-maintainer-clean.dpatch 2009-03-26 21:02:46 UTC (rev 2763)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## remove-y.tab.h-in-maintainer-clean.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Do not remove y.tab.h in the distclean rule. Built sources
-## DP: distributed in the tarball must be removed in maintainer-clean rule.
-
- at DPATCH@
-diff -r 346fde2030b5 src/Makefile.in
---- a/src/Makefile.in Sun Mar 08 19:18:44 2009 +0100
-+++ b/src/Makefile.in Mon Mar 09 08:43:20 2009 +0100
-@@ -562,13 +562,13 @@ mostlyclean: clean
-
- distclean: clean
- rm -f Makefile octave$(EXEEXT) .fname so_locations oct-errno.cc
-- rm -f tags TAGS y.tab.h y.output yy.lex.c parse.output
-+ rm -f tags TAGS y.output yy.lex.c parse.output
- rm -f stamp-liboctave-prereq
- rm -f doc-files gendoc.cc graphics.h graphics-props.cc mxarray.h DOCSTRINGS
- .PHONY: distclean
-
- maintainer-clean: distclean
-- rm -f lex.cc parse.cc
-+ rm -f lex.cc parse.cc y.tab.h
- rm -f oct-gperf.h $(OPT_HANDLERS)
- .PHONY: maintainer-clean
-
More information about the Pkg-octave-commit
mailing list