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

Thomas Weber thomas-guest at costa.debian.org
Wed Dec 14 17:49:49 UTC 2005 

Author: thomas-guest
Date: 2005-12-14 17:49:49 +0000 (Wed, 14 Dec 2005)
New Revision: 380

Added:
   trunk/packages/octaviz/debian/patches/liboctaviz-version-independent.patch
   trunk/packages/octaviz/debian/patches/texinfo-docstring.patch
Modified:
   trunk/packages/octaviz/debian/changelog
   trunk/packages/octaviz/debian/control
Log:
make Octaviz independent of Octave's version number
fix texinfo strings
switch to lesstif2-dev


Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog	2005-12-14 13:06:18 UTC (rev 379)
+++ trunk/packages/octaviz/debian/changelog	2005-12-14 17:49:49 UTC (rev 380)
@@ -7,7 +7,17 @@
   * debian/rules:
     - Use debhelper.mk from CDBS
     - General cleanup
+   
+   +++ Changes by Thomas Weber
 
+  * debian/control:
+    - switch to lesstif2-dev
+  * patches/
+    - liboctaviz-version-independent.patch: move liboctaviz.so into own
+      subdirectory
+    - texinfo-docstring.patch: format help strings to texinfo format
+      (thanks to Rafael for the patch)
+
  --
 
 octaviz (0.4.0-12) unstable; urgency=low

Modified: trunk/packages/octaviz/debian/control
===================================================================
--- trunk/packages/octaviz/debian/control	2005-12-14 13:06:18 UTC (rev 379)
+++ trunk/packages/octaviz/debian/control	2005-12-14 17:49:49 UTC (rev 380)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 4.0.0), cmake, libvtk4-dev (>= 4.4.2-8), octave2.1-headers (>= 2.1.65), lesstif-dev, cdbs
+Build-Depends: debhelper (>= 4.0.0), cmake, libvtk4-dev (>= 4.4.2-8), octave2.1-headers (>= 2.1.65), lesstif2-dev, cdbs
 Standards-Version: 3.6.2
 
 Package: octaviz

Added: trunk/packages/octaviz/debian/patches/liboctaviz-version-independent.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/liboctaviz-version-independent.patch	2005-12-14 13:06:18 UTC (rev 379)
+++ trunk/packages/octaviz/debian/patches/liboctaviz-version-independent.patch	2005-12-14 17:49:49 UTC (rev 380)
@@ -0,0 +1,32 @@
+diff -Nur octaviz-0.4.0/CMakeLists.txt octaviz-0.4.0.new/CMakeLists.txt
+--- octaviz-0.4.0/CMakeLists.txt	2004-10-28 03:58:52.000000000 +0200
++++ octaviz-0.4.0.new/CMakeLists.txt	2005-12-10 13:26:40.000000000 +0100
+@@ -93,7 +93,7 @@
+ #		ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc)
+ 		
+ 		SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common)
+-		SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon  -lvtk${kit} -lvtkFiltering -lvtkGraphics)
++		SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon  -lvtk${kit} -lvtkFiltering -lvtkGraphics  -Wl,-rpath=/usr/lib/octaviz)
+ #		ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc)
+ 		
+ 		# Precompiled headers
+diff -Nur octaviz-0.4.0/Common/CMakeLists.txt octaviz-0.4.0.new/Common/CMakeLists.txt
+--- octaviz-0.4.0/Common/CMakeLists.txt	2004-10-28 03:58:52.000000000 +0200
++++ octaviz-0.4.0.new/Common/CMakeLists.txt	2005-12-10 13:27:14.000000000 +0100
+@@ -21,10 +21,10 @@
+ INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
+ #MESSAGE(${all_oct})
+ 
+-# Get octave lib install directory
+-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
++# Get general lib install directory
++EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p LIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
+ # Remove prefix from octave lib install dir
+ STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR})
+-INSTALL_TARGETS(${OUT_MTCH} octaviz)
+- 
+- 
+\ Kein Zeilenumbruch am Dateiende.
++INSTALL_TARGETS(${OUT_MTCH}/octaviz octaviz)
++
++

