Merge remote-tracking branch 'origin/v1.0'

Conflicts:
	content.tex
	makediff.sh

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio/trunk@477 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652

1 files changed, 8 insertions, 0 deletions

diff --git a/makezip.sh b/makezip.sh
index de423ea..de52abf 100755
--- a/makezip.sh
+++ b/makezip.sh
@@ -1,4 +1,5 @@
 export SPECDOC=${SPECDOC:-`cat REVISION`}
+export DATESTR=${DATESTR:-`cat REVISION-DATE`}
 rm -f $SPECDOC.zip
 if test -d .git; then
 	git archive --format=zip --prefix=tex/ -o $SPECDOC.zip HEAD
@@ -14,6 +15,13 @@ else
 	echo Falling back to generated list.
 fi
 zip -d $SPECDOC.zip tex/.gitattributes
+rm -fr listings
 mkdir -p listings
 cp virtio-ring.h listings/virtio_ring.h
 zip $SPECDOC.zip listings/virtio_ring.h
+rm -fr tmpfilesforzip
+mkdir -p tmpfilesforzip/tex
+echo "$SPECDOC" > tmpfilesforzip/tex/REVISION
+echo "$DATESTR" > tmpfilesforzip/tex/REVISION-DATE
+cd tmpfilesforzip
+zip ../$SPECDOC.zip tex/*