[debian-edu-commits] debian-edu/debian-edu-doc.git (#489) - wheezy (branch) updated: 1.2_20090131-4-gb3679c8
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:19:08 UTC 2013
The branch, wheezy has been updated
via b3679c8fcfdb78a6b5c0d4d85c5d103730330545 (commit)
from 9cd36d0008cc231b55d00fc4d2165d22189bd51b (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 | 15 ++++---
debian/README | 27 ++++++------
debian/changelog | 25 ++++++++---
debian/control | 3 +-
debian/mail_status_to_list | 50 +++++++++++++++++++++
documentation/release-manual/Makefile | 3 +-
documentation/release-manual/fixme-status.txt | 47 ++++++++++++++++++++
documentation/release-manual/get_images | 4 +-
documentation/release-manual/get_release-manual | 54 ++++++++++++++++-------
documentation/rosegarden/Makefile | 3 +-
documentation/rosegarden/get_rosegarden-manual | 52 +++++++++++++++-------
todo | 5 ++-
12 files changed, 226 insertions(+), 62 deletions(-)
create mode 100755 debian/mail_status_to_list
create mode 100644 documentation/release-manual/fixme-status.txt
create mode 100644 documentation/rosegarden/fixme-status.txt
The diff of changes is:
diff --git a/Makefile b/Makefile
index abee041..ff41ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,15 @@ DESTDIR =
all: build
+#
+# norwegian is disabled as it only contains the itil documentation which fails to build in lenny and newer
+# see ./todo
+#
+
get-orig-source:
$(MAKE) -C $(SRCDIR)/release-manual update
$(MAKE) -C $(SRCDIR)/rosegarden update
- $(MAKE) -C $(SRCDIR)/norwegian update
+# $(MAKE) -C $(SRCDIR)/norwegian update
status:
$(MAKE) -C $(SRCDIR)/release-manual status
@@ -16,19 +21,19 @@ status:
build:
$(MAKE) -C $(SRCDIR)/release-manual build
$(MAKE) -C $(SRCDIR)/rosegarden build
- $(MAKE) -C $(SRCDIR)/norwegian build
+# $(MAKE) -C $(SRCDIR)/norwegian build
install:
$(MAKE) -C $(SRCDIR)/release-manual install
$(MAKE) -C $(SRCDIR)/rosegarden install
- $(MAKE) -C $(SRCDIR)/norwegian install
+# $(MAKE) -C $(SRCDIR)/norwegian install
dist-clean: clean
$(MAKE) -C $(SRCDIR)/release-manual dist-clean
$(MAKE) -C $(SRCDIR)/rosegarden dist-clean
- $(MAKE) -C $(SRCDIR)/norwegian dist-clean
+# $(MAKE) -C $(SRCDIR)/norwegian dist-clean
clean:
$(MAKE) -C $(SRCDIR)/release-manual clean
$(MAKE) -C $(SRCDIR)/rosegarden clean
- $(MAKE) -C $(SRCDIR)/norwegian clean
+# $(MAKE) -C $(SRCDIR)/norwegian clean
diff --git a/debian/README b/debian/README
index 57d9db8..2424409 100644
--- a/debian/README
+++ b/debian/README
@@ -4,24 +4,17 @@ About the Debian Edu Documentation
Current documentation
---------------------
-The release-manual which is developed in a wiki at
-http://wiki.debian.org/DebianEdu/Documentation/Etch/ is our new (and still
-a bit incomplete) documentation for Debian-edu etch. Currently we provide two
-versions, a PDF version and a HTML version.
+The release-manual is developed in a wiki at
+http://wiki.debian.org/DebianEdu/Documentation/Lenny/ - it is based on the version
+for etch - which was the first release with this kind of documentation.
+Currently two versions are provided, a PDF version and a HTML version.
Please contribute!
So far translations for the release-manual have been started for German,
-Spanish, Bokmal, italian and French. Please contribute!
+Spanish, Bokmal, Italian and French. Please contribute!
The release-manual is translated with .po files. You can find more information
how to contribute in README.release-manual-translations.
-The Information Technology Infrastructure Library (ITIL) documentation is
-only available in Norwegian and is developed at
-http://wiki.skolelinux.no/Dokumentasjon/ITIL/
-As of the 22nd of november 2007 it has not been updated to reflect the etch
-based release.
-Please contact the mailinglist if you are interested in translating the ITIL
-document into english!
Old documentation
@@ -30,6 +23,14 @@ Old documentation
Some of the old documentation contains generic information which is still
useful as it's not covered in the release manual.
+The Information Technology Infrastructure Library (ITIL) documentation is
+only available in Norwegian and is/was developed at
+http://wiki.skolelinux.no/Dokumentasjon/ITIL/
+As of the 22nd of november 2007 it has not been updated to reflect the etch
+based release. It also doesn't build PDFs in lenny or newer.
+Please contact the mailinglist if you are interested in translating the ITIL
+document into english!
+
The IKT document has been last updated for the woody based release.
http://developer.skolelinux.no/dokumentasjon/ikt/
svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon/ikt/
@@ -54,4 +55,4 @@ svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/arki
Translations to nb, de, da, nl, it and pt_BR are available in svn.
--- Holger Levsen, holger at debian.org, last updated: 2008-07-06
+-- Holger Levsen, holger at debian.org, last updated: 2009-05-29
diff --git a/debian/changelog b/debian/changelog
index 2eb3b2f..056cdbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,26 @@
-debian-edu-doc (1.2~20090202~3.0) UNRELEASED; urgency=low
-
+debian-edu-doc (1.2~20090629~5.0.1+edu0~alpha) UNRELEASED; urgency=low
+
+ * Include the Debian Edu lenny release-manual and not the etch one anymore.
+ * Adopt get_$document and get_images to deal with changes due to the
+ moinmoin upgrade on wiki.debian.org.
+ * Generate better status about the manuals, to motivate people to write
+ missing documentation bits and to translate.
+ * Disable build (and thus shipping) of itil document, as it can only be
+ build in etch. (Closes: 458879)
* Suppress warning in debian-edu-doc-$CC postrm scripts if
/usr/share/doc/debian-edu-doc cannot be removed.
* Add Debian releasenumber to version string to allow upgrade from the etch
- version to the lenny one, if they are released on the same day. Also
- useful to easily see which is installed / being worked on in svn.
- * Update years in debian/copyright. (UNFINISHED)
+ version to the lenny one (even though this hasn't happened now, it's good
+ to have it in place for squeeze), if they are released on the same day.
+ Also useful to easily see which is installed / being worked on in svn.
+ * Updated README.
+ * TODO before upload:
+ - include audacity manual and release manual for etch
+ - create new packages debian-edu-doc-CC-etch, debian-edu-doc-rosegarden
+ and debian-edu-doc-audacity
+ - Italian translation is broken
+ - images are missing in pdf version
+ - check if smileys and alerts etc images are there
-- Holger Levsen <holger at debian.org> Mon, 02 Feb 2009 14:06:48 +0100
diff --git a/debian/control b/debian/control
index 3fb8628..f3d9a08 100644
--- a/debian/control
+++ b/debian/control
@@ -71,8 +71,7 @@ Depends: debian-edu-doc-en
Architecture: all
Description: Bokmal documentation from the Debian Edu project
The Bokmal version of the release manual from the Debian Edu / Skolelinux
- project is included in this package, as well as the ITIL documentation and the
- rosegarden manual.
+ project is included in this package, as well as the rosegarden manual.
.
Debian Edu is a Debian project to make the best distribution for educational
purposes. Skolelinux is the name of the Custom Debian Distribution which is
diff --git a/debian/mail_status_to_list b/debian/mail_status_to_list
new file mode 100755
index 0000000..9e3f80e
--- /dev/null
+++ b/debian/mail_status_to_list
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+# Copyright 2009 Holger Levsen (holger at layer-acht.org)
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+#
+# send reminders about the status of the package
+# run via ~holger/crontab on a.skolelinux.no
+#
+
+cd ~holger/debian-edu-doc
+if [ ! $(svn up && svn status) ] ; then
+ echo "Problem with svn checkout at a.skolelinux.no:~holger/debian-edu-doc - please fix." | mail -s "problem with debian-edu-doc status mails" holger at layer-acht.org
+ exit 1
+fi
+
+
+#
+# loop through manuals
+#
+cd documentation
+for i in release-manual rosegarden ; do
+ cd $i
+ TMPFILE=$(mktemp)
+ echo "The (translated) $i as PDF or HTML is available at http://maintainer.skolelinux.org/debian-edu-doc/" > $TMPFILE
+ echo >> $TMPFILE
+ echo "To understand this mail better, please read /usr/share/doc/debian-edu-doc/README and README.release-manual-translations." >> $TMPFILE
+ echo "This mail is automatically send by a cronjob run by Holger Levsen every two weeks. Please send feedback, suggestions, flames and cookies via this list." >> $TMPFILE
+ echo >> $TMPFILE
+ make update > /dev/null 2>&1
+ make status >> $TMPFILE 2>&1
+ grep -v "cat fixme-status.txt" $TMPFILE | mail -s "Content and translation status for $i" debian-edu at lists.debian.org
+ rm $TMPFILE
+ cd ..
+done
+cd ..
+
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index d1df7da..354598c 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -11,8 +11,9 @@ update:
status:
@for f in *.po ; do \
echo -n "$$f: "; \
- msgfmt --statistics $$f -o /dev/null ; \
+ LANG=C msgfmt --statistics $$f -o /dev/null ; \
done
+ cat fixme-status.txt
build:
# create localized xml files
diff --git a/documentation/release-manual/fixme-status.txt b/documentation/release-manual/fixme-status.txt
new file mode 100644
index 0000000..94c79d7
--- /dev/null
+++ b/documentation/release-manual/fixme-status.txt
@@ -0,0 +1,47 @@
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//Features
+FIXME: describe new features in 5.0.0+edu0 here.
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//Requirements
+FIXME: a description of main-server and thinclient-server is missing.
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//Installation
+FIXME: probably each paragraph on this page needs to be (slightly) rewritten for lenny.
+FIXME: describe PXE installation here, if its only two sentences, then they should be here.
+FIXME: path to preseed file location missing
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//GettingStarted
+FIXME: add link to more information about adding Windows hosts to the Skolelinux network or describe it right there.
+FIXME: explain what to do when printconf does not accomplish anything.
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//Maintainance
+FIXME: Explain how to use kde-update-notifier, best with screenshots.
+FIXME: continue description of slbackup-php usage, maybe with screenshots
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//Upgrades
+FIXME: Describe how to upgrade to the powerdns dns and dhcp in ldap structure.
+FIXME: describe how to upgrade from etch.
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//HowTo/Administration
+FIXME: Should we recommend openjdk-6-* from main instead documenting sun-java6-jre? Not sure if a plugin is available...
+FIXME: paragraph about access from outside need to be completed and tested.
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//HowTo/Desktop
+FIXME: this page still contains many etchisms...
+FIXME: this is broken and a bug should be filed: kiosktool upgrades restore default desktop icons
+FIXME: "installing nonfree flash" needs to be updated for lenny
+FIXME: "Sound with Flash on thin clients" needs to be updated for lenny
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//HowTo/NetworkClients
+FIXME: should user groups in windows better be explained with lwat first, and then with an example for the command line?
+FIXME explain how to use profiles from global policies for windows machines in the skolelinux network
+FIXME: describe roaming profile key for the global policy editor here
+----------------------------------
+http://wiki.debian.org/DebianEdu/Documentation/Lenny//HowTo/TeachAndLearn
+FIXME: more examples where moodle is used, how it can be used and a link to a good starter documentation is missing here
+FIXME: explain how to install and use italc
+FIXME: explain how to install and use squidgard and/or dansguardian
+FIXME: this paragraph about swi-prolog is written for etch...
+===========================
+24 FIXMEs left to fix
+===========================
diff --git a/documentation/release-manual/get_images b/documentation/release-manual/get_images
index dc5abf3..c3c572e 100755
--- a/documentation/release-manual/get_images
+++ b/documentation/release-manual/get_images
@@ -18,7 +18,7 @@ sub create ($) {
my $name = $link;
my $url;
# use regex to replace the long url with shorter one
- $name =~ s#/DebianEdu/Documentation/Etch/\w+\?action=AttachFile&do=get&target=([\w\d]+)#$1#g;
+ $name =~ s#/DebianEdu/Documentation/Lenny/\w+\?action=AttachFile&do=get&target=([\w\d]+)#$1#g;
# special case the worldmap image
if ($name =~ m#http://www\.skolelinux\.no/slschools/worldmap\.php\?lang=en&image=worldmap\.png#) {
$url = $name;
@@ -42,7 +42,7 @@ sub replace () {
my $local = <FILE>;
close(FILE);
# look for images...
- if ( $local =~ m#<imagedata fileref='/DebianEdu/Documentation/Etch/\w+\?action=AttachFile&do=get&target=([^']+)'/>#) {
+ if ( $local =~ m#<imagedata fileref='/DebianEdu/Documentation/Lenny/\w+\?action=AttachFile&do=get&target=([^']+)'/>#) {
# ..and replace the paths
$local =~ s#<imagedata fileref='([^'"<>]+)'/>#create($1)#eg;
open(FILE, '>./release-manual.xml') or die "Can't open file for writing";
diff --git a/documentation/release-manual/get_release-manual b/documentation/release-manual/get_release-manual
index 8162315..315f386 100755
--- a/documentation/release-manual/get_release-manual
+++ b/documentation/release-manual/get_release-manual
@@ -8,7 +8,7 @@
# Author/Copyright: Holger Levsen
# Licence: GPL2+
# first edited: 2006-07-06
-# last edited: 2008-06-28
+# last edited: 2009-05-29
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,33 +25,50 @@ if [ ! $(which xmllint) ] ; then
exit 1
fi
-url="http://wiki.debian.org/DebianEdu/Documentation/Etch/"
+url="http://wiki.debian.org/DebianEdu/Documentation/Lenny/"
name="release-manual.xml"
+TMPFILE=$(mktemp)
DEBIAN_EDU_DOC_BUILDDATE=`date -u +%Y-%m-%d`
-DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Terra 3.0 Release Manual"
+DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Lenny 5.0.1+edu0~alpha Release Manual"
# 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%DebianEdu/Documentation/Lenny%%g"|sed 's/.$//'|head -n -2> id
for i in `cat id` ; do
TARGET=`echo "${i}" |sed "s/\(.*\)\/\(.*\)/\2/" `.xml
- echo "$TARGET ${url}${i}?action=format&mimetype=xml/docbook"
+ echo "$TARGET ${url}${i}?action=show&mimetype=text/docbook"
# download the docbook version of the release manual from the wiki and pipe it through sed to
# - insert the build date
# - convert <code> tag to <computeroutput> as this is understood by docbook (tools)
+ # - provide correct path to the images
+ # - remove the revision history
+ # - add some linebreaks
# - the last sed command deletes the first 4 lines
- GET "${url}${i}?action=format&mimetype=xml/docbook" |
- sed "s%<\/%\n<\/%g" |
- sed "s%<title>%\n<title>%g" |
- sed "s%<section>%\n\n<section>%g" |
- sed "s%<para>%\n<para>%g" |
+ GET "${url}${i}?action=show&mimetype=text/docbook" |
sed "s/\$DEBIAN_EDU_DOC_BUILDDATE/<code>$DEBIAN_EDU_DOC_BUILDDATE<\/code>/" |
sed "s%code>%computeroutput>%g" |
sed "s%/htdocs/rightsidebar/img/%./images/%g" |
sed "s%</article>%%" |
+ sed "s#</revhistory>##g" |
+ sed "s%</authorinitials>%%" |
+ sed "s#<revremark>\(.*\)</revremark>##g" |
+ sed "s#<authorinitials>\(.*\)</authorinitials>##g" |
+ sed "s#</articleinfo>##g" |
+ sed "s#</revision>##g" |
+ sed "s%<\/%\n<\/%g" |
+ sed "s%<title>%\n<title>%g" |
+ sed "s%<section>%\n\n<section>%g" |
+ sed "s%<para>%\n<para>%g" |
+ sed "s%</date>\(.*\)\$%%g" |
+ sed "s%FIXME%\nFIXME%g" |
sed '1,4d' > $TARGET
+ if [ "$(grep -v FIXMEs $TARGET |grep FIXME)" != "" ] ; then
+ echo "----------------------------------" >> $TMPFILE
+ echo ${url}${i} >> $TMPFILE
+ grep -v FIXMEs $TARGET | grep FIXME >> $TMPFILE
+ fi
done
# now only keep the page name (equals section id) without path
@@ -83,12 +100,17 @@ perl -0\777 -pi -e "s/<ulink url='\/DebianEdu\/Documentation\/(.*)\/(.*)'>(.*)\
# 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 "$ s#>#>\n</article>#" $name
-# remove the first empty line
-sed -i "1d" $name
+# remove the first two empty lines
+sed -i "1,2d" $name
# clean it further
-xmllint $name > $name.tmp
-mv $name.tmp $name
+TMPFILE2=$(mktemp)
+xmllint $name > $TMPFILE2
+mv $TMPFILE2 $name
# motivate
-echo `GET "${url}AllInOne?action=format&mimetype=text"|grep -i FIXME |wc -l` FIXMEs left to fix
-
+if [ "$(grep -v FIXMEs $name |grep FIXME)" != "" ] ; then
+ echo "===========================" >> $TMPFILE
+ echo `grep -v FIXMEs $name|grep FIXME |wc -l` FIXMEs left to fix >> $TMPFILE
+ echo "===========================" >> $TMPFILE
+fi
+mv $TMPFILE fixme-status.txt
diff --git a/documentation/rosegarden/Makefile b/documentation/rosegarden/Makefile
index d3402fe..196322b 100644
--- a/documentation/rosegarden/Makefile
+++ b/documentation/rosegarden/Makefile
@@ -11,8 +11,9 @@ update:
status:
@for f in *.po ; do \
echo -n "$$f: "; \
- msgfmt --statistics $$f -o /dev/null ; \
+ LANG=C msgfmt --statistics $$f -o /dev/null ; \
done
+ cat fixme-status.txt
build:
# create localized xml files
diff --git a/documentation/rosegarden/fixme-status.txt b/documentation/rosegarden/fixme-status.txt
new file mode 100644
index 0000000..e69de29
diff --git a/documentation/rosegarden/get_rosegarden-manual b/documentation/rosegarden/get_rosegarden-manual
index 938c104..7f53731 100755
--- a/documentation/rosegarden/get_rosegarden-manual
+++ b/documentation/rosegarden/get_rosegarden-manual
@@ -8,7 +8,7 @@
# Author/Copyright: Holger Levsen
# Licence: GPL2+
# first edited: 2006-07-06
-# last edited: 2008-07-10
+# last edited: 2009-05-29
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -27,31 +27,48 @@ fi
url="http://wiki.debian.org/DebianEdu/Documentation/Manuals/Rosegarden/"
name="rosegarden-manual.xml"
+TMPFILE=$(mktemp)
DEBIAN_EDU_DOC_BUILDDATE=`date -u +%Y-%m-%d`
DEBIAN_EDU_DOC_TITLE="Debian Edu / Skolelinux Rosegarden manual"
# 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/Manuals/Rosegarden%%g"|sed 's/.$//'> id
+GET "${url}AllInOne?action=raw"|sed "s%<<Include(%%g" | sed "s%)>>%%g" | sed "s%DebianEdu/Documentation/Manuals/Rosegarden%%g"|sed 's/.$//'> id
for i in `cat id` ; do
TARGET=`echo "${i}" |sed "s/\(.*\)\/\(.*\)/\2/" `.xml
- echo "$TARGET ${url}${i}?action=format&mimetype=xml/docbook"
+ echo "$TARGET ${url}${i}?action=show&mimetype=text/docbook"
# download the docbook version of the rosegarden manual from the wiki and pipe it through sed to
# - insert the build date
# - convert <code> tag to <computeroutput> as this is understood by docbook (tools)
+ # - provide correct path to the images
+ # - remove the revision history
+ # - add some linebreaks
# - the last sed command deletes the first 4 lines
- GET "${url}${i}?action=format&mimetype=xml/docbook" |
- sed "s%<\/%\n<\/%g" |
- sed "s%<title>%\n<title>%g" |
- sed "s%<section>%\n\n<section>%g" |
- sed "s%<para>%\n<para>%g" |
+ GET "${url}${i}?action=show&mimetype=text/docbook" |
sed "s/\$DEBIAN_EDU_DOC_BUILDDATE/<code>$DEBIAN_EDU_DOC_BUILDDATE<\/code>/" |
sed "s%code>%computeroutput>%g" |
sed "s%/htdocs/rightsidebar/img/%./images/%g" |
sed "s%</article>%%" |
+ sed "s#</revhistory>##g" |
+ sed "s%</authorinitials>%%" |
+ sed "s#<revremark>\(.*\)</revremark>##g" |
+ sed "s#<authorinitials>\(.*\)</authorinitials>##g" |
+ sed "s#</articleinfo>##g" |
+ sed "s#</revision>##g" |
+ sed "s%<\/%\n<\/%g" |
+ sed "s%<title>%\n<title>%g" |
+ sed "s%<section>%\n\n<section>%g" |
+ sed "s%<para>%\n<para>%g" |
+ sed "s%</date>\(.*\)\$%%g" |
+ sed "s%FIXME%\nFIXME%g" |
sed '1,4d' > $TARGET
+ if [ "$(grep -v FIXMEs $TARGET |grep FIXME)" != "" ] ; then
+ echo "----------------------------------" >> $TMPFILE
+ echo ${url}${i} >> $TMPFILE
+ grep -v FIXMEs $TARGET | grep FIXME >> $TMPFILE
+ fi
done
# now only keep the page name (equals section id) without path
@@ -80,15 +97,20 @@ rm id
# -0\777 read multiple lines
perl -0\777 -pi -e "s/<ulink url='\/DebianEdu\/Documentation\/Manuals\/(.*)\/(.*)'>(.*)\n<\/ulink>/<link linkend=\"\2\">\3<\/link>/g" $name
-#make it a docbook article again
+# 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 "$ s#>#>\n</article>#" $name
-# remove the first empty line
-sed -i "1d" $name
+# remove the first two empty lines
+sed -i "1,2d" $name
# clean it further
-xmllint $name > $name.tmp
-mv $name.tmp $name
+TMPFILE2=$(mktemp)
+xmllint $name > $TMPFILE2
+mv $TMPFILE2 $name
# motivate
-echo `GET "${url}AllInOne?action=format&mimetype=text"|grep -i FIXME |wc -l` FIXMEs left to fix
-
+if [ "$(grep -v FIXMEs $name |grep FIXME)" != "" ] ; then
+ echo "====================" >> $TMPFILE
+ echo `grep -v FIXMEs $name |grep FIXME||wc -l` FIXMEs left to fix >> $TMPFILE
+ echo "====================" >> $TMPFILE
+fi
+mv $TMPFILE fixme-status.txt
diff --git a/todo b/todo
index 13d737e..8c007b4 100644
--- a/todo
+++ b/todo
@@ -3,9 +3,10 @@ todo
There is mostly stuff left to do related to old documentation.
-This will not be fixed for r1, but should be fixed for r2/lenny:
-
- itil
+ - has been disabled now, as it FTBFS in lenny and newer... for squeeze the
+ itil document should be removed from the package, it's still available in svn
+ anyway.
- images have been lost. Do *you* have them?
- images on the wiki do not make it to the PDF and HTML version, it's
pointless to copy that code from the release-manual build scripts if
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