[debian-edu-commits] debian-edu/debian-edu-doc.git (#237) - wheezy (branch) updated: 0.7.20071028-23-g7f7d6cc

[David Prévot]

The branch, wheezy has been updated
       via  7f7d6cca7cddb507f20a2f104aab32c1bbd8da7c (commit)
      from  a4eef3c7eace5324c122ab19beddaaf0557d25a9 (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:
 Makefile         |   41 +++++++++++++++++++++++++++++++++++++++++
 debian/changelog |   13 +++++++++++++
 debian/rules     |   25 +++++++------------------
 3 files changed, 61 insertions(+), 18 deletions(-)
 create mode 100644 Makefile

The diff of changes is:
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..13d3624
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,41 @@
+SRCDIR  := $(CURDIR)/documentation
+
+DESTDIR =
+DESTPATH = /usr/share/doc/debian-edu-doc
+
+all: $(SRCDIR)/norwegian/itil.pdf
+#
+# Build release manual
+#
+	$(MAKE) -C $(SRCDIR)/release-manual
+
+get-orig-source:
+	# update release-manual
+	$(MAKE) -C documentation/release-manual update
+# get itil document
+	GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook"   | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
+
+$(SRCDIR)/norwegian/itil.pdf: $(SRCDIR)/norwegian/itil.xml
+#
+# Build ITIL book
+#
+	dblatex -T simple -o $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.xml
+install:
+#
+# Install ITIL book
+#
+	install -d $(DESTDIR)$(DESTPATH)/nb/itil
+	install -m 644 $(SRCDIR)/norwegian/itil.pdf $(DESTDIR)$(DESTPATH)/nb/itil 
+
+#
+# Install release manual
+#
+	$(MAKE) -C $(SRCDIR)/release-manual install DESTDIR="$(DESTDIR)"
+
+
+
+dist-clean: clean
+	rm $(SRCDIR)/norwegian/itil.pdf -f
+
+clean:
+	$(MAKE) -C documentation/release-manual clean
diff --git a/debian/changelog b/debian/changelog
index ac5115c..a4b98e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+debian-edu-doc (0.7.20071032) unstable; urgency=low
+
+  * UNRELEASED
+
+  [ Holger Levsen ]
+  * Updated ITIL book source from the wiki.
+
+  [ Petter Reinholdtsen ]
+  * Rewrite build system, introduce a toplevel makefile.  Move release
+    manual and ITIL document rules to this makefile.
+
+ -- Holger Levsen <holger at debian.org>  Sun,  4 Nov 2007 14:01:12 +0100
+
 debian-edu-doc (0.7.20071031) unstable; urgency=low
 
   [Holger Levsen]
diff --git a/debian/rules b/debian/rules
index 1adf550..53562fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,8 @@ get-orig-source:
 	# checkout IKT book and related files
 	[ -d $(SRCDIR)/ikt/.svn ] || svn co -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon/ikt $(SRCDIR)/ikt
 	svn up -r $(REVISION) $(SVNBASE)/www/developer.skolelinux.no/dokumentasjon/ikt $(SRCDIR)/ikt
-	# get itil document
-	GET "http://wiki.skolelinux.no/Dokumentasjon/ITIL/AllInOne?action=format&mimetype=xml/docbook"   | sed "s%</%\n</%g" > $(SRCDIR)/norwegian/itil.xml
-	# update release-manual
-	$(MAKE) -C documentation/release-manual update
+	# Use makefile
+	$(MAKE) get-orig-source
 	# clean sources
 	find $(SRCDIR) -name "*.eps" -exec rm \{\} \;
 	find $(SRCDIR) -name "*.ps"  -exec rm \{\} \;
@@ -32,15 +30,16 @@ dist-clean: clean
 	rm $(SRCDIR)/arkitektur -Rf
 	rm $(SRCDIR)/kurs -Rf
 	rm $(SRCDIR)/ikt -Rf
-	rm $(SRCDIR)/norwegian/itil.pdf -f
+	$(MAKE) dist-clean
 
 clean:
-	$(MAKE) -C documentation/release-manual clean
+	$(MAKE) clean
 	rm -f build-stamp
 	rm -rf $(DESTDIR)
 	dh_clean
 
-build:	build-stamp 
+build:	build-stamp
+	$(MAKE)
 
 build-stamp:
 	touch build-stamp
@@ -83,17 +82,7 @@ install: build
 		install -m 644 $(SRCDIR)/ikt/ldap_admin.$$end $(DESTDIR)$(DESTPATH)/nb/ikt ; \
 	done
 
-	#
-	# itil
-	#
-	dblatex -T simple -o $(SRCDIR)/norwegian/itil.pdf $(SRCDIR)/norwegian/itil.xml
-	install -d $(DESTDIR)$(DESTPATH)/nb/itil
-	install -m 644 $(SRCDIR)/norwegian/itil.pdf $(DESTDIR)$(DESTPATH)/nb/itil 
-
-	#
-	# release manual
-	#
-	$(MAKE) -C $(SRCDIR)/release-manual install DESTDIR=$(DESTDIR)
+	$(MAKE) install DESTDIR="$(DESTDIR)"
 
 	#
 	# 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).