[debian-edu-commits] debian-edu/debian-edu-doc.git (#288) - wheezy (branch) updated: 0.8.20071115-7-gd5f72a2
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:15:33 UTC 2013
The branch, wheezy has been updated
via d5f72a201cf81483bf972ec838e740946b39f3c7 (commit)
from 71abf21d7833a433d0ff1f840361d315b96e4a65 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
Makefile | 25 ++++++++++----------
debian/changelog | 5 +++-
.../get_release-manual => norwegian/get_itil} | 25 ++++++++++----------
3 files changed, 28 insertions(+), 27 deletions(-)
copy documentation/{release-manual/get_release-manual => norwegian/get_itil} (76%)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 7b42372..5362f2b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,32 +12,31 @@ all: build
get-orig-source:
# update release-manual
$(MAKE) -C documentation/release-manual update
-# get itil document
- GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook" | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
+ # get itil document
+ cd documentation/norwegian/ && ./get_itil
build:
-#
-# Build ITIL book
-#
+ #
+ # Build ITIL book
+ #
dblatex -T simple -o $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.xml
-openjade -t sgml -i html -E 10000 -d /usr/share/docbook-utils/docbook-utils.dsl\#html -V paper-type=A4 -V nochunks /usr/share/sgml/declaration/xml.dcl $(SRCDIR)/norwegian/itil.xml > $(SRCDIR)/norwegian/itil.html
install:
-#
-# Install ITIL book
-#
+ #
+ # Install ITIL book
+ #
install -d $(DESTDIR)$(DESTPATH)/nb/itil
install -m 644 $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.html $(DESTDIR)$(DESTPATH)/nb/itil
-
-#
-# Install release manual
-#
+ #
+ # Install release manual
+ #
$(MAKE) -C $(SRCDIR)/release-manual install DESTDIR="$(DESTDIR)"
dist-clean: clean
- rm $(SRCDIR)/norwegian/itil.pdf -f
+ rm $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.html -f
clean:
$(MAKE) -C documentation/release-manual clean
diff --git a/debian/changelog b/debian/changelog
index 6f49bf3..428e985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ debian-edu-doc (0.8.20071117) unstable; urgency=low
* build html version of itil book
* link to release manual in all languages
+ * new script, get_itil (based on get_release-manual) to download the itil
+ book as docbook and modify it like the release manual, ie add id=name to
+ the section tags
- -- Holger Levsen <holger at debian.org> Sat, 17 Nov 2007 23:56:59 +0100
+ -- Holger Levsen <holger at debian.org> Sun, 18 Nov 2007 00:21:26 +0100
debian-edu-doc (0.8.20071115) unstable; urgency=low
diff --git a/documentation/release-manual/get_release-manual b/documentation/norwegian/get_itil
similarity index 76%
copy from documentation/release-manual/get_release-manual
copy to documentation/norwegian/get_itil
index d642f64..dec26ad 100755
--- a/documentation/release-manual/get_release-manual
+++ b/documentation/norwegian/get_itil
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
#
# download the AllInOne page of the release-manual as docbook
# and transform it into release-manual.xml
@@ -20,15 +20,14 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-url="http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/"
-name="release-manual.xml"
+url="http://wiki.skolelinux.no/Dokumentasjon/ITIL/"
+name="itil.xml"
-DEBIAN_EDU_DOC_BUILDDATE=`date -u +%Y-%m-%d\ %H:%M\ %Z`
-DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Terra 3.0 Release Manual"
+DOC_TITLE="ITIL Document"
# the last but one sed "preserves" the 2nd matched regex
# the last sed does the same as dos2unix
-GET "${url}AllInOne?action=raw"|sed "s%\[\[Include(%%g" | sed "s%)]]%%g" | sed "s%DebianEdu/Documentation/Etch%%g"|sed 's/.$//'> id
+GET "${url}AllInOne?action=raw"|sed "s%\[\[Include(%%g" | sed "s%)]]%%g" | sed "s%Dokumentasjon/ITIL%%g"|sed 's/.$//'> id
for i in `cat id` ; do
TARGET=`echo "${i}" |sed "s/\(.*\)\/\(.*\)/\2/" `.xml
@@ -43,7 +42,6 @@ for i in `cat id` ; do
sed "s%<title>%\n<title>%g" |
sed "s%<section>%\n\n<section>%g" |
sed "s%<para>%\n<para>%g" |
- sed "s/\$DEBIAN_EDU_DOC_BUILDDATE/<code>$DEBIAN_EDU_DOC_BUILDDATE<\/code>/" |
sed "s%code>%computeroutput>%g" |
sed "s%/wiki/rightsidebar/img/%./images/%g" |
sed "s%</article>%%" |
@@ -56,7 +54,10 @@ sed -i "s/\(.*\)\/\(.*\)/\2/" id
# add id= to <section>s
for i in `cat id` ; do
- sed -i "0,/<section>/ s/<section>/<section id=\"$i\">/" ${i}.xml
+ # only ascii in ids
+ j=`echo $i | sed "s/ø/oe/g"`
+ # add id= to <section>s
+ sed -i "0,/<section>/ s/<section>/<section id=\"$j\">/" ${i}.xml
done
# paste it together
@@ -68,20 +69,18 @@ done
rm id
# get images and modify $name
-./get_images
+#./get_images
# turn links into internal references if appropriate
# this needs to run after ./get_images
#
# -0\777 read multiple lines
-perl -0\777 -pi -e "s/<ulink url='\/DebianEdu\/Documentation\/(.*)\/(.*)'>(.*)\n<\/ulink>/<link linkend=\"\2\">\3<\/link>/g" $name
+perl -0\777 -pi -e "s/<ulink url='\/Dokumentasjon\/ITIL\/(.*)\/(.*)'>(.*)\n<\/ulink>/<link linkend=\"\2\">\3<\/link>/g" $name
# make it a docbook article again
-sed -i "1,/</ s#<#<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE article PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\"><article><articleinfo><title>$DEBIAN_EDU_DOC_TITLE</title></articleinfo>\n<#" $name
+sed -i "1,/</ s#<#<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE article PUBLIC \"-//OASIS//DTD DocBook XML V4.4//EN\" \"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd\"><article><articleinfo><title>$DOC_TITLE</title></articleinfo>\n<#" $name
sed -i "$ s#>#>\n</article>#" $name
# remove the first empty line
sed -i "1d" $name
-# motivate
-echo `GET "${url}AllInOne?action=format&mimetype=text"|grep -i FIXME |wc -l` FIXMEs left to fix
hooks/post-receive
--
debian-edu-doc.git (Debian package debian-edu-doc)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "debian-edu-doc.git" (Debian package debian-edu-doc).
More information about the debian-edu-commits
mailing list