[Pkg-octave-commit] r1230 - semidef-oct/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-02-23 14:34:39 +0000 (Sat, 23 Feb 2008)
New Revision: 1230

Removed:
   semidef-oct/trunk/debian/prompt.m
   semidef-oct/trunk/debian/run_cmd.m
Modified:
   semidef-oct/trunk/debian/changelog
   semidef-oct/trunk/debian/rules
Log:
Do not install files sp.m, prompt.m, and run_cmd.m

Modified: semidef-oct/trunk/debian/changelog
===================================================================
--- semidef-oct/trunk/debian/changelog	2008-02-23 12:14:18 UTC (rev 1229)
+++ semidef-oct/trunk/debian/changelog	2008-02-23 14:34:39 UTC (rev 1230)
@@ -13,11 +13,15 @@
     + Use the Vcs-* headers instead of the deprecated XS-Vcs-* ones
   * debian/copyright: Add more comments about the licensing terms of the
     different parts of the package
-  * debian/rules: Add test suite
+  * debian/rules:
+    + Add test suite
+    + Do not install the sp.m, prompt.m, and run_cmd.m files.  The first
+      conflicts with sp.oct, while the two others are already in the main
+      octave3.0 package (in m/control/util)
   * debian/patches/50_strstream-namespace-std.dpatch: Make the package
     build with GCC 4.3 (closes: #461719)
 
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 13:13:13 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 15:26:07 +0100
 
 semidef-oct (1:2003-5) unstable; urgency=low
 

Deleted: semidef-oct/trunk/debian/prompt.m
===================================================================
--- semidef-oct/trunk/debian/prompt.m	2008-02-23 12:14:18 UTC (rev 1229)
+++ semidef-oct/trunk/debian/prompt.m	2008-02-23 14:34:39 UTC (rev 1230)
@@ -1,40 +0,0 @@
-# Copyright (C) 1996 A. Scottedward Hodel 
-#
-# This file is part of Octave. 
-#
-# Octave is free software; you can redistribute it and/or modify it 
-# under the terms of the GNU General Public License as published by the 
-# Free Software Foundation; either version 2, or (at your option) any 
-# later version. 
-# 
-# Octave is distributed in the hope that it will be useful, but WITHOUT 
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
-# for more details.
-# 
-# You should have received a copy of the GNU General Public License 
-# along with Octave; see the file COPYING.  If not, write to the Free 
-# Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- 
-function prompt(str)
-# function prompt([str])
-# Prompt user to continue
-# str: input string. Default value: "\n ---- Press a key to continue ---"
-# Written by David Clem August 15, 1994
-# Modified A. S. Hodel June 1995
-
-# $Revision: 1.1.1.1 $
-
-if(nargin > 1)
-  usage("prompt([str])");
-elseif(nargin == 0)
-  str = "\n ---- Press a key to continue ---";
-elseif ( !isstr(str) )
-  error("prompt: input must be a string");
-endif
-
-disp(str);
-fflush(stdout);
-kbhit;
-
-endfunction

Modified: semidef-oct/trunk/debian/rules
===================================================================
--- semidef-oct/trunk/debian/rules	2008-02-23 12:14:18 UTC (rev 1229)
+++ semidef-oct/trunk/debian/rules	2008-02-23 14:34:39 UTC (rev 1230)
@@ -35,13 +35,10 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs 			$(MDIR) \
-					$(OCTDIR)
-	install -s -m 0755 SRC/sp.oct 	$(debtmp)/$(OCTDIR)
-	for i in SRC/*.m debian/*.m; do \
-		install -p -m 0644 $$i  $(debtmp)/$(MDIR);\
-        done
-	dh_installdocs		README* DOC/*.ps
+	dh_installdirs $(MDIR) $(OCTDIR)
+	install -s -m 0755 SRC/sp.oct $(debtmp)/$(OCTDIR)
+	install -p -m 0644 $$(ls SRC/*.m | grep -v /sp.m) $(debtmp)/$(MDIR)
+	dh_installdocs README* DOC/*.ps
 	dh_installchangelogs
 	dh_strip
 	dh_compress

Deleted: semidef-oct/trunk/debian/run_cmd.m
===================================================================
--- semidef-oct/trunk/debian/run_cmd.m	2008-02-23 12:14:18 UTC (rev 1229)
+++ semidef-oct/trunk/debian/run_cmd.m	2008-02-23 14:34:39 UTC (rev 1230)
@@ -1,32 +0,0 @@
-# run_cmd: short script used in demos
-# prints string cmd to the screen, then executes after a pause
-
-# $Revision: 1.1.1.1 $
-# $Log: run_cmd.m,v $
-# Revision 1.1.1.1  1998/05/19 20:24:05  jwe
-#
-# Revision 1.4  1997/02/20 16:07:26  hodel
-# added "fflush" after disp("executing")
-#
-# Revision 1.3  1997/02/12 15:38:14  hodel
-# added separator after command execution
-#
-# added blank line after eval(cmd)
-#
-# Revision 1.1  1997/02/12 11:35:08  hodel
-# Initial revision
-#
-# Revision 1.3  1997/02/07 15:44:13  scotte
-# Added "executing" string so that users would know that the command was
-# being processed
-#
-
-disp(["Command: ",cmd])
-puts("Press a key to execute command");
-fflush(stdout);
-kbhit();
-disp("  executing");
-fflush(stdout);
-eval(cmd);
-disp("---")
-disp(" ")