[debian-edu-commits] [SCM] Debian package debian-edu-doc branch, master, updated. 1.5_20130215_7.0-4-gc726699

[David Prévot]

The following commit has been merged in the master branch:
commit aadc272e6acc08fd2a11340679baa9fc25d22ba5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 17 11:34:05 2013 +0100

    common/Makefile.common: remove *.po~ on clean target. Also improve debian/mail_stats_to_list output and cleanup.

diff --git a/debian/changelog b/debian/changelog
index a23391a..60c89bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ debian-edu-doc (1.5~20130315~7.0) 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 <taffit at debian.org>  Mon, 18 Feb 2013 10:21:20 -0400
 
diff --git a/debian/mail_stats_to_list b/debian/mail_stats_to_list
index c139217..985b340 100755
--- a/debian/mail_stats_to_list
+++ b/debian/mail_stats_to_list
@@ -27,7 +27,7 @@
 #
 
 cd ~holger/debian-edu-doc
-git pull > /dev/null 2>&1 && git status
+git pull > /dev/null 2>&1 && git status 2>&1
 if [ $(echo $?) -ne 0 ] ; then
 	echo "Problem with git clone at ravel.debian.org:~holger/debian-edu-doc - please fix." | mail -s "problem with debian-edu-doc status mails" holger at layer-acht.org
 	exit 1
@@ -56,3 +56,6 @@ for i in debian-edu-squeeze debian-edu-wheezy ; do
 done
 cd ..
 
+make clean
+git reset --hard
+
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 37cd00e..99d6ff2 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -109,5 +109,6 @@ clean:
 	rm -f *.pdf images/*.pdf images/*/*.pdf
 	rm -f *.html
 	rm -f $(name).*.xml
+	rm -f *.po~
 
 dist-clean:	clean

-- 
Debian package debian-edu-doc