[Pkg-octave-commit] [SCM] Debian packaging for octave-pkg-dev branch, experimental, updated. debian/1.0.2-3-ge2773cb

Rafael Laboissiere rafael at laboissiere.net
Wed Oct 17 08:14:23 UTC 2012


The following commit has been merged in the experimental branch:
commit e2773cbaceba7a1fdb85250c80b48cbc75e9d3ff
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Wed Oct 17 09:59:19 2012 +0200

    octave-pkg.mk: Exclude .pc/ when generating path for *.cc files
    
    This is necessary when *.cc are patched in the Debian package and when
    the corresponding *.oct files should be tested.  The "test" command of
    Octave looks for the the *.cc file and may find it first in the ./pc
    directory, instead of the src/ directory.  In this case, if the patch
    regards the test blocks, then the unit testing may fail.

diff --git a/octave-pkg.mk b/octave-pkg.mk
index 46ff2a9..9908acf 100644
--- a/octave-pkg.mk
+++ b/octave-pkg.mk
@@ -131,7 +131,7 @@ check-pkg:
 # We deactivate the warning about relative paths used for the PKG_ADD file.
 	@echo Checking CC files ...
 	@tmp=$$(tempfile) ;					\
-	echo "addpath (genpath ([pwd()]));" >> $$tmp ;		\
+	echo "addpath (genpath ([pwd()], '.pc'));" >> $$tmp ;	\
 	echo "warning ('off', 'Octave:autoload-relative-file-name');" >> $$tmp ;	\
 	if [ -f PKG_ADD ] ; then				\
 		echo "source('PKG_ADD');" >> $$tmp ; 		\

-- 
Debian packaging for octave-pkg-dev



More information about the Pkg-octave-commit mailing list