[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, squeeze, updated. 1.5_20130215_7.0-28-gad34d86

[David Prévot]

The following commit has been merged in the squeeze branch:
commit 2b49764f423628c3531f145c084d27c774c49c68
Merge: 2e3b9452c53cda2e911e0262be3f9069d1c62670 dfbe623936bfbe7e8b6ddc705dff7f351d6b9190
Author: David Prévot <taffit at debian.org>
Date:   Mon Feb 25 09:04:30 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/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 f411092,4888902..f8d8701
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,21 +1,11 @@@
 -debian-edu-doc (1.5~20130315~7.0) UNRELEASED; urgency=low
 +debian-edu-doc (1.4~20121218~6.0.6+r1) UNRELEASED; 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.
 -
 -  [ Squeeze manual translations update ]
 -  * German (Wolfgang Schweer).
 -
 - -- David Prévot <taffit at debian.org>  Mon, 18 Feb 2013 10:21:20 -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
@@@ -9,17 -23,21 +13,17 @@@
    * 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 ]
 +  [ 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).
 +  [ Holger Levsen ]
 +  * Bump version to 6.0.6+r1. 
  
 - -- David Prévot <taffit at debian.org>  Fri, 15 Feb 2013 22:18:55 -0400
 + -- David Prévot <taffit at debian.org>  Wed, 07 Nov 2012 00:07:42 -0400
  
  debian-edu-doc (1.4~20120925~6.0.6+r0) unstable; urgency=low
  

-- 
Debian package debian-edu-doc