[SCM] live-manual branch, debian, updated. debian/2.0_a7-1-1-g35a6748

Daniel Baumann daniel at debian.org
Sun Oct 3 08:29:34 UTC 2010


The following commit has been merged in the debian branch:
commit 35a67483baa0686c0d1a1555058fe62834918670
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Oct 3 10:29:59 2010 +0200

    Updating autobuild target for squeeze.

diff --git a/Makefile b/Makefile
index 0b60c26..ae63405 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,6 @@ build:
 
 autobuild: clean build
 	rm -rf build
-	cp -a html build
 
 	for LANGUAGE in $(LANGUAGES); \
 	do \
@@ -44,18 +43,14 @@ autobuild: clean build
 		mkdir -p build/$${LANGUAGE}/odf; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/opendocument.odt build/$${LANGUAGE}/odf/live-manual.odt; \
 		mkdir -p build/$${LANGUAGE}/pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-a4.pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-a4.pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-letter.pdf; \
+		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-letter.pdf; \
 		mkdir -p build/$${LANGUAGE}/txt; \
 		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/plain.txt build/$${LANGUAGE}/txt/live-manual.txt; \
-		sed -e "s|@DATE_BUILD@|$(shell LC_ALL=C date -R)|" \
-		    -e "s|@DATE_CHANGE@|$(shell LC_ALL=C git log | grep -m1 Date | awk -FDate: '{ print $2 }' | sed -e 's|^ *||g')|" \
-		manual/$${LANGUAGE}/index.html.in > build/$${LANGUAGE}/index.html; \
 	done
 
-#		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.a4.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-a4.pdf; \
-#		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.a4.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-a4.pdf; \
-#		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/landscape.letter.pdf build/$${LANGUAGE}/pdf/live-manual.landscape-letter.pdf; \
-#		cp manual/$${LANGUAGE}/build/$${LANGUAGE}/live-manual/portrait.letter.pdf build/$${LANGUAGE}/pdf/live-manual.portrait-letter.pdf; \
-
 commit: tidy test
 	$(MAKE) -C manual rebuild
 

-- 
live-manual



More information about the debian-live-changes mailing list