Control: retitle -1 unblock: debian-edu-doc/1.5~20130228~7.0 Le 16/02/2013 20:31, David Prévot a écrit : > Dear release team > > Please unblock package debian-edu-doc, the version currently in Wheezy > contains only the Squeeze-related doc, and we believe it's important to > have the Wheezy-related doc in Wheezy… > > Furthermore, the version currently in Wheezy FTBFS in Wheezy Please find attached an updated (filtered) debdiff, since we just updated the documentation to match the Debian Edu Squeeze point release. There is also an updated script (to match the move to Git) that is not used in the build system, so I filtered it too. unblock debian-edu-doc/1.5~20130228~7.0 Many thanks in advance, regards. David
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/changelog debian-edu-doc-1.5~20130228~7.0/debian/changelog
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/changelog 2012-09-25 17:17:01.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/changelog 2013-02-28 18:56:24.000000000 -0400
@@ -1,3 +1,55 @@
+debian-edu-doc (1.5~20130228~7.0) unstable; urgency=low
+
+ * Update manuals and images from the wiki.
+
+ [ Squeeze manual translation update ]
+ * French (Cédric Boutillier).
+ * Danish (Joe Hansen).
+ * Italian (Claudio Carboncini).
+
+ -- David Prévot <taffit@debian.org> Thu, 28 Feb 2013 18:25:09 -0400
+
+debian-edu-doc (1.5~20130225~7.0) unstable; urgency=low
+
+ [ Holger Levsen ]
+ * Adapt debian/mail_stats_to_list to the change to git.
+ * common/Makefile.common: remove *.po~ on clean target.
+
+ [ David Prévot ]
+ * Update manuals and images from the wiki.
+
+ [ Manual translation update ]
+ * German (Wolfgang Schweer).
+
+ -- David Prévot <taffit@debian.org> Mon, 25 Feb 2013 10:18:07 -0400
+
+debian-edu-doc (1.5~20130215~7.0) unstable; urgency=low
+
+ [ David Prévot ]
+ * Update manuals and images from the wiki.
+ * Update debian/copyright.
+ * README: mention the Danish translation among the complete ones.
+ * Update internal doc to the new Git repository, thanks to Wolfgang Schweer
+ for the review and extra comments.
+ * README: document that the latest po4a version must be used.
+ * control: Build-Depends on fonts-arphic-gbsn00lp and fonts-arphic-bsmi00lp
+ instead of transitional ttf-arphic-gbsn00lp and ttf-arphic-bsmi00lp.
+ * Add initial Wheezy manual, based on the Squeeze one.
+
+ [ Updated Squeeze manual translations ]
+ * German (Wolfgang Schweer).
+ * French (Cédric Boutillier).
+ * Italian (Claudio Carboncini).
+ * Danish (Joe Hansen).
+
+ [ Updated Wheezy manual translations ]
+ * German (Wolfgang Schweer).
+ * French (David Prévot).
+ * Danish (Joe Hansen).
+ * Italian (Francesca Ciceri).
+
+ -- David Prévot <taffit@debian.org> Fri, 15 Feb 2013 22:18:55 -0400
+
debian-edu-doc (1.4~20120925~6.0.6+r0) unstable; urgency=low
* debian/debian-edu-doc-{es,fr,it}.preinst: Remove previous images symlinks
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/control debian-edu-doc-1.5~20130228~7.0/debian/control
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/control 2012-07-05 21:00:20.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/control 2013-02-28 18:56:24.000000000 -0400
@@ -4,7 +4,7 @@
Build-Depends: debhelper (>= 5)
Build-Depends-Indep: docbook-utils, poxml, ldp-docbook-xsl, dblatex, po4a,
gsfonts, lmodern, texlive-xetex,
- ttf-arphic-gbsn00lp, ttf-arphic-bsmi00lp, ttf-wqy-zenhei,
+ fonts-arphic-gbsn00lp, fonts-arphic-bsmi00lp, ttf-wqy-zenhei,
texlive-lang-cyrillic, texlive-lang-danish, texlive-lang-spanish,
texlive-lang-french, texlive-lang-german, texlive-lang-italian,
texlive-lang-norwegian, imagemagick
@@ -14,14 +14,14 @@
David Prévot <taffit@debian.org>
Standards-Version: 3.9.3
Homepage: http://wiki.debian.org/DebianEdu/Documentation/Squeeze
-Vcs-Svn: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc/
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-edu/trunk/src/debian-edu-doc/
+Vcs-Git: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-edu/debian-edu-doc.git;a=summary
Package: debian-edu-doc-en
Depends: ${misc:Depends}
Architecture: all
Description: English documentation from the Debian Edu project
- The English version of the manual for the Squeeze based release of
+ The English version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package, as well as
the Rosegarden and Audacity manuals.
.
@@ -33,7 +33,7 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: Danish documentation from the Debian Edu project
- The Danish version of the manual for the Squeeze based release of
+ The Danish version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package.
.
Debian Edu is a Debian project to make the best distribution for educational
@@ -44,7 +44,7 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: German documentation from the Debian Edu project
- The German version of the manual for the Squeeze based release of
+ The German version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package.
.
Debian Edu is a Debian project to make the best distribution for educational
@@ -55,7 +55,7 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: Spanish documentation from the Debian Edu project
- The Spanish version of the manual for the Squeeze based release of
+ The Spanish version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package, as well as
the Rosegarden manual.
.
@@ -67,7 +67,7 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: Bokmål documentation from the Debian Edu project
- The Bokmål version of the manual for the Squeeze based release of
+ The Bokmål version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package, as well as
the Rosegarden manual.
.
@@ -79,7 +79,7 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: Italian documentation from the Debian Edu project
- The Italian version of the manual for the Squeeze based release of
+ The Italian version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package.
.
Debian Edu is a Debian project to make the best distribution for educational
@@ -90,7 +90,7 @@
Depends: debian-edu-doc-en, ${misc:Depends}
Architecture: all
Description: French documentation from the Debian Edu project
- The French version of the manual for the Squeeze based release of
+ The French version of the manual for the Squeeze and Wheezy based release of
the Debian Edu / Skolelinux project is included in this package, as well as
the Rosegarden and Audacity manuals.
.
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/copyright debian-edu-doc-1.5~20130228~7.0/debian/copyright
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/copyright 2012-06-15 11:46:21.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/copyright 2013-02-28 18:56:24.000000000 -0400
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: debian-edu-doc
-Upstream-Source: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+Upstream-Source: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
Files: documentation/rosegarden/images/*
Copyright: 2008 Alf Tonny Bätz <alfton@gmail.com>
@@ -60,7 +60,7 @@
License: GPL-2+
Files: documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml documentation/debian-edu-squeeze/debian-edu-squeeze-manual.pot
-Copyright: 2007, 2008, 2009, 2010, 2011, 2012 Holger Levsen
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Holger Levsen
2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012 Petter Reinholdtsen
2007 Daniel HeÃ?
2007 Patrick Winnertz
@@ -112,17 +112,17 @@
2009 Franziska Teichert
2009 Philipp Hübner
2009, 2010 Andreas Mundt
- 2012 Wolfgang Schweer
+ 2012, 2013 Wolfgang Schweer
License: GPL-2+
Files: documentation/debian-edu-squeeze/debian-edu-squeeze-manual.it.po
-Copyright: 2007, 2008, 2009, 2010, 2011, 2012 Claudio Carboncini
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Claudio Carboncini
License: GPL-2+
Files: documentation/debian-edu-squeeze/debian-edu-squeeze-manual.fr.po
Copyright: 2008 Christophe Masson
2010 Olivier Vitrat
- 2012 Cédric Boutillier
+ 2012, 2013 Cédric Boutillier
2012 Jean-Paul Guilloneau
2012 David Prévot
2012 Thomas Vincent
@@ -134,7 +134,85 @@
License: GPL-2+
Files: documentation/debian-edu-squeeze/debian-edu-squeeze-manual.da.po
-Copyright: 2012 Joe Hansen
+Copyright: 2012, 2013 Joe Hansen
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Holger Levsen
+ 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010, 2012 Petter Reinholdtsen
+ 2007 Daniel HeÃ?
+ 2007 Patrick Winnertz
+ 2007 Knut Yrvin
+ 2007 Ralf Gesellensetter
+ 2007 Ronny Aasen
+ 2007 Morten Werner Forsbring
+ 2007, 2008 Bjarne Nielsen
+ 2007 Nigel Barker
+ 2007 José L. Redrejo RodrÃguez
+ 2007 John Bildoy
+ 2008 Joakim Seeberg
+ 2009, 2010, 2011, 2012 Jürgen Leibner
+ 2009 Oded Naveh
+ 2009, 2010 Philipp Hübner
+ 2010 Andreas Mundt
+ 2010, 2012 Olivier Vitrat
+ 2010 Vagrant Cascadian
+ 2011 Mike Gabriel
+ 2012 Justin B Rye
+ 2012 David Prévot
+ 2012 Wolfgang Schweer
+ 2012 Bernhard Hammes
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
+Copyright: 2007 José L. Redrejo RodrÃguez
+ 2009, 2010, 2011, 2012 Rafael Rivas
+ 2010, 2012 Norman Garcia
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
+Copyright: 2007 Petter Reinholdtsen
+ 2007, 2008 HÃ¥vard Korsvoll
+ 2008 Tore Skogly
+ 2010 Ole-Anders Andreassen
+ 2010 Jan Roar Rød
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
+Copyright: 2007 Holger Levsen
+ 2007 Patrick Winnertz
+ 2007, 2009 Ralf Gesellensetter
+ 2007, 2008, 2009 Roland F. Teichert
+ 2007, 2009, 2011 Jürgen Leibner
+ 2008, 2010 Ludger Sicking
+ 2008 Kai Hatje
+ 2009 Kurt Gramlich
+ 2009 Franziska Teichert
+ 2009 Philipp Hübner
+ 2009, 2010 Andreas Mundt
+ 2012, 2013 Wolfgang Schweer
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
+Copyright: 2007, 2008, 2009, 2010, 2011, 2012, 2013 Claudio Carboncini
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
+Copyright: 2008 Christophe Masson
+ 2010 Olivier Vitrat
+ 2012, 2013 Cédric Boutillier
+ 2012 Jean-Paul Guilloneau
+ 2012 David Prévot
+ 2012 Thomas Vincent
+ 2009, 2010, 2012 the French l10n team
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.zh.po
+Copyright: 2009 Andrew Lee (æ??å?¥ç§?)
+License: GPL-2+
+
+Files: documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
+Copyright: 2012, 2013 Joe Hansen
License: GPL-2+
Files: documentation/rosegarden/rosegarden-manual.xml documentation/rosegarden/rosegarden-manual.pot
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/copyright.packaging debian-edu-doc-1.5~20130228~7.0/debian/copyright.packaging
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/copyright.packaging 2012-02-25 14:29:02.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/copyright.packaging 2013-02-15 20:51:13.000000000 -0400
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: debian-edu-doc
-Upstream-Source: svn://svn.debian.org/svn/debian-edu/trunk/src/debian-edu-doc
+Upstream-Source: git://anonscm.debian.org/debian-edu/debian-edu-doc.git
Files: documentation/rosegarden/images/*
Copyright: 2008 Alf Tonny Bätz <alfton@gmail.com>
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/README debian-edu-doc-1.5~20130228~7.0/debian/README
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/README 2012-03-21 18:06:33.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/README 2013-02-28 18:56:24.000000000 -0400
@@ -4,18 +4,19 @@
Current documentation
---------------------
-The Debian Edu Squeeze manual is developed in a wiki at
-http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ - it is based on the version
+The Debian Edu Squeeze and Wheezy manuals are developed in a wiki at
+http://wiki.debian.org/DebianEdu/Documentation/Squeeze/ and
+http://wiki.debian.org/DebianEdu/Documentation/Wheezy/ - they are based on the version
for etch - which was the first release with this kind of documentation.
Currently two versions are provided, a PDF version and a HTML version.
Please contribute!
-Besides the Debian Edu Squeeze manual this package also builds the
+Besides the Debian Edu Squeeze and Wheezy manuals, this package also builds the
Rosegarden and Audacity manuals.
-So far translations for the Debian Edu Squeeze manual have been completed for Italian,
-German and French. Uncompleted translations exist for Danish, Spanish and Bokmål.
-Please contribute! All manuals are translated with .po files. You can find more information
+So far, translations for the Debian Edu Squeeze and Wheezy manuals have been completed for Danish,
+Italian, German and French. Uncompleted translations exist for Spanish and Bokmål.
+Please contribute! All manuals are translated with PO files. You can find more information
how to contribute in /usr/share/doc/debian-edu-doc-en/README.$name-manual-translations.
@@ -55,4 +56,4 @@
Translations to nb, de, da, nl, it and pt_BR are available in Subversion.
--- Holger Levsen, holger@debian.org, last updated: 2012-03-11
+-- Holger Levsen, holger@debian.org, last updated: 2013-02-08
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/README.source debian-edu-doc-1.5~20130228~7.0/debian/README.source
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/README.source 2009-07-19 15:44:48.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/README.source 2013-02-15 20:51:13.000000000 -0400
@@ -1,16 +1,16 @@
Building an updated version of the package
------------------------------------------
-To update the release-manual and the itil document from their sources in the
-wiki, you need an internet connection and the subversion, libxml2-utils and
+To update the manuals from their source in the
+wiki, you need an Internet connection and the git, libxml2-utils and
po4a packages installed.
-(For building it, you need its build-depends installed. Translators please see
-the README.release-manual-translations.)
+(To build it, you need its build-depends installed. Translators please see
+README.$name-manual-translations.)
-Run "./debian/rules get-orig-source" to update the source to prepare building
+Run "make get-orig-source" to update the source to prepare building
and before building and uploading it to the archive.
Then just use "debuild" to build the package.
--- Holger Levsen, holger@debian.org, last updated: 2009-19-07
+-- Holger Levsen, holger@debian.org, last updated: 2013-02-08
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/debian/rules debian-edu-doc-1.5~20130228~7.0/debian/rules
--- debian-edu-doc-1.4~20120925~6.0.6+r0/debian/rules 2012-02-18 14:26:50.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/debian/rules 2013-02-28 18:56:24.000000000 -0400
@@ -42,9 +42,10 @@
dh_installdocs
dh_installdocs -A debian/README
dh_installdocs -p debian-edu-doc-en \
+ documentation/debian-edu-wheezy/README.debian-edu-wheezy-manual-translations \
documentation/debian-edu-squeeze/README.debian-edu-squeeze-manual-translations \
documentation/rosegarden/README.rosegarden-manual-translations \
- documentation/audacity/README.audacity-manual-translations
+ documentation/audacity/README.audacity-manual-translations
dh_installchangelogs
dh_link
dh_compress -X.pdf -X.html
diff -Nru --exclude documentation --exclude mail_stats_to_list debian-edu-doc-1.4~20120925~6.0.6+r0/Makefile debian-edu-doc-1.5~20130228~7.0/Makefile
--- debian-edu-doc-1.4~20120925~6.0.6+r0/Makefile 2012-03-15 18:58:04.000000000 -0400
+++ debian-edu-doc-1.5~20130228~7.0/Makefile 2013-02-28 18:56:24.000000000 -0400
@@ -5,11 +5,13 @@
get-orig-source:
$(MAKE) -C $(SRCDIR)/debian-edu-squeeze update
+ $(MAKE) -C $(SRCDIR)/debian-edu-wheezy update
$(MAKE) -C $(SRCDIR)/rosegarden update
$(MAKE) -C $(SRCDIR)/audacity update
update-copyright:
$(MAKE) -C $(SRCDIR)/debian-edu-squeeze update-copyright
+ $(MAKE) -C $(SRCDIR)/debian-edu-wheezy update-copyright
$(MAKE) -C $(SRCDIR)/rosegarden update-copyright
$(MAKE) -C $(SRCDIR)/audacity update-copyright
cat debian/copyright.packaging \
@@ -20,6 +22,7 @@
readme status build install dist-clean clean pdf::
$(MAKE) -C $(SRCDIR)/debian-edu-squeeze $@
+ $(MAKE) -C $(SRCDIR)/debian-edu-wheezy $@
$(MAKE) -C $(SRCDIR)/rosegarden $@
$(MAKE) -C $(SRCDIR)/audacity $@
Attachment:
signature.asc
Description: OpenPGP digital signature