[lua-torch-torch7] 01/01: rules: avoid the .pc surprise

Zhou Mo cdluminate-guest at moszumanska.debian.org
Wed Aug 24 14:39:33 UTC 2016


This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository lua-torch-torch7.

commit 0dff46b50eeb938889ff12fd101da0618c2aa71f
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Aug 24 14:38:44 2016 +0000

    rules: avoid the .pc surprise
---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b3c1735..2a2dca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lua-torch-torch7 (0~20160803-g17ff317-3) experimental; urgency=medium
 
   * Add patch fix-32bit-system-abs-failure, changing the test number
     which exceeds the lower bound of long int.
+  * Don't walk into .pc directory when grabbing files for the unit
+    test, to avoid the surprise that patched scripts being overwrote
+    by original ones under .pc directory.
 
  -- Zhou Mo <cdluminate at gmail.com>  Wed, 24 Aug 2016 13:31:55 +0000
 
diff --git a/debian/rules b/debian/rules
index 2628da2..346bcba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ override_dh_auto_test:
 	# prepare lua files to launch a "torch.test()"
 	set -e; if ! test -d deb.test/torch; then mkdir -p deb.test/torch; fi
 	set -e; find . -name '*.so*' -exec cp -v '{}' deb.test/ \;
-	set -e; find . -name '*.lua' -exec cp -v '{}' deb.test/torch/ \;
+	set -e; find . -path './.pc' -prune -o \( -name '*.lua' -exec cp -v '{}' deb.test/torch/ \; \)
 	set -e; cd deb.test; ln -s torch/init.lua torch.lua;
 	set -e; cd deb.test; \
 		LD_LIBRARY_PATH=$(ROOTDIR)/deb.test \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lua-torch-torch7.git



More information about the debian-science-commits mailing list