[debian-edu-commits] debian-edu/debian-edu-doc.git (#435) - wheezy (branch) updated: 1.1_20080706-6-g0990f26

[David Prévot]

The branch, wheezy has been updated
       via  0990f262359e473494865af58c242d288230974e (commit)
      from  25f35bd53b61151a8ed685d3bc5eac9bc70107a7 (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                                                      |    6 ++++++
 debian/changelog                                              |    9 ++++++---
 debian/copyright                                              |    6 ++++++
 debian/rules                                                  |    3 ++-
 documentation/rosegarden/Makefile                             |    2 +-
 .../release-manual.xsl => rosegarden/rosegarden-manual.xsl}   |    0
 todo                                                          |    5 ++++-
 7 files changed, 25 insertions(+), 6 deletions(-)
 copy documentation/{release-manual/release-manual.xsl => rosegarden/rosegarden-manual.xsl} (100%)

The diff of changes is:
diff --git a/Makefile b/Makefile
index fbc2668..abee041 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,30 @@ all: build
 
 get-orig-source:
 	$(MAKE) -C $(SRCDIR)/release-manual update
+	$(MAKE) -C $(SRCDIR)/rosegarden update
 	$(MAKE) -C $(SRCDIR)/norwegian update
 
 status:
 	$(MAKE) -C $(SRCDIR)/release-manual status
+	$(MAKE) -C $(SRCDIR)/rosegarden status
 	# the itil document has not been translated yet.
 
 build:
 	$(MAKE) -C $(SRCDIR)/release-manual build
+	$(MAKE) -C $(SRCDIR)/rosegarden build
 	$(MAKE) -C $(SRCDIR)/norwegian build
 
 install:
 	$(MAKE) -C $(SRCDIR)/release-manual install
+	$(MAKE) -C $(SRCDIR)/rosegarden install
 	$(MAKE) -C $(SRCDIR)/norwegian install
 
 dist-clean: clean
 	$(MAKE) -C $(SRCDIR)/release-manual dist-clean
+	$(MAKE) -C $(SRCDIR)/rosegarden dist-clean
 	$(MAKE) -C $(SRCDIR)/norwegian dist-clean
 
 clean:
 	$(MAKE) -C $(SRCDIR)/release-manual clean
+	$(MAKE) -C $(SRCDIR)/rosegarden clean
 	$(MAKE) -C $(SRCDIR)/norwegian clean
diff --git a/debian/changelog b/debian/changelog
index 28091bc..a249ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-debian-edu-doc (1.2~20080710) unstable; urgency=low
+debian-edu-doc (1.2~20080712) unstable; urgency=low
 
   * Add rosegarden manual by Alf Tonny Bätz.
-
- -- Holger Levsen <holger at debian.org>  Thu, 10 Jul 2008 01:15:08 +0200
+  * release-manual:
+    - update .xml source from the wiki.
+    - update Italian translation thanks to Claudio Carboncini.
+ 
+ -- Holger Levsen <holger at debian.org>  Sat, 12 Jul 2008 15:41:23 +0200
 
 debian-edu-doc (1.1~20080706) terra; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 60cba26..c63b9d7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,6 +10,8 @@ found in the file '/usr/share/common-licenses/GPL'.
 
 ----------------------------------------------------------------------------
 
+FIXME
+
 The files in /usr/share/doc/debian-edu-doc/en/release-manual/ are Copyright
 2007 by Holger Levsen (holger at debian.org), Petter Reinholdtsen, Daniel Heß, 
 Patrick Winnertz, Knut Yrvin, Ralf Gesellensetter, Ronny Aasen, Morten Werner 
@@ -35,6 +37,10 @@ Copyright 2007 by Holger Levsen, Patrick Winnertz, Ralf Gesellensetter, Roland
 F. Teichert, Jürgen Leibner, Ludger Sicking and Kai Hatje and is licenced under
 the GNU Public Licence version 2 or, at your option, any later version.
 
+The translated version in /usr/share/doc/debian-edu-doc/fr/release-manual/ is 
+Copyright 2008 by Christophe Masson and is licenced under the GNU Public 
+Licence version 2 or, at your option, any later version.
+
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
diff --git a/debian/rules b/debian/rules
index 5871119..8a2ba02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	#
-	# build ITIL book and release-manual
+	# build ITIL book, release-manual and rosegarden-manual
 	#
 	$(MAKE) install DESTDIR="$(DESTDIR)"
 
@@ -40,6 +40,7 @@ binary-indep: install
 	dh_testroot
 	dh_installdocs 
 	dh_installdocs -A documentation/release-manual/README.release-manual-translations debian/README
+	# FIXME: add README.rosegarden-manual-translations too
 	dh_installchangelogs
 	dh_link
 	dh_compress -X.pdf -X.html
diff --git a/documentation/rosegarden/Makefile b/documentation/rosegarden/Makefile
index 5612d40..d3402fe 100644
--- a/documentation/rosegarden/Makefile
+++ b/documentation/rosegarden/Makefile
@@ -5,7 +5,7 @@ LANGUAGES = `find . -name "rosegarden-manual.*.po" | sed -e "s/.\/rosegarden-man
 all: build
 
 update:
-	./get_rosegarden
+	./get_rosegarden-manual
 	./update_translations
 
 status:
diff --git a/documentation/release-manual/release-manual.xsl b/documentation/rosegarden/rosegarden-manual.xsl
similarity index 100%
copy from documentation/release-manual/release-manual.xsl
copy to documentation/rosegarden/rosegarden-manual.xsl
diff --git a/todo b/todo
index 4cb64cb..f67bbbe 100644
--- a/todo
+++ b/todo
@@ -18,5 +18,8 @@ This will not be fixed for r1, but should be fixed for r2/lenny:
 	  foundation or whatever legal body we have, or to SPI or to the FSF?
 - other docs:
 	- svn://svn.skolelinux.org/repos/skolelinux/trunk/www/developer.skolelinux.no/artikler/skolelinux-do-ocracy.txt might also be interesting
-
+- update debian/copyright to new proposed format, include .fr translation and rosegarden manual
+- add copyright, gpl and translation pages to the rosegarden manual
+- add rosegarden to descriptions in debian/control
+- dont ship a 0 byte rosegarden-manual.nb.html...
 - 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).