[debian-edu-commits] debian-edu/debian-edu-doc.git (#118) - wheezy (branch) updated: 0.5.20070720-10-gfef9f07

[David Prévot]

The branch, wheezy has been updated
       via  fef9f0739696ae434a11b02b4a7a6e6b18850b2e (commit)
      from  3da63efbe6c5b79073d56638c84f90809c4c5d47 (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/changelog |    3 ++-
 debian/copyright |    2 +-
 debian/rules     |   16 ++++++++--------
 todo             |    3 +--
 4 files changed, 12 insertions(+), 12 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 96db7eb..126f66e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ debian-edu-doc (0.6.20070721) unstable; urgency=low
   * bump version number
   * debian/rules: improved dist-clean target
   * debian/rules: more cleanup
+  * use ikt as directory instead of ikt-book to be consistent with itil 
 
- -- Holger Levsen <holger at debian.org>  Sat, 21 Jul 2007 14:57:35 +0200
+ -- Holger Levsen <holger at debian.org>  Sat, 21 Jul 2007 15:51:36 +0200
 
 debian-edu-doc (0.5.20070720) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 1d8813e..a8c2908 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -114,7 +114,7 @@ found in the file '/usr/share/common-licenses/GPL'.
 
 ----------------------------------------------------------------------------
 
-The files in /usr/share/doc/debian-edu-doc/$lang/ikt-book/ where downloaded from 
+The files in /usr/share/doc/debian-edu-doc/$lang/ikt/ where downloaded from 
 svn://svn.skolelinux.org/skolelinux/trunk/www/developer.skolelinux.no/dokumentasjon
 and are Copyright 2002, 2003 Vibeke Braaten, Christian Juell, Tor Harald Nordnes
 and Truls Teigen. Permission is granted to copy, distribute and/or modify
diff --git a/debian/rules b/debian/rules
index 030409b..0e290ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ get-orig-source:
 	# FIXME: checking everything out and then deleting 98% is not the best approach
 	# 	 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-book ! -name "IKT*" ! -name Makefile -exec rm -Rf \{\} \;
+	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
+	-find $(SRCDIR)/ikt ! -name ikt ! -name "IKT*" ! -name Makefile -exec rm -Rf \{\} \;
 	GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook"   | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
 	$(MAKE) -C documentation/release-manual update
 	# clean sources
@@ -23,7 +23,7 @@ get-orig-source:
 
 dist-clean: clean
 	rm $(SRCDIR)/arkitektur -Rf
-	rm $(SRCDIR)/ikt-book -Rf
+	rm $(SRCDIR)/ikt -Rf
 	rm $(SRCDIR)/norwegian/itil.pdf -f
 
 clean:
@@ -61,15 +61,15 @@ install: build
 	# IKT bok
 	#
 	for i in en de nl ; do \
-		install -d $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
-		install -m 644 $(SRCDIR)/ikt-book/IKT-bok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
+		install -d $(DESTDIR)$(DESTPATH)/$$i/ikt ; \
+		install -m 644 $(SRCDIR)/ikt/IKT-bok.$$i.* $(DESTDIR)$(DESTPATH)/$$i/ikt ; \
 	done
 		#missing in the for loop above:
-		#install -m 644 $(SRCDIR)/ikt-book/IKT-bok.html.$$i $(DESTDIR)$(DESTPATH)/$$i/ikt-book ; \
+		#install -m 644 $(SRCDIR)/ikt/IKT-bok.html.$$i $(DESTDIR)$(DESTPATH)/$$i/ikt ; \
 	# The nb version is without language tag
-	install -d $(DESTDIR)$(DESTPATH)/nb/ikt-book
+	install -d $(DESTDIR)$(DESTPATH)/nb/ikt
 	for end in html pdf txt ; do \
-		install -m 644 $(SRCDIR)/ikt-book/IKT-bok.$$end $(DESTDIR)$(DESTPATH)/nb/ikt-book ; \
+		install -m 644 $(SRCDIR)/ikt/IKT-bok.$$end $(DESTDIR)$(DESTPATH)/nb/ikt ; \
 	done
 
 	#
diff --git a/todo b/todo
index 19c645b..337ff1a 100644
--- a/todo
+++ b/todo
@@ -9,7 +9,6 @@ Entries marked with (*) should be fixed before the r0 release, it would be nice
 
 - itil
 	- also build html (and .txt) versions?
-*	- rename the dir to itil-book? or itk-book to itk? and both in CAPITAL letters?
 	- use the same scripts for building as the release manual
 
 - release-manual
@@ -31,7 +30,7 @@ Entries marked with (*) should be fixed before the r0 release, it would be nice
 	  files, so we just need to sed the strings in there :)
 
 - 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 (check if the latter is still true)
 	- fix debian/rules (see FIXME there)
 
 - documentation/norwegian/kurs


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).