[Blends-commit] [SCM] website branch, master, updated. 58e19c34dc2432286c94d0dfa2b0e92e09966a66

[Andreas Tille]

The following commit has been merged in the master branch:
commit c537b676df660d047e1d304f076dec72093cc8b4
Author: Andreas Tille <tille at debian.org>
Date:   Fri Feb 5 22:34:58 2016 +0100

    Check whether we can gather edam files

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index 097cafd..7c0df9f 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -4,7 +4,7 @@
 #
 # TODO: store file <pkg>.vcs with the Vcs URL where the files were found
 
-TDNAME=machine-readable
+TDNAME=machine-readable_with_edam
 MACHINEREADABLEARCHIVE=/srv/home/groups/blends/htdocs/${TDNAME}/${TDNAME}.tar.bz2
 READMEDEBIANARCHIVE=/srv/home/groups/blends/htdocs/${TDNAME}/README.Debian.tar.bz2
 TARGETDIR=${HOME}/$TDNAME
@@ -67,7 +67,7 @@ svn_checkout_machine_readable () {
   TMPLIST=`mktemp`
   svn list --verbose svn://localhost/svn/$1 --recursive | \
     grep -v -e '/tags/' -e '/branches/' -e '/patches/' | \
-    grep -e "/control$" -e "/changelog$" -e "/copyright$" -e "/upstream$" -e "/upstream/metadata$" -e "README.Debian$" | \
+    grep -e "/control$" -e "/changelog$" -e "/copyright$" -e "/upstream$" -e "/upstream/metadata$" -e "/upstream/edam$" -e "README.Debian$" | \
     grep -v "tests/control" | \
     sed 's/^.*[[:space:]]\([^[:space:]]\+\)/\1/' \
     > $TMPLIST
@@ -104,7 +104,7 @@ svn_checkout_machine_readable () {
           echo "Vcs-Svn: svn://anonscm.debian.org/$1/$vcslocation" > $TARGETDIR/$firstletter/${srcname}.vcs
           echo "Vcs-Browser: http://anonscm.debian.org/viewvc/$1/$vcslocation" >> $TARGETDIR/$firstletter/${srcname}.vcs
           echo "Blend: `echo $1 | sed 's?/.*??'`" >> $TARGETDIR/$firstletter/${srcname}.vcs
-          for file in control copyright upstream upstream/metadata README.Debian; do
+          for file in control copyright upstream upstream/metadata upstream/edam README.Debian; do
             srcfile=${file#upstream/}
             destfile=${file%/metadata}
             if [ "$file" = "README.Debian" ] ; then
@@ -184,7 +184,7 @@ git_checkout_machine_readable () {
     echo "Vcs-Browser: https://anonscm.debian.org"`echo $1 | sed 's+^/git/+/cgit/+'` >> $TARGETDIR/$firstletter/${srcname}.vcs
     echo "Blend: `echo $2 | sed 's?/.*??'`" >> $TARGETDIR/$firstletter/${srcname}.vcs
     for file in `git ls-tree -r HEAD debian/ 2>/dev/null | \
-                 grep -e "debian/control$" -e "debian/changelog$" -e "debian/copyright$" -e "debian/upstream$" -e "debian/upstream/metadata$" -e "debian/.*README.Debian$" | \
+                 grep -e "debian/control$" -e "debian/changelog$" -e "debian/copyright$" -e "debian/upstream$" -e "debian/upstream/metadata$" -e "debian/upstream/edam$"  -e "debian/.*README.Debian$" | \
                  sed 's/^[0-9]\+[[:space:]]\+blob[[:space:]]\+[0-9a-f]\+[[:space:]]\+//'` ; do
                  ## grep -v -e "debian/tests" -e "/usr/share/doc" -e "DEBIAN" -e "debian/components" -e "jquery" -e "debian/templates" | \
       # for very strange reasons in two cases (pkg-games/pentobi.git and pkg-octave/octave.git) the line above contains strings not starting with ^debian ... enforcing this
@@ -245,7 +245,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 --exclude=*.vcs --exclude=*.copyright -cjf $READMEDEBIANARCHIVE $TDNAME
+tar --exclude=*.control --exclude=*.changelog --exclude=*.upstream --exlude=*.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