Merge lp:~midori/midori/lotsBuilds into lp:midori

[Cris Dywan]

Skip folders starting with _ from license and potfiles checks

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'tests/license.sh'
--- tests/license.sh	2012-11-25 16:43:57 +0000
+++ tests/license.sh	2013-12-12 19:01:25 +0000
@@ -9,5 +9,5 @@
 test -z $(which licensecheck) && echo ...SKIPPED: not installed && return 0
 test -n "$SRCDIR" && cd $SRCDIR
 test -z "$BLDDIR" && BLDDIR=_build
-find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1
+find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./_*/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1
 echo ...OK
 
=== modified file 'tests/potfiles.sh'
--- tests/potfiles.sh	2013-09-08 00:02:47 +0000
+++ tests/potfiles.sh	2013-12-12 19:01:25 +0000
@@ -8,7 +8,7 @@
 echo Checking POTFILES.in for completeness
 test -n "$SRCDIR" && cd $SRCDIR
 test -z "$BLDDIR" && BLDDIR=_build
-for i in $(find . -regextype posix-egrep \! -regex "./($BLDDIR|debian|tests)/.+" -a -regex './[^.]+.+[.](vala|c)'); do
+for i in $(find . -regextype posix-egrep \! -regex "./($BLDDIR|_.+|debian|tests)/.+" -a -regex './[^.]+.+[.](vala|c)'); do
     grep -q $(basename $i) po/POTFILES.in || FILES="$FILES$i\n"
 done
 test -n "$FILES" && echo "$FILES...FAILED"