[SCM] morituri/master: * morituri/test/Makefile.am: Package error progress output. Fixes distcheck on slaves.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6962dd7e7e9466a295ea71481fcab1bb84cb33cf
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sat May 21 13:01:34 2011 +0000

    	* morituri/test/Makefile.am:
    	  Package error progress output.  Fixes distcheck on slaves.

diff --git a/ChangeLog b/ChangeLog
index 904025d..79e8594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-21  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/test/Makefile.am:
+	  Package error progress output.  Fixes distcheck on slaves.
+
+2011-05-21  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/test/test_program_cdparanoia.py:
 	  Update expected quality percentage.
 	  Was broken since its commit in [432].
diff --git a/morituri/test/Makefile.am b/morituri/test/Makefile.am
index 5d989f1..d9d7dde 100644
--- a/morituri/test/Makefile.am
+++ b/morituri/test/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = \
 	track-separate.cue \
 	track-single.cue \
 	cdparanoia.progress \
+	cdparanoia.progress.error \
 	cdrdao.readtoc.progress \
 	silentalarm.result.pickle \
 	track.flac

-- 
morituri packaging