[debian-edu-commits] debian-edu/debian-edu-doc.git (#1445) - master (branch) updated: 1.5_20130215_7.0-4-gc726699

[David Prévot]

The branch, master has been updated
       via  c7266993f5cca978c7b94cd21ac28ab5cb697dc3 (commit)
       via  aadc272e6acc08fd2a11340679baa9fc25d22ba5 (commit)
       via  aebd49fb4eb5ef22d823acd531b9e0525c8fc7a5 (commit)
       via  2295ca9d9820ac8ad865e4e0566d56872fb72e89 (commit)
      from  c1072675826c336cebe7be91cd18e9a4ecf38d89 (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 -----------------------------------------------------------------
commit c7266993f5cca978c7b94cd21ac28ab5cb697dc3
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 17 17:25:13 2013 +0100

    mail_stats_to_list: don't run 'make update'

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.

commit aebd49fb4eb5ef22d823acd531b9e0525c8fc7a5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 17 11:04:14 2013 +0100

    debian/mail_stats_to_list: do stats for wheezy too

commit 2295ca9d9820ac8ad865e4e0566d56872fb72e89
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Feb 17 11:00:12 2013 +0100

    Adapt debian/mail_stats_to_list to the change to git.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                     |    8 ++++++++
 debian/mail_stats_to_list            |   15 +++++++++------
 documentation/common/Makefile.common |    1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c8340bf..60c89bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
+
 debian-edu-doc (1.5~20130215~7.0) unstable; urgency=low
 
   [ David Prévot ]
diff --git a/debian/mail_stats_to_list b/debian/mail_stats_to_list
index ec806c1..4277ea3 100755
--- a/debian/mail_stats_to_list
+++ b/debian/mail_stats_to_list
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009,2010 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009,2010,2013 Holger Levsen (holger at layer-acht.org)
 # 
 # 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
@@ -27,9 +27,9 @@
 #
 
 cd ~holger/debian-edu-doc
-svn up > /dev/null 2>&1 && svn status 
+git pull > /dev/null 2>&1 && git status 2>&1
 if [ $(echo $?) -ne 0 ] ; then
-	echo "Problem with svn checkout at ravel.debian.org:~holger/debian-edu-doc - please fix." | mail -s "problem with debian-edu-doc status mails" holger at layer-acht.org
+	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
 fi
 
@@ -37,8 +37,8 @@ fi
 # loop through manuals
 #
 cd documentation
-# actually only send mails about debian-edu-squeeze - you can add more directories to the loop here
-for i in debian-edu-squeeze ; do
+# actually only send mails about debian-edu-squeeze and debian-edu-wheezy - you can add more directories to the loop here
+for i in debian-edu-squeeze debian-edu-wheezy ; do
 	if [ "$i" != scripts ] && [ "$i" != norwegian ] && [ $(ls $i/$i-manual.*.po > /dev/null 2>&1 ; echo $?) -eq 0 ] && [ "$i" != debian-edu-etch ] ; then 
 		cd $i 
 		TMPFILE=$(mktemp)
@@ -47,7 +47,7 @@ for i in debian-edu-squeeze ; do
 		echo "To understand this mail better, please read /usr/share/doc/debian-edu-doc/README." >> $TMPFILE
 		echo "This mail is automatically send by a cronjob run by Holger Levsen every two weeks. Please send feedback, suggestions, flames and cookies via this list." >> $TMPFILE
 		echo >> $TMPFILE
-		make update > /dev/null 2>&1 
+		#make update > /dev/null 2>&1 
 		make status >> $TMPFILE 2>&1 
 		cat $TMPFILE | mail -s "Content and translation status for the $i manual" debian-edu at lists.debian.org
 		rm $TMPFILE
@@ -56,3 +56,6 @@ for i in debian-edu-squeeze ; 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


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).