[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, squeeze, updated. 1.4_20130225_6.0.7+r1-11-g49068e3

[David Prévot]

The following commit has been merged in the squeeze branch:
commit 49068e35f3fb47fba446cbbbb37d1a1248852ad3
Merge: ad34d8676c908a2647630edba39197d42538453e 2db2b3db7a7f412574453b496c5e11abb48080d1
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 28 18:31:08 2013 -0400

    Merge branch 'master' into squeeze
    
    Conflicts:
    	debian/changelog
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
    	documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
    	documentation/debian-edu-wheezy/fixme-status.txt
    	documentation/debian-edu-wheezy/images/de/worldmap.png
    	documentation/debian-edu-wheezy/images/es/worldmap.png
    	documentation/debian-edu-wheezy/images/fr/worldmap.png
    	documentation/debian-edu-wheezy/images/worldmap.png

diff --combined debian/changelog
index a634613,f12e0fa..f52e7a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,15 +1,15 @@@
 -debian-edu-doc (1.5~20130228~7.0) unstable; urgency=low
++debian-edu-doc (1.4~20130228~6.0.7+r1) squeeze; 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 at debian.org>  Thu, 28 Feb 2013 18:25:09 -0400
+ 
 -debian-edu-doc (1.5~20130225~7.0) unstable; urgency=low
 +debian-edu-doc (1.4~20130225~6.0.7+r1) squeeze; urgency=low
  
    [ Holger Levsen ]
    * Adapt debian/mail_stats_to_list to the change to git.
@@@ -6,19 -17,38 +17,19 @@@
  
    [ David Prévot ]
    * Update manuals and images from the wiki.
 -
 -  [ Manual translation update ]
 -  * German (Wolfgang Schweer).
 -
 - -- David Prévot <taffit at 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 ]
 +  [ Squeeze manual translation updates ]
    * 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 at debian.org>  Fri, 15 Feb 2013 22:18:55 -0400
 + -- David Prévot <taffit at debian.org>  Mon, 25 Feb 2013 09:15:25 -0400
  
  debian-edu-doc (1.4~20120925~6.0.6+r0) unstable; urgency=low
  

-- 
Debian package debian-edu-doc