The following commit has been merged in the master branch:
commit 429f91c9d16a873f7e48e0b8c5b5cd71bc495320
Author: Andreas Tille <[email protected]>
Date: Sat Feb 6 13:58:56 2016 +0100
Enable using <pkg>.edam files
diff --git a/misc/machine_readable/fetch-machine-readable
b/misc/machine_readable/fetch-machine-readable
index 782e851..6f10aaa 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -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 "/upstream/edam$" -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
@@ -107,8 +107,8 @@ 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
+ if echo $destfile | grep -q "upstream/.*edam" ; then
+ destfile=`echo $destfile | sed 's?upstream/??'`
fi
if [ "$file" = "README.Debian" ] ; then
# It is possible to have more than one debian/*.README.Debian
@@ -187,17 +187,13 @@ 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/upstream/edam$" -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
if echo $file | grep -q ^debian ; then
destfile=${file%/metadata}
- if [ "$destfile" = "debian/upstream/edam" ] ; then
- target=$TARGETDIR/$firstletter/${srcname}.edam
- else
- target=$TARGETDIR/$firstletter/${srcname}.`echo $destfile | sed
's?debian/??'`
- fi
+ target=$TARGETDIR/$firstletter/${srcname}.`echo $destfile | sed -e
's?debian/??' -e 's?upstream/??'`
if echo $file | grep -q README.Debian ; then
rdfile=`basename $file`
if [ "$rdfile" = "README.Debian" ] ; then
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
