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

[Rafael Laboissiere]

Author: rafael
Date: 2006-01-17 15:35:53 +0000 (Tue, 17 Jan 2006)
New Revision: 424

Added:
   trunk/packages/octplot/debian/patches/clear-functions-in-path.patch
Modified:
   trunk/packages/octplot/debian/changelog
   trunk/packages/octplot/debian/rules
Log:
* debian/rules: Put all the *.m and *.oct files in a private directory
  (/usr/lib/octplot).  This is necessary because this path is
  added/removed by toggle_octplot, and the it should not be in the
  system's LOADPATH.

* debian/patches/clear-functions-in-path.patch: New patch for clearing
  all the octplot *.m functions after addition/removal of the octplot
  path to LOADPATH.


Modified: trunk/packages/octplot/debian/changelog
===================================================================
--- trunk/packages/octplot/debian/changelog	2006-01-17 14:32:07 UTC (rev 423)
+++ trunk/packages/octplot/debian/changelog	2006-01-17 15:35:53 UTC (rev 424)
@@ -9,14 +9,23 @@
 
   +++ Changes by Rafael Laboissiere
 
+  * debian/rules: Put all the *.m and *.oct files in a private directory
+    (/usr/lib/octplot).  This is necessary because this path is
+    added/removed by toggle_octplot, and the it should not be in the
+    system's LOADPATH.
+
+  * debian/patches/clear-functions-in-path.patch: New patch for clearing
+    all the octplot *.m functions after addition/removal of the octplot
+    path to LOADPATH.
+
   * Note for the ftp-master admins:  It has been suggested to us to
-    compiled the pacakge agaisnt the pre-packaged version of FTGL for
+    build the package against the pre-packaged version of FTGL for
     Debian (ftgl-dev).  We tried it, but the program crashes.
     Investigating further the issue, we discovered that the upstream
     author is shipping a different version of FTGL with the Octplot
     sources, which may explain the problem.
 
-  * Hopefully, this version will be approved this time (closes: #342264)
+  * Hopefully, the package will be approved this time (closes: #342264)
 
  --
 

Added: trunk/packages/octplot/debian/patches/clear-functions-in-path.patch
===================================================================
--- trunk/packages/octplot/debian/patches/clear-functions-in-path.patch	2006-01-17 14:32:07 UTC (rev 423)
+++ trunk/packages/octplot/debian/patches/clear-functions-in-path.patch	2006-01-17 15:35:53 UTC (rev 424)
@@ -0,0 +1,34 @@
+diff -Nur octplot-0.3.0/src/toggle_octplot.m.in octplot-0.3.0.new/src/toggle_octplot.m.in
+--- octplot-0.3.0/src/toggle_octplot.m.in	2006-01-17 14:24:26.505312000 +0100
++++ octplot-0.3.0.new/src/toggle_octplot.m.in	2006-01-17 14:51:47.018601448 +0100
+@@ -32,6 +32,14 @@
+   octplot_config_info.version = \
+ 	"@VERSION@";
+   octplot_config_info.in_use = 0;
++  octplot_config_info.clear_command = "clear ";
++  octplot_tmp1 = glob (sprintf ("%s/*.m", octplot_config_info.path));
++  for octplot_tmp2 = 1 : length (octplot_tmp1)
++    octplot_config_info.clear_command = \
++      sprintf ("%s %s",
++        octplot_config_info.clear_command, \
++        split (split (octplot_tmp1 {octplot_tmp2}, "/") (end, :), ".") (1, :));
++  endfor
+ endif
+ 
+ 
+@@ -72,6 +80,7 @@
+     set(0,"DefaultFontDir","../fonts/");
+   else
+     addpath(octplot_config_info.path);
++    eval (octplot_config_info.clear_command);
+   endif
+ 
+ else
+@@ -87,6 +96,7 @@
+   octplot_atexit;
+   
+   rmpath(octplot_config_info.path);
++  eval (octplot_config_info.clear_command);
+   octplot_config_info.in_use = 0;
+ 
+ endif

Modified: trunk/packages/octplot/debian/rules
===================================================================
--- trunk/packages/octplot/debian/rules	2006-01-17 14:32:07 UTC (rev 423)
+++ trunk/packages/octplot/debian/rules	2006-01-17 15:35:53 UTC (rev 424)
@@ -10,11 +10,12 @@
 
 # Pass correct flags to configure script:
 DEB_CONFIGURE_EXTRA_FLAGS := --with-minpath=$(MDIR)
-DEB_CONFIGURE_EXTRA_FLAGS += --with-opath=$(OCTDIR)
+OCTPLOT_LIB = /usr/lib/octplot
+DEB_CONFIGURE_EXTRA_FLAGS += --with-opath=$(OCTPLOT_LIB)
 CXXFLAGS += -fPIC
 
 binary-predeb/octplot::
-	rm -f $(DEB_DESTDIR)$(OCTDIR)/fonts/copying
+	rm -f $(DEB_DESTDIR)$(OCTPLOT_LIB)/fonts/copying
 
 rulesinfo:
 	@echo MDIR: $(MDIR)