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

[Colin ingram]

Author: cjingram-guest
Date: 2005-10-30 02:01:19 +0000 (Sun, 30 Oct 2005)
New Revision: 298

Added:
   trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch
Removed:
   trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/patches/00list
   trunk/packages/octave/debian/rules
Log:
in preparation for 2.9.3 release

* 50_no-check-nested-functions.dpatch removed
* 50_mkoctfile.1-no-negative.dpatch added
* debian/rules updated inorder to build both 2.9 and 2.1 packages


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-10-27 22:47:05 UTC (rev 297)
+++ trunk/packages/octave/debian/changelog	2005-10-30 02:01:19 UTC (rev 298)
@@ -1,3 +1,16 @@
+octave2.9 (2.9.3-1) experimental; urgency=low
+
+	NOT YET RELEASED
+	
+   +++ Changes by Colin Ingram
+
+  * New Upstream Release
+  * debian/rules: adjusted to build from octave2.9 source directory
+  * debian/patches/50_no-check-nested-functions.dpatch removed
+  * debian/patches/50_mkoctfile.1-no-negative.dpatch added	
+
+ -- 
+
 octave2.1 (2.1.71-6) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/patches/00list
===================================================================
--- trunk/packages/octave/debian/patches/00list	2005-10-27 22:47:05 UTC (rev 297)
+++ trunk/packages/octave/debian/patches/00list	2005-10-30 02:01:19 UTC (rev 298)
@@ -1 +1 @@
-50_no-check-nested-functions
+50_mkoctfile.1-no-negative.dpatch

Added: trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch	2005-10-27 22:47:05 UTC (rev 297)
+++ trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch	2005-10-30 02:01:19 UTC (rev 298)
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_mkoctfile.1-no-negative.dpatch by  <colin at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.3/doc/interpreter/mkoctfile.1 /tmp/dpep.ZFAvG6/octave2.9-2.9.3/doc/interpreter/mkoctfile.1
+--- octave2.9-2.9.3/doc/interpreter/mkoctfile.1	2004-02-17 09:54:36.000000000 -0600
++++ /tmp/dpep.ZFAvG6/octave2.9-2.9.3/doc/interpreter/mkoctfile.1	2005-10-29 20:28:33.934580151 -0500
+@@ -4,9 +4,30 @@
+ .SH NAME
+ mkoctfile - Compile dynamic-load modules for GNU Octave
+ .SH SYNOPSIS
+-.BR mkoctfile\  [-IDIR]\ [-DDEF]\ [-lLIB]\ [-LDIR]\ [-M|--depend]\ 
+-[-c]\ [-o FILE|--output FILE]\ [-p VAR|--print VAR]\ [-s|\--strip]\ 
+-[-v|--verbose]\ [-h|-?|--help]\ \fIfile\fP .\|.\|.  
++.B mkoctfile
++.RB [\| \-I \|\c
++.RI \| DIR \|\|]
++.RB [\| \-D \|\c
++.RI \| DEF \|\|]
++.RB [\| \-l \|\c
++.RI \| LIB \|\|] 
++.RB [\| \-L \|\c
++.RI [\| DIR \|\|]
++.RB [\| \-M \||\| \-\-depend \|]
++.RB [\| \-c \|]
++.RB [\| \-o 
++.IR FILE \||\c
++.RB \| \-\-output 
++.IR FILE \|]
++.RB [\| \-p 
++.IR VAR \||\c
++.RB \| \-\-print
++.IR VAR \|]
++.RB [\| \-s \||\| \-\-strip \|]
++.RB [\| \-v \||\| \-\-verbose \|]
++.RB [\| \-h \||\| \-? \||\| \-\-help \|]
++.RI \| file \| 
++.RB ...  
+ .SH DESCRIPTION
+ .PP
+ \fImkoctfile\fP is used to compile source C, C++ or Fortran source code in
+@@ -52,10 +73,10 @@
+     CFLAGS      SH_LDFLAGS
+ .RE
+ .TP 8
+-.B \-s|--strip
++.B \-s|\-\-strip
+ Strip the output file.
+ .TP 8
+-.B \-v|--verbose
++.B \-v|\-\-verbose
+ Echo commands as they are executed.
+ .TP 8
+ .B file
+@@ -67,9 +88,9 @@
+     .cpp  C++ source
+     .f    Fortran source
+     .F    Fortran source
+-    .o    object file
+-    .SH SEE ALSO
+-    .BR octave (1).
++    .o    object file  
++.SH SEE ALSO
++.BR octave (1).
+ .RE
+ .SH AUTHOR
+ John W. Eaton <jwe at bevo.che.wisc.edu>


Property changes on: trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-10-27 22:47:05 UTC (rev 297)
+++ trunk/packages/octave/debian/rules	2005-10-30 02:01:19 UTC (rev 298)
@@ -25,7 +25,7 @@
 info_package	= $(PACKAGE)-info
 
 debbase		:= $(CURDIR)/debian
-debtmp		:= $(debbase)/octave2.1
+debtmp		:= $(debbase)/$(PACKAGE)
 debdoc		:= $(debtmp)/usr/share/doc/$(PACKAGE)
 deblsp		:= $(debbase)/$(emacs_package)/usr/share/emacs/site-lisp/$(emacs_package)
 debini		:= $(debtmp)/usr/share/octave/site/m/startup
@@ -251,7 +251,7 @@
         # save the static libs for seperate package octave-staticlibs
 #	dh_movefiles -p$(lib_package) 	usr/lib/$(source)-$(version)/*.a
         # save the include files for the header package
-	dh_movefiles -p$(dev_package) --sourcedir=debian/octave2.1	\
+	dh_movefiles -p$(dev_package) --sourcedir=debian/$(PACKAGE)	\
 			usr/include/		 			\
 			usr/bin/mkoctfile-$(version) 			\
 			usr/bin/octave-config-$(version)		\
@@ -262,7 +262,7 @@
 			usr/share/octave/debian/defs.make
 	rm -r $(debtmp)/usr/include
         # save the info files for the info package
-	dh_movefiles -p$(info_package) --sourcedir=debian/octave2.1	\
+	dh_movefiles -p$(info_package) --sourcedir=debian/$(PACKAGE)	\
 			usr/share/info/
         # install /etc/octave.conf
 	install -p -m 0644  debian/octave.conf  $(debtmp)/etc/$(PACKAGE).conf