[Pkg-octave-commit] rev 165 - in trunk/packages/octave-forge/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2005-03-15 16:09:37 +0100 (Tue, 15 Mar 2005)
New Revision: 165

Added:
   trunk/packages/octave-forge/debian/patches/50_weekday-doc.dpatch
Modified:
   trunk/packages/octave-forge/debian/changelog
   trunk/packages/octave-forge/debian/patches/00list
   trunk/packages/octave-forge/debian/rules
Log:
Preparation for new release (closing #298539 and #296973)


Modified: trunk/packages/octave-forge/debian/changelog
===================================================================
--- trunk/packages/octave-forge/debian/changelog	2005-03-14 11:23:49 UTC (rev 164)
+++ trunk/packages/octave-forge/debian/changelog	2005-03-15 15:09:37 UTC (rev 165)
@@ -1,3 +1,17 @@
+octave-forge (2004.11.16-7) unstable; urgency=low
+
+  NOT YET RELEASED !
+
+  +++ Changes by Rafael Laboissiere
+
+  * debian/rules: Use option --with-altmpath of configure, such that
+    _pl_grace_octave_path in grace_octave_path.m points to the right
+    directory (closes: #298539)
+  * debian/patches/50_weekday-doc.dpatch: Added patch to fix documentation
+    of weekday.m (closes: #296973)
+
+ --
+
 octave-forge (2004.11.16-6) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere:

Modified: trunk/packages/octave-forge/debian/patches/00list
===================================================================
--- trunk/packages/octave-forge/debian/patches/00list	2005-03-14 11:23:49 UTC (rev 164)
+++ trunk/packages/octave-forge/debian/patches/00list	2005-03-15 15:09:37 UTC (rev 165)
@@ -1,3 +1,4 @@
 50_extra-mex-configure-add
 50_big-endian-rand-fix
 50_exclude-xlib-in-aurecord
+50_weekday-doc

Added: trunk/packages/octave-forge/debian/patches/50_weekday-doc.dpatch
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_weekday-doc.dpatch	2005-03-14 11:23:49 UTC (rev 164)
+++ trunk/packages/octave-forge/debian/patches/50_weekday-doc.dpatch	2005-03-15 15:09:37 UTC (rev 165)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_weekday-doc.dpatch by  <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave-forge 2004.11.16-7 diff.gz
+
+@DPATCH@
+
+--- octave-forge-2004.11.16.orig/main/time/weekday.m
++++ octave-forge-2004.11.16/main/time/weekday.m
+@@ -15,17 +15,10 @@
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ ## -*- texinfo -*-
+-## @deftypefn {Function File} {V =} datevec(date)
+-## @deftypefnx {Function File} {[Y,M,D,h,m,s] =} datevec(date)
+-## Breaks the number of days since Jan 1, 0000 into a year-month-day
+-## hour-minute-second format. By this reckoning, Jan 1, 1970 is day
+-## number 719529.  The fractional portion of @code{date} corresponds to the
+-## portion of the given day. If a single return value is requested,
+-## then the components of the date are columns of the matrix @code{V}.
+-##
+-## Note: 32-bit architectures only handle times between Dec 14, 1901 
+-## and Jan 19, 2038, with special handling for 0000-01-01.  datenum
+-## returns -1 in case of a range error.
++## @deftypefn {Function File} {[d,s] =} weekday(date, [P])
++## Takes a date (in either datenum format or a string that datenum can
++## parse) and returns the number for the day of the week (0 = "Sun", 
++## 1 = "Mon", ... , "Sat")
+ ##
+ ## The parameter @code{P} is needed to convert date strings with 2 digit
+ ## years into dates with 4 digit years.  2 digit years are assumed to be
+@@ -34,11 +27,7 @@
+ ## For birthdates, you would want @code{P} to be current year - 99.  For
+ ## appointments, you would want @code{P} to be current year.
+ ##
+-## Dates must be represented as mm/dd/yy or dd-mmm-yyyy.  Times must
+-## be hh:mm:ss or hh:mm:ss PM, with seconds optional.  These correspond 
+-## to datestr format codes 0, 1, 2, 3, 13, 14, 15, 16.
+-##
+-## @seealso{date,clock,now,datestr,datenum,calendar,weekday} 
++## @seealso{date,clock,now,datestr,datenum,datevec,calendar} 
+ ## @end deftypefn
+ 
+ function [d,s] = weekday(date,P)


Property changes on: trunk/packages/octave-forge/debian/patches/50_weekday-doc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave-forge/debian/rules
===================================================================
--- trunk/packages/octave-forge/debian/rules	2005-03-14 11:23:49 UTC (rev 164)
+++ trunk/packages/octave-forge/debian/rules	2005-03-15 15:09:37 UTC (rev 165)
@@ -74,7 +74,7 @@
 		CFLAGS=$(compilerflags)			\
 		CXXFLAGS=$(compilerflags)		\
 		FFLAGS=$(compilerflags)			\
-		./configure	--prefix=/usr
+		./configure --prefix=/usr --with-altmpath=$(altmdir)
                 # clean the tsa/ directory
                 # ( cd extra/tsa && ../../debian/tsacleanup.pl )
 		touch configure-stamp