[Blends-commit] [SCM] website branch, master, updated. 429f91c9d16a873f7e48e0b8c5b5cd71bc495320

[Andreas Tille]

The following commit has been merged in the master branch:
commit c0e62d9e568f93ce03d21c79dd7e036c145ce5bc
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 5 23:48:39 2016 +0100

    Fix gathering edam files

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index 7c0df9f..d9c4a0f 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -107,6 +107,9 @@ svn_checkout_machine_readable () {
           for file in control copyright upstream upstream/metadata upstream/edam README.Debian; do
             srcfile=${file#upstream/}
             destfile=${file%/metadata}
+            if [ "$destfile" = "upstream/edam" ] ; then
+              destfile=edam
+            fi
             if [ "$file" = "README.Debian" ] ; then
               # It is possible to have more than one debian/*.README.Debian
               getfile=`grep -e "/$pkg/trunk/debian/.*$file$" -e "^$pkg/trunk/debian/.*$file$" -e "^$pkg/debian/.*$file$" -e "trunk/$pkg/debian/.*$file$" -e "/$pkg/[a-z]\+/trunk/debian/.*$file$" $TMPLIST 2>/dev/null` || true
@@ -245,7 +248,7 @@ cd $TARGETDIR
 cd ..
 find $TDNAME -maxdepth 1 -mindepth 1 -name ".*" -delete
 tar --exclude=*README.Debian -cjf $MACHINEREADABLEARCHIVE $TDNAME
-tar --exclude=*.control --exclude=*.changelog --exclude=*.upstream --exlude=*.edam --exclude=*.vcs --exclude=*.copyright -cjf $READMEDEBIANARCHIVE $TDNAME
+tar --exclude=*.control --exclude=*.changelog --exclude=*.upstream --exclude=*.edam --exclude=*.vcs --exclude=*.copyright -cjf $READMEDEBIANARCHIVE $TDNAME
 
 # Check for remaining tempfiles
 if ls -l /tmp/tmp.* 2>/dev/null | grep `whoami` > /dev/null ; then

-- 
Static and dynamic websites for Debian Pure Blends