[debian-edu-commits] debian-edu/debian-edu-doc.git (#264) - wheezy (branch) updated: 0.7.20071108-19-g601023f

[David Prévot]

The branch, wheezy has been updated
       via  601023f408e1db8a1a5ed8a03f14da9e7feca605 (commit)
      from  3089d69606d3887edb34d05625c0bad12dc5437b (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                      |    8 +++++---
 documentation/release-manual/Makefile |   18 +++++++++++++++---
 todo                                  |    2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e0df1aa..26da58b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-doc (0.7.20071113) unstable; urgency=low
+debian-edu-doc (0.8.20071114) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
   * UNRELEASED.
@@ -8,9 +8,11 @@ debian-edu-doc (0.7.20071113) unstable; urgency=low
 
   [ Holger Levsen ]
   * Updated release manual source from the wiki.
-  * release-manual/images: prepare images per language
+  * release-manual/images/: prepare images per language
+  * release-manual/Makefile: install localized images if they exist, otherwise
+    link to the english images
 
- -- Holger Levsen <holger at debian.org>  Tue, 13 Nov 2007 17:44:50 +0100
+ -- Holger Levsen <holger at debian.org>  Wed, 14 Nov 2007 01:51:46 +0100
 
 debian-edu-doc (0.7.20071108) unstable; urgency=low
 
diff --git a/documentation/release-manual/Makefile b/documentation/release-manual/Makefile
index d4ab883..ad4dfee 100644
--- a/documentation/release-manual/Makefile
+++ b/documentation/release-manual/Makefile
@@ -42,10 +42,22 @@ install: build
 			cp release-manual.$$f.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
 			cp release-manual.$$f.html $(DESTDIR)$(DESTPATH)/$$f/release-manual.html ; \
 			if [ "$$f" == "en" ] ; then \
-			  cp -ax images $(DESTDIR)$(DESTPATH)/$$f/ ; \
-			  find $(DESTDIR)$(DESTPATH)/$$f/images/ -name .svn -exec rm -Rf \{\} \; ; \
+			  mkdir $(DESTDIR)$(DESTPATH)/$$f/images/ ; \
+			  find images -type f -maxdepth 1 -exec cp \{\} $(DESTDIR)$(DESTPATH)/$$f/images/ \; ; \
 			else \
-			  ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
+			  if [ -d images/$$f ] ; then \
+			  	mkdir $(DESTDIR)$(DESTPATH)/$$f/images ; \
+			  	cd images ; \
+			  	for i in *.* ; do \
+					if [ -e $$f/$$i ] ; then \
+						cp -v $$f/$$i $(DESTDIR)$(DESTPATH)/$$f/images/ ; \
+					else \
+						ln -sf ../en/images/$$i $(DESTDIR)$(DESTPATH)/$$f/images/$$i ; \
+					fi ; done ; \
+			  	cd .. ; \
+			  else \
+			    ln -sf ../en/images $(DESTDIR)$(DESTPATH)/$$f/images ; \
+			  fi ; \
 			fi ; \
 		else \
 			ln -s ../en/release-manual.pdf $(DESTDIR)$(DESTPATH)/$$f/release-manual.pdf ; \
diff --git a/todo b/todo
index 0d5d793..0ad4b34 100644
--- a/todo
+++ b/todo
@@ -12,7 +12,7 @@ This should be fixed for r1:
 
 - release-manual
 	- links in html version are broken
-	- localize images. currently we only have english images. we need to use sed magic and images in svn to fix this.
+	- localize images for the pdf version too
 	- 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?
 	


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