[debian-edu-commits] debian-edu/debian-edu-doc.git (#82) - wheezy (branch) updated: 0.4.20070715-11-ge76dcaa
David Prévot
taffit at alioth.debian.org
Sat Oct 5 12:12:20 UTC 2013
The branch, wheezy has been updated
via e76dcaae702fd7baf3754d261bde395d50ccc53d (commit)
from 3a461c5aec72a293e0722e3a95d2dc28f540911a (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:
debian/README | 7 +++++--
debian/changelog | 16 +++++++++++++---
debian/rules | 46 ++++++++++++++++++++++++++--------------------
todo | 21 ++++++++++++---------
4 files changed, 56 insertions(+), 34 deletions(-)
The diff of changes is:
diff --git a/debian/README b/debian/README
index 0dffd34..c3e2e2b 100644
--- a/debian/README
+++ b/debian/README
@@ -38,8 +38,11 @@ and http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Translations and
Building this package
---------------------
-Only works when you have network :)
+You need an internet connection and the subversion, libwww-perl and po4a
+packages installed to prepare building this package.
+Run "./debian/rules get-orig-source" to download the external documents to
+prepare building and before building and uploading it to the archive.
--- Holger Levsen, holger at debian.org, 2007-07-15
+-- Holger Levsen, holger at debian.org, last updated: 2007-07-17
diff --git a/debian/changelog b/debian/changelog
index 3dd0daf..9c907dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-doc (0.4.20070716) unstable; urgency=low
+debian-edu-doc (0.5.20070717) unstable; urgency=low
[Holger Levsen]
* include ITIL book again, as thanks to Knut Yrvin the licence situation has
@@ -6,8 +6,18 @@ debian-edu-doc (0.4.20070716) unstable; urgency=low
* include copyright statement for release-manual in debian/copyright
* renamed the update target in debian/rules to get-orig-source as policy
suggests
-
- -- Holger Levsen <holger at debian.org> Sun, 15 Jul 2007 18:03:09 +0200
+ * include the ITIL book in get-orig-source
+ * documented how to prepare the source package with get-orig-source and
+ howto build and upload it
+ * include release-manual/README in binary package
+ * debian/rules rewritten, to get rid of tmpdirs - the source package now
+ includes all files which are needed to build the binary package, so
+ building the binary package does not requiere network anymore
+ * included the code from moinmoin2pdf in debian/rules instead of downloading
+ it
+ * updated todo
+
+ -- Holger Levsen <holger at debian.org> Tue, 17 Jul 2007 02:38:24 +0200
debian-edu-doc (0.4.20070715) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 30665db..82a1cb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,28 @@
#!/usr/bin/make -f
-DESTDIR := $(shell pwd)/debian/debian-edu-doc
-SRCDIR = documentation
+DESTDIR := $(CURDIR)/debian/debian-edu-doc
+SRCDIR := $(CURDIR)/documentation
DESTPATH = /usr/share/doc/debian-edu-doc
-REVISION= "{2007-07-15}"
-TMPSRC:=$(CURDIR)/documentation/tmp
+REVISION = "{2007-07-16}"
SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
get-orig-source:
- svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(TMPSRC)/arkitektur
- svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(TMPSRC)/dokumentasjon
- # the moinmoin2pdf script is so short, that I believe it should be part of
- # this package and not downloaded during build time
- wget http://developer.skolelinux.no/itil/moinmoin2pdf -O $(TMPSRC)/moinmoin2pdf
- chmod +x $(TMPSRC)/moinmoin2pdf
+ svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur
+ svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon/driftbook $(SRCDIR)/driftbook
+ # FIXME: checking everything out and then deleting 98% is kind of stupid, to
+ # say it nicely...
+ # a better strategy would be to only check out the needed IKT* files and
+ # the Makefile and then run make. Laters :)
+ svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt-book
+ find $(SRCDIR)/ikt-book ! -name "IKT*" -exec rm -Rf \{\} \;
+ GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook" | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil-$$(date +%Y-%m-%d).xml
$(MAKE) -C documentation/release-manual update
dist-clean: clean
- rm $(TMPSRC) -Rf
+ rm $(SRCDIR)/arkitektur -Rf
+ rm $(SRCDIR)/driftbook -Rf
+ rm $(SRCDIR)/ikt-book -Rf
clean:
$(MAKE) -C documentation/release-manual clean
@@ -47,8 +51,8 @@ install: build
#
for i in en nb de nl pt_BR da ; do \
install -d $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
- install -m 644 $(TMPSRC)/arkitektur/*.$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
- install -m 644 $(TMPSRC)/arkitektur/*_$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
+ install -m 644 $(SRCDIR)/arkitektur/*.$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
+ install -m 644 $(SRCDIR)/arkitektur/*_$$i.* $(DESTDIR)$(DESTPATH)/$$i/architecture ; \
done
#
@@ -61,11 +65,11 @@ install: build
#
#
#install -d $(DESTDIR)$(DESTPATH)/images/driftbook/ ;
- #install -m 644 $(TMPSRC)/dokumentasjon/driftbok/images/* $(DESTDIR)$(DESTPATH)/images/driftbook ;
+ #install -m 644 $(SRCDIR)/driftbok/images/* $(DESTDIR)$(DESTPATH)/images/driftbook ;
#for i in en nb de pt_BR ; do \
# install -d $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
- # install -m 644 $(TMPSRC)/dokumentasjon/driftbok/driftbok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
- # install -m 644 $(TMPSRC)/dokumentasjon/driftbok/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+ # install -m 644 $(SRCDIR)/driftbok/driftbok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
+ # install -m 644 $(SRCDIR)/driftbok/netgroups.$$i.* $(DESTDIR)$(DESTPATH)/$$i/driftbook ; \
# ln -s $(DESTPATH)/images/driftbook $(DESTDIR)$(DESTPATH)/$$i/driftbook/images ; \
#done
@@ -74,21 +78,22 @@ install: build
#
for i in en de nl ; do \
install -d $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
- install -m 644 $(TMPSRC)/dokumentasjon/IKT-bok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
+ install -m 644 $(SRCDIR)/ikt-book/IKT-bok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
done
#missing in the for loop above:
- #install -m 644 $(TMPSRC)/dokumentasjon/IKT-bok.html.$$i $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
+ #install -m 644 $(SRCDIR)/ikt-book/IKT-bok.html.$$i $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
# The nb version is without language tag
install -d $(DESTDIR)$(DESTPATH)/nb/ikt-book
for end in html pdf txt ; do \
- install -m 644 $(TMPSRC)/dokumentasjon/IKT-bok.$$end $(DESTDIR)$(DESTPATH)/nb/ikt-book ; \
+ install -m 644 $(SRCDIR)/ikt-book/IKT-bok.$$end $(DESTDIR)$(DESTPATH)/nb/ikt-book ; \
done
#
# itil
#
+ dblatex -T simple -o $(SRCDIR)/norwegian/itil-$$(date +%Y-%m-%d).pdf $(SRCDIR)/norwegian/itil-$$(date +%Y-%m-%d).xml
install -d $(DESTDIR)$(DESTPATH)/nb/itil
- $(TMPSRC)/moinmoin2pdf http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne $(DESTDIR)$(DESTPATH)/nb/itil/itil-$$(date +%Y-%m-%d).pdf
+ install -m 644 $(SRCDIR)/norwegian/itil-$$(date +%Y-%m-%d).pdf $(DESTDIR)$(DESTPATH)/nb/itil
#
# release manual
@@ -124,6 +129,7 @@ binary-indep: install
dh_testdir
dh_testroot
dh_installdocs
+ cp $(SRCDIR)/documentation/release-manual/README $(DESTDIR)/$(DESTPAST)/README.release-manual-translations
dh_installchangelogs
dh_link
dh_compress -Xrelease-manual
diff --git a/todo b/todo
index a602fee..ce02e49 100644
--- a/todo
+++ b/todo
@@ -5,13 +5,10 @@ so the plan for the docs on svn.d.n is:
- this has been discussed and agreed as a good plan at the developer gathering in June 2007 in Trondheim (mostly between Holger and Klaus, who argued that there are no documentation writers (anymore) except him)
- debian/rules
- - the get-orig-source should not checkout the source to a directory called tmp,
- $TMPSRC should also be renamed to something better
- - that source needs to be cleaned, it contains lots of unused stuff in dokumentasjon
- - document how to use that target (in debian/README)
- - ship release-manual/README in binary package
- do we really want to ship .txt files too? (just because we can...)
- - include moinmoin2pdf in this package instead of downloading it
+
+- itil
+ - document in debian/copyright where it was downloaded from, or rather, where it ends up...
- release-manual
- links in html version are broken
@@ -19,26 +16,32 @@ so the plan for the docs on svn.d.n is:
- $DEBIAN_EDU_DOC_BUILDDATE is not replaced with actual build date
- should we assign the copyright of the document and its translation to the skolelinux
foundation or whatever legal body we have, or to SPI or to the FSF?
+ - document in debian/copyright where it was downloaded from
- architecture documents
- make after svn co doesnt work
- broken umlauts in de and pt_BR
- it should be moved to http://wiki.skolelinux.no/DebianEdu/Documentation/Etch/Architecture
- but before we can do this, we need to come up with a solution to "/usr/bin/sed" the
- translated strings into the image
+ translated strings into the image. That looks easy: .dia files are just compressed xml
+ files, so we just need to sed the strings in there :)
+ - document in debian/copyright where it was downloaded from
- newdriftbook
- currently its the driftbook, not the newdriftbook
- do we want to ship the newdriftbook anyway?
- is this still the case?: make after svn co doesnt work yet
+ - document in debian/copyright where it was downloaded from
- ikt book
- - make after svn co doesnt work yet
- - html versions incomplete (and therefore not copied at all)
+ - make after svn co doesnt work yet: html versions incomplete (and therefore not copied at all)
+ - fix debian/rules (see FIXME there)
+ - document in debian/copyright where it was downloaded from
- documentation/norwegian/kurs
- thats GFDL with invariant sections, ask Knut Yrvin <knuty at skolelinux.no>, Harald Thingelstad <harald at skolelinux.no>, Klaus Ade Johnstad <klaus.johnstad at holmlia.gs.oslo.no> to relicence without invariant sections
- or split into a -nonfree package (rather not)
+ - document in debian/copyright where it was downloaded from
- remove this file :)
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