[Pkg-octave-commit] [SCM] octave branch, master, updated. b496ecc99faed76a6684c3ca746b74e33a1c08b5

Rafael Laboissiere rafael at debian.org
Sun May 24 20:34:44 UTC 2009 

tags 472069 pending
tags 478677 pending
thanks

The following commit has been merged in the master branch:
commit f53c600aae5f95c47f6b361485250c2200543f5c
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat May 23 20:40:39 2009 +0200

    Change the dpatch headers in patches to the quilt style

diff --git a/debian/patches/50_fix_handle_for_plotyy.diff b/debian/patches/50_fix_handle_for_plotyy.diff
index 4e037e1..8a595c3 100644
--- a/debian/patches/50_fix_handle_for_plotyy.diff
+++ b/debian/patches/50_fix_handle_for_plotyy.diff
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_fix_handle_for_plotyy.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Bug fix for 472069
+Apply patch from David Bateman to fix the handle treatment in plotyy
+(closes: #472069).
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 29 Mar 2008 10:32:15 +0100
 
- at DPATCH@
 diff -urNad octave3.0-3.0.0~/scripts/plot/plotyy.m octave3.0-3.0.0/scripts/plot/plotyy.m
 --- octave3.0-3.0.0~/scripts/plot/plotyy.m	2007-12-13 18:48:59.000000000 +0100
 +++ octave3.0-3.0.0/scripts/plot/plotyy.m	2008-03-28 12:20:12.000000000 +0100
diff --git a/debian/patches/50_octave-bug-tempfile.diff b/debian/patches/50_octave-bug-tempfile.diff
index ef9abe5..fb89740 100644
--- a/debian/patches/50_octave-bug-tempfile.diff
+++ b/debian/patches/50_octave-bug-tempfile.diff
@@ -1,10 +1,10 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_octave-bug-tempfile.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Use Debian's tempfile(1) for enhanced security
+Adjusted for Octave 2.9.10
 
- at DPATCH@
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 15 Apr 2007 23:13:13 +0200
+
+Use Debian's tempfile(1) for enhanced security
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 28 Aug 2006 21:23:33 +0200
 
 --- octave2.1-2.1.73.orig/octave-bug.in	2006-08-19 02:58:39.000000000 +0200
 +++ octave2.1-2.1.73/octave-bug.in	2006-08-19 11:11:51.172397104 +0200
diff --git a/debian/patches/datenum-vector-input-any-orientation.diff b/debian/patches/datenum-vector-input-any-orientation.diff
index 28796d6..52a21ff 100644
--- a/debian/patches/datenum-vector-input-any-orientation.diff
+++ b/debian/patches/datenum-vector-input-any-orientation.diff
@@ -1,15 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## datenum-vector-input-any-orientation.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Description: datenum: allow vector inputs in any orientation 
-## DP: Author: author Bill Denney
-## DP: Date: Thu Mar 27 15:17:53 2008 -0400
-## DP:
-## DP: Taken from upstream Mercurial repository at:
-## DP: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/4ab2488ab2b4
+Description: datenum: allow vector inputs in any orientation 
+Author: author Bill Denney
+Date: Thu Mar 27 15:17:53 2008 -0400
+
+Taken from upstream Mercurial repository at:
+http://hg.savannah.gnu.org/hgweb/octave/raw-rev/4ab2488ab2b4
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 May 2009 15:14:52 +0200
 
- at DPATCH@
 --- a/scripts/time/datenum.m    Thu Mar 27 15:14:10 2008 -0400
 +++ b/scripts/time/datenum.m    Thu Mar 27 15:17:53 2008 -0400
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/dont_set_helvetica-3.1.diff b/debian/patches/dont_set_helvetica-3.1.diff
index 71d313c..5e4e981 100644
--- a/debian/patches/dont_set_helvetica-3.1.diff
+++ b/debian/patches/dont_set_helvetica-3.1.diff
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## don_set_helvetica.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't set Helvetica as default font, it's not available as TrueType font
-## DP: #477688
+Don't set Helvetica as default font, it's not available as TrueType
+font. Fixes Bug#477688.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 19 Jul 2008 10:27:26 +0200
 
- at DPATCH@
 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
diff --git a/debian/patches/dont_set_helvetica.diff b/debian/patches/dont_set_helvetica.diff
index 077b82c..6e4497f 100644
--- a/debian/patches/dont_set_helvetica.diff
+++ b/debian/patches/dont_set_helvetica.diff
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## don_set_helvetica.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't set Helvetica as default font, it's not available as TrueType font
-## DP: #477688
+Don't set Helvetica as default font, it's not available as TrueType
+font.  Fixes Bug#477688.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 24 May 2008 13:49:51 +0200
 
- at DPATCH@
 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
diff --git a/debian/patches/glpk-new-api.diff b/debian/patches/glpk-new-api.diff
index 259f94b..5e4938d 100644
--- a/debian/patches/glpk-new-api.diff
+++ b/debian/patches/glpk-new-api.diff
@@ -1,14 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## glpk-new-api.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Avoid calls to deprecated __glp_lib_* functions which are deprecated
-## DP: and have been removed for the GLPK public API since version 4.32.
-## DP:
-## DP: Taken from the Mercurial usptream repostory:
-## DP: http://hg.savannah.gnu.org/hgweb/octave/raw-diff/aaccb1362347/src/DLD-FUNCTIONS/__glpk__.cc
+Avoid calls to deprecated __glp_lib_* functions which are deprecated
+and have been removed for the GLPK public API since version 4.32.
+
+Taken from the Mercurial usptream repostory:
+http://hg.savannah.gnu.org/hgweb/octave/raw-diff/aaccb1362347/src/DLD-FUNCTIONS/__glpk__.cc
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 04 Feb 2009 11:56:17 +0100
 
- at DPATCH@
 --- a/src/DLD-FUNCTIONS/__glpk__.cc	Wed Aug 27 09:59:55 2008 -0400
 +++ b/src/DLD-FUNCTIONS/__glpk__.cc	Mon Oct 27 14:25:30 2008 -0400
 @@ -45,6 +45,7 @@
diff --git a/debian/patches/no-argout-intersect.diff b/debian/patches/no-argout-intersect.diff
index 3fd5090..7f39ddb 100644
--- a/debian/patches/no-argout-intersect.diff
+++ b/debian/patches/no-argout-intersect.diff
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## no-argout-intersect.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Cope with the case where nargout == 0
-## DP: This was taken from package bugfix-3.0.5 of Otave Forge
+Cope with the case where nargout == 0
+This was taken from package bugfix-3.0.5 of Otave Forge
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 22 May 2009 23:54:24 +0200
 
- at DPATCH@
 --- ../../../octave/octave/scripts/set/intersect.m	2009-02-18 07:57:46.000000000 +0100
 +++ ../../octave-bugfix-3.0.5/octave-bugfix-3.0.5/inst/intersect.m	2009-05-08 15:16:47.000000000 +0200
 @@ -1,5 +1,5 @@
diff --git a/debian/patches/no_pdf_in_print.diff b/debian/patches/no_pdf_in_print.diff
index 8c2a870..d4c6d14 100644
--- a/debian/patches/no_pdf_in_print.diff
+++ b/debian/patches/no_pdf_in_print.diff
@@ -1,12 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## no_pdf_in_print.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Warning about missing pdflib
-## DP: #478677
+Warn that PDF generation is not possible packaged gnuplot, due to the
+missing pdflib (closes: #478677)
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 24 May 2008 13:49:51 +0200
 
- at DPATCH@
 diff -urNad octave3.0-3.0.1~/scripts/plot/print.m octave3.0-3.0.1/scripts/plot/print.m
 --- octave3.0-3.0.1~/scripts/plot/print.m	2008-04-21 18:00:20.000000000 +0200
 +++ octave3.0-3.0.1/scripts/plot/print.m	2008-05-21 12:17:20.000000000 +0200
diff --git a/debian/patches/normal-markersize.diff b/debian/patches/normal-markersize.diff
index 1478323..3328764 100644
--- a/debian/patches/normal-markersize.diff
+++ b/debian/patches/normal-markersize.diff
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## normal-markersize.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Revert the symbol markers in plots to their normal size.  Thanks to 
-## DP: Francesco Potorti for the patch.
+Revert the symbol markers in plots to their normal size.  Thanks to
+Francesco Potorti for the patch.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 24 Feb 2009 11:40:01 +0100
 
- at DPATCH@
 --- octave3.1-3.1.52.orig/scripts/plot/__go_draw_axes__.m
 +++ octave3.1-3.1.52/scripts/plot/__go_draw_axes__.m
 @@ -594,7 +594,7 @@
diff --git a/debian/patches/real-no-history.diff b/debian/patches/real-no-history.diff
index 7307e64..88b734e 100644
--- a/debian/patches/real-no-history.diff
+++ b/debian/patches/real-no-history.diff
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## real-no-history.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Only save history if Vsaving_history is true.  Thanks to John Eaton
-## DP: for the patch and the comments.  Closes Bug#514802.
+Only save history if Vsaving_history is true.  Thanks to John Eaton
+for the patch and the comments.  Closes Bug#514802.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 13 Feb 2009 19:52:37 +0100
 
- at DPATCH@
 --- octave3.0-3.0.4~rc3.orig/src/toplev.cc
 +++ octave3.0-3.0.4~rc3/src/toplev.cc
 @@ -643,7 +643,8 @@
diff --git a/debian/patches/termios-h-check-3.0.diff b/debian/patches/termios-h-check-3.0.diff
index 145975a..0d29b46 100644
--- a/debian/patches/termios-h-check-3.0.diff
+++ b/debian/patches/termios-h-check-3.0.diff
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## termios-h-check-3.0.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Small tweak for configure.in/configure to properly detect
-## DP: <termios.h>, making the package build on GNU/kFreeBSD. Thanks to
-## DP: Petr Salinger for the patch.  Closes Bug#520076 for octave3.0.2A
+Small tweak for configure.in/configure to properly detect <termios.h>,
+making the package build on GNU/kFreeBSD. Thanks to Petr Salinger for
+the patch.  Closes Bug#520076 for octave3.0.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 18 Mar 2009 11:42:07 +0100
 
- at DPATCH@
 --- octave3.1-3.1.54.orig/configure.in
 +++ octave3.1-3.1.54/configure.in
 @@ -1247,7 +1247,7 @@
diff --git a/debian/patches/termios-h-check-3.1.diff b/debian/patches/termios-h-check-3.1.diff
index 7e4ab40..f778392 100644
--- a/debian/patches/termios-h-check-3.1.diff
+++ b/debian/patches/termios-h-check-3.1.diff
@@ -1,12 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## termios-h-check-3.1.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Small tweak for configure.in/configure to properly detect
-## DP: <termios.h>, making the package build on GNU/kFreeBSD. Thanks to
-## DP: Petr Salinger for the patch.  Closes Bug#520076 for octave3.1.
+Small tweak for configure.in/configure to properly detect <termios.h>,
+making the package build on GNU/kFreeBSD. Thanks to Petr Salinger for
+the patch.  Closes Bug#520076 for octave3.1.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 12 Mar 2009 23:32:03 +0100
 
- at DPATCH@
 --- octave3.1-3.1.54.orig/configure.in
 +++ octave3.1-3.1.54/configure.in
 @@ -1523,7 +1523,7 @@

-- 
octave

More information about the Pkg-octave-commit mailing list