Merge branch 'upstream'

Author: Luca Toniolo

configs/sim/qtvcp_screens/.gitignore

@@ -1,4 +1,5 @@
 *.var
 *.var.bak
 position*.txt
-
+qtaxis.pref
+qtvcp/

debian/.gitignore

@@ -22,3 +22,5 @@ autoreconf.after
 autoreconf.before
 debhelper-build-stamp
 
+# from debian/tests
+*.out

debian/tests/rs274-test

@@ -4,6 +4,9 @@ set -e
 
 cd "$(dirname "$0")"
 
+if [ -z "$AUTOPKGTEST_TMP" ]; then
+    AUTOPKGTEST_TMP="."
+fi
 log=$AUTOPKGTEST_TMP/rs274.out
 
 if ! rs274 -g rs274.ngc > "$log" 2>&1 ; then