Added: trunk/packages/octaviz/debian/patches/texinfo-docstring.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/texinfo-docstring.patch	2005-12-14 13:06:18 UTC (rev 379)
+++ trunk/packages/octaviz/debian/patches/texinfo-docstring.patch	2005-12-14 17:49:49 UTC (rev 380)
@@ -0,0 +1,72 @@
+diff -Nur octaviz-0.4.0/Wrapping/vtkWrapOctave.c octaviz-0.4.0.new/Wrapping/vtkWrapOctave.c
+--- octaviz-0.4.0/Wrapping/vtkWrapOctave.c	2004-09-22 00:50:41.000000000 +0200
++++ octaviz-0.4.0.new/Wrapping/vtkWrapOctave.c	2005-12-14 09:29:55.000000000 +0100
+@@ -571,6 +571,7 @@
+ void vtkParseOutput(FILE *fp, FileInfo *data)
+ {
+   int i,j;
++  int in_example;
+   
+   fprintf(fp,"// Octave wrapper for %s object\n//\n",data->ClassName);
+     
+@@ -618,19 +619,48 @@
+ 	/* Make the function that is callable from octave */
+   /* Add class description into the function. */
+   /* This will displayed as help in octave */
+-  fprintf(fp,"\nDEFUN_DLD ( %s, args, nargout, \n  \"%s \\n\\\n  \\n\\\n  ",data->ClassName,data->ClassName);
++  fprintf(fp,"\nDEFUN_DLD ( %s, args, nargout, \n", data->ClassName);
++  fprintf(fp,"  \"-*- texinfo -*-\\n\\\n");
++  fprintf(fp,"@deftypefn {Built-in Function} {} %s\\n\\\n\\n\\\n", data->ClassName);
+   i = 0;
++  in_example = 0;
+ 	if ( data->Description != NULL )
+   while ( data->Description[i] != 0 )
+     {
+     if ( data->Description[i] == '"' ) fprintf(fp,"\\");
+-		
++       
++    /* Curly braces are special characters in Texinfo.  Quote them. */
++    if ( data->Description[i] == '{' || data->Description[i] == '}' )
++	 fprintf(fp,"@");       
++
++    /* Replace `\code [...] \endcode' constructs by the texinfo equivalent
++       @example [..] @end example' */   
++    if (strncmp (data->Description + i, "\\code", 5) == 0) {
++      fprintf(fp,"@example");
++      in_example = 1;
++      i += 5;
++    }
++    if (strncmp (data->Description + i, "\\endcode", 8) == 0) {
++      fprintf(fp,"@end example");
++      in_example = 0;
++      i += 8;
++    }
++    /* Skip emphasis markup.  This could be replaced by @emph, 
++       but it is trick because @emph needs a bracketed argument */
++    if (strncmp (data->Description + i, "\\em", 3) == 0) {
++      i += 3;
++    }
++	
+     if ( data->Description[i] == '\n' )
+ 		  {
+ 			/* Don't want the last newline */
+ 			if ( i + 2 < strlen(data->Description) )
+ 			  {
+-				fprintf(fp,"\\n\\\n  ");
++				fprintf(fp,"\\n\\\n");
++				/* Eat spaces at beginning of lines */
++				if (in_example != 1) 
++					while (data->Description[i + 1] == ' ')
++						i++;
+ 			  }
+ 			i++;
+ 		  } else
+@@ -638,7 +668,7 @@
+ 			fprintf(fp,"%c",data->Description[i++]);
+ 		  }
+     }
+-  fprintf(fp,"\")\n{\n" );
++	fprintf(fp,"\\n\\\n at end deftypefn\")\n{\n" );
+ 	fprintf(fp,"  octave_value retval;\n" );
+ 
+   /* This associative map holds help for each method (if avaliable) */

More information about the Pkg-octave-commit mailing list