[debian-edu-commits] debian-edu/debian-edu-doc.git (#81) - wheezy (branch) updated: 0.4.20070715-10-g3a461c5

Sat Oct 5 12:12:19 UTC 2013

The branch, wheezy has been updated
       via  3a461c5aec72a293e0722e3a95d2dc28f540911a (commit)
      from  90f0c0a32d1372eb3e00d7c1f0d7d5072717b1ba (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 |    5 +++--
 debian/control   |    2 +-
 debian/rules     |   18 +++++++-----------
 todo             |   19 +++++++------------
 4 files changed, 18 insertions(+), 26 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index b66819b..3dd0daf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,10 @@ debian-edu-doc (0.4.20070716) unstable; urgency=low
   * include ITIL book again, as thanks to Knut Yrvin the licence situation has
     been cleared.
   * include copyright statement for release-manual in debian/copyright
-  * added build-depends to subversion
+  * renamed the update target in debian/rules to get-orig-source as policy
+    suggests
 
- -- Holger Levsen <holger at debian.org>  Sun, 15 Jul 2007 15:01:48 +0200
+ -- Holger Levsen <holger at debian.org>  Sun, 15 Jul 2007 18:03:09 +0200
 
 debian-edu-doc (0.4.20070715) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1a5592f..ae613ae 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debian-edu-doc
 Section: doc
 Priority: optional
 Build-Depends: debhelper (>= 5) 
-Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a, subversion
+Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a
 Maintainer: Debian Edu Developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Morten Werner Olsen <werner at debian.org>, Luk Claes <luk at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>
 Standards-Version: 3.7.2
diff --git a/debian/rules b/debian/rules
index 19fbcce..30665db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,21 +8,17 @@ TMPSRC:=$(CURDIR)/documentation/tmp
 
 SVNBASE=svn://svn.skolelinux.org/skolelinux/trunk
 
-update:
-	@if test ! -f update-stamp; then \
-		svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/arkitektur $(TMPSRC)/arkitektur; \
-		svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon $(TMPSRC)/dokumentasjon; \
-			wget http://developer.skolelinux.no/itil/moinmoin2pdf -O $(TMPSRC)/moinmoin2pdf; \
-		chmod +x $(TMPSRC)/moinmoin2pdf; \
-		$(MAKE) -C documentation/release-manual update; \
-	fi
-	touch update-stamp
+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
+	$(MAKE) -C documentation/release-manual update
 
 dist-clean: clean
 	rm $(TMPSRC) -Rf
-	rm -f update-stamp
 
 clean:
 	$(MAKE) -C documentation/release-manual clean
@@ -30,7 +26,7 @@ clean:
 	rm -rf $(DESTDIR)
 	dh_clean
 
-build:	build-stamp update
+build:	build-stamp 
 
 build-stamp:
 	touch build-stamp
diff --git a/todo b/todo
index 5ab2681..a602fee 100644
--- a/todo
+++ b/todo
@@ -5,15 +5,13 @@ 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
-	- rename/split the update target to checkout or init?
-		- the update target is fundamentally broken: it's not a good idea to include 
-		  debian-edu-doc/documentation/tmp in the orig.tar.gz... to avoid this, you
-		  need to run "./debian/rules dist-clean" which makes the idea of the update 
-		  target quite obsolete...
-		- btw, file:///usr/share/doc/debian-policy/policy.html/ch-source.html#s-debianrules 
-		  suggests get-orig-source
-	- document how to use those targets (in debian/README)
+	- 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
 
 - release-manual
 	- links in html version are broken
@@ -38,12 +36,9 @@ so the plan for the docs on svn.d.n is:
 	- make after svn co doesnt work yet
 	- html versions incomplete (and therefore not copied at all)
 
-- itil
-	- include moinmoin2pdf in this package instead of downloading it
-
 - 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 
+	- or split into a -nonfree package (rather not)
 
 - 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).


