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

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-22 07:52:28 +0000 (Tue, 22 Apr 2008)
New Revision: 1781

Removed:
   octave/trunk/debian/patches/50_clean-doc.dpatch
   octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch
Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/octave3.0-00list
Log:
Drop patches applied upstream

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-04-22 07:48:49 UTC (rev 1780)
+++ octave/trunk/debian/changelog	2008-04-22 07:52:28 UTC (rev 1781)
@@ -1,6 +1,10 @@
 octave3.0 (1:3.0.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Drop dpatches (applied upstream):
+    + 50_drop-lo-manpages.dpatch
+    + 50_dont_downcase_font_names.dpatch
+    + 50_clean-doc.dpatch
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 22 Apr 2008 01:28:35 +0200
 

Modified: octave/trunk/debian/in/octave3.0-00list
===================================================================
--- octave/trunk/debian/in/octave3.0-00list	2008-04-22 07:48:49 UTC (rev 1780)
+++ octave/trunk/debian/in/octave3.0-00list	2008-04-22 07:52:28 UTC (rev 1781)
@@ -1,6 +1,3 @@
 50_octave-bug-tempfile
-50_drop-lo-manpages
 50_include-cstring-mxarray
-50_clean-doc
-50_dont_downcase_font_names
 50_fix_handle_for_plotyy.dpatch

Deleted: octave/trunk/debian/patches/50_clean-doc.dpatch
===================================================================
--- octave/trunk/debian/patches/50_clean-doc.dpatch	2008-04-22 07:48:49 UTC (rev 1780)
+++ octave/trunk/debian/patches/50_clean-doc.dpatch	2008-04-22 07:52:28 UTC (rev 1781)
@@ -1,47 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_clean-doc.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Improve documentation of clean command. Patch suggested by
-## DP: Thomas Weber in the mailing list octave-maintainers and applied
-## DP: upstream by John W. Eaton, see
-## DP: http://www.nabble.com/Implementation-of-clear%28%29-to14497170.html#a14558608
-
- at DPATCH@
-
---- octave3.0-3.0.0.orig/src/variables.cc
-+++ octave3.0-3.0.0/src/variables.cc
-@@ -2392,7 +2392,7 @@
- 
- DEFCMD (clear, args, ,
-   "-*- texinfo -*-\n\
-- at deffn {Command} clear [-x] pattern @dots{}\n\
-+ at deffn {Command} clear [options] pattern @dots{}\n\
- Delete the names matching the given patterns from the symbol table.  The\n\
- pattern may contain the following special characters:\n\
- \n\
-@@ -2430,7 +2430,24 @@
- @code{foo} as a function.  Executing @kbd{clear foo} a second time will\n\
- clear the function definition.\n\
- \n\
--With -x, clear the variables that don't match the patterns.\n\
-+The following options are available in both long and short form\n\
-+ at table @code\n\
-+ at item -all, -a\n\
-+Clears all local and global user-defined variables and all functions\n\
-+from the symbol table.\n\
-+\n\
-+ at item -exclusive, -x\n\
-+Clears the variables that don't match the following pattern.\n\
-+\n\
-+ at item -functions, -f\n\
-+Clears the function names and the built-in symbols names.\n\
-+ at item -global, -g\n\
-+Clears the global symbol names.\n\
-+ at item -variables, -v\n\
-+Clears the local variable names.\n\
-+ at end table\n\
-+With the execption of @code{exclusive}, all long options can be used \n\
-+without the dash as well.\n\
- @end deffn")
- {
-   octave_value_list retval;

Deleted: octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch
===================================================================
--- octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch	2008-04-22 07:48:49 UTC (rev 1780)
+++ octave/trunk/debian/patches/50_dont_downcase_font_names.dpatch	2008-04-22 07:52:28 UTC (rev 1781)
@@ -1,54 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_dont_downcase_font_names.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't lowercase the font names; bug fix for #469240
-## DP: Upstream patch is 71209cfdaebe, thanks John Eaton
-
- at DPATCH@
-diff -urNad octave3.0-3.0.0~/scripts/plot/__go_draw_axes__.m octave3.0-3.0.0/scripts/plot/__go_draw_axes__.m
---- octave3.0-3.0.0~/scripts/plot/__go_draw_axes__.m	2007-12-18 04:48:04.000000000 +0100
-+++ octave3.0-3.0.0/scripts/plot/__go_draw_axes__.m	2008-03-04 10:44:04.000000000 +0100
-@@ -1602,17 +1602,17 @@
- 
- function [f, s, fnt, it, bld] = get_fontname_and_size (t)
-   if (isempty (t.fontname))
--    fnt = "helvetica";
-+    fnt = "Helvetica";
-   else
--    fnt = tolower (t.fontname);
-+    fnt = t.fontname;
-   endif
-   f = fnt;
-   it = false;
-   bld = false;
--  if (! isempty (t.fontweight) && strcmp (tolower (t.fontweight), "bold"))
-+  if (! isempty (t.fontweight) && strcmpi (t.fontweight, "bold"))
-     if (! isempty(t.fontangle)
--	&& (strcmp (tolower (t.fontangle), "italic")
--	    || strcmp (tolower (t.fontangle), "oblique")))
-+	&& (strcmpi (t.fontangle, "italic")
-+	    || strcmpi (t.fontangle, "oblique")))
-       f = strcat (f, "-bolditalic");
-       it = true;
-       bld = true;
-@@ -1621,8 +1621,8 @@
-       bld = true;
-     endif
-   elseif (! isempty(t.fontangle)
--	  && (strcmp (tolower (t.fontangle), "italic")
--	      || strcmp (tolower (t.fontangle), "oblique")))
-+	  && (strcmpi (t.fontangle, "italic")
-+	      || strcmpi (t.fontangle, "oblique")))
-     f = strcat (f, "-italic");
-     it = true;
-   endif
-@@ -1640,7 +1640,7 @@
-   if (strcmp (fld, "string"))
-     [f, s, fnt, it, bld] = get_fontname_and_size (obj);
-   else
--    f = "Helvectica";
-+    f = "Helvetica";
-     s = 10;
-     fnt = f;
-     it = false;