[Pkg-octave-commit] [SCM] Debian packaging for octave-pkg-dev branch, master, updated. d688a7e52676d3c6aa614fe9d8a02f45865dc0cd

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 2f9650b162005edc9ec5e9ba1930bc9fcc91ea15
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Tue Mar 6 21:37:36 2012 +0100

    Allow class methods to be properly checked
    
    In order to have proper unit testing of class methods, we should issue
    "test @class/method.m".  The code in octave-pkg.mk was issuing "test
    method.m", which obviously does not work, since files under a @-leading
    directory name are not in the path.  Besides, it would make no sense
    to test a method function outside its class scope.

diff --git a/debian/changelog b/debian/changelog
index 1119d22..1ae84ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave-pkg-dev (0.7.7) UNRELEASED; urgency=low
+
+  * octave-pkg.mk.in (check-pkg): Allow class methods to be properly
+    checked
+
+ -- Rafael Laboissiere <rafael at laboissiere.net>  Tue, 06 Mar 2012 21:36:29 +0100
+
 octave-pkg-dev (0.7.6) unstable; urgency=low
 
   [ Rafael Laboissiere ]
diff --git a/octave-pkg.mk.in b/octave-pkg.mk.in
index 701c2e7..0cc26e3 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk.in
@@ -92,7 +92,7 @@ check-pkg:
 	echo "addpath (genpath ([pwd(),'/debian']));" > $$tmp ;	\
 	find debian/ -name \*.m					\
 		| xargs grep -l '^%!\(assert\|test\)'		\
-		| perl -pe 's:.*/(.*)\.m::;			\
+		| perl -pe 's:[^@]*/(.*)\.m::;			\
 			 print "disp (\"[$$1]\")\ntest $$1"'	\
 		>> $$tmp ;					\
 	@OCTAVE@ $(octave_options) $$tmp ;			\

-- 
Debian packaging for octave-pkg-dev