[debian-edu-commits] debian-edu/debian-edu-doc.git (#166) - wheezy (branch) updated: 0.6.20070721-40-g298ecd8

[David Prévot]

The branch, wheezy has been updated
       via  298ecd86ecf446d754839e1954896604306dc5eb (commit)
      from  ff32aa7707b72a4a055f1902e3a510fa32621623 (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 |    6 ++++--
 debian/rules     |   11 +++++++----
 todo             |    1 -
 3 files changed, 11 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 964354c..c4ef81e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,11 @@ debian-edu-doc (0.6.20070722) unstable; urgency=low
 
   [ Holger Levsen ]
   * small cleanups to get_images.pl and it's usage
-  * renamed get_images.pl to get_images 
+  * renamed get_images.pl to get_images
+  * debian/rules: make get-orig-source target idempotent (which means: you can
+    run it more than once)
 
- -- Holger Levsen <holger at debian.org>  Sun, 29 Jul 2007 16:06:08 +0200
+ -- Holger Levsen <holger at debian.org>  Sun, 29 Jul 2007 17:40:16 +0200
 
 debian-edu-doc (0.6.20070721) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 609db4e..f6486a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,18 @@ REVISION = "{2007-07-21}"
 SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 
 get-orig-source:
-	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur 
-	svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/kurs $(SRCDIR)/kurs
+	[ -d $(SRCDIR)/arkitektur/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur 
+	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(SRCDIR)/arkitektur 
+	[ -d $(SRCDIR)/kurs/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/kurs $(SRCDIR)/kurs
+	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/kurs $(SRCDIR)/kurs
 	# FIXME: delete this in svn...
 	rm $(SRCDIR)/kurs/appsBilder/ $(SRCDIR)/kurs/dosSkjermBilder/ $(SRCDIR)/kurs/kde/ $(SRCDIR)/kurs/webmin/ $(SRCDIR)/kurs/wineSkjermBilder/ -Rf
 	# 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
-	-find $(SRCDIR)/ikt ! -name ikt ! -name "IKT*" ! -name Makefile -exec rm -Rf \{\} \;
+	[ -d $(SRCDIR)/ikt/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
+	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(SRCDIR)/ikt
+	-find $(SRCDIR)/ikt ! -name ikt ! -name "IKT*" ! -name Makefile ! -regex $(SRCDIR)/ikt/.svn.* -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
diff --git a/todo b/todo
index 9fd28e7..6c39c01 100644
--- a/todo
+++ b/todo
@@ -5,7 +5,6 @@ It would be nice to release r1 without this file :)
 
 - debian/rules
 	- we could ship .txt files as well - do we want that?
-	- get-orig-source is not update capable, fix that
 
 - itil
 	- also build html (and .txt) versions?


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