#
#
# patch "Makefile.am"
#  from [b71cdc747db78679b1e0ce9f22403b65b4c78619]
#    to [4bd4212a2e021abffa9f0151375e47988fd0c7ce]
# 
# patch "debian/changelog"
#  from [b4c21564bc2a25ed785836d9984c54cd6943d7f3]
#    to [0bb40040c673eb8e70d731f4fd2902c896747e47]
#
============================================================
--- Makefile.am	b71cdc747db78679b1e0ce9f22403b65b4c78619
+++ Makefile.am	4bd4212a2e021abffa9f0151375e47988fd0c7ce
@@ -608,16 +608,17 @@ check-local: tester_tests.status unit_te
 	if test "$$failed" = 0 && test "$$error" = 0; then		       \
 	  exit=0;							       \
 	  report="";							       \
-	  banner="All $$all tests passed";				       \
+	  banner="All $$all test suites passed";			       \
 	else								       \
 	  exit=1;							       \
 	  report="Please report to $(PACKAGE_BUGREPORT)";		       \
 	  if test "$$error" = 0; then					       \
-	    banner="$$failed of $$all tests failed";			       \
+	    banner="$$failed of $$all test suites failed";		       \
 	  elif test "$$failed" = 0; then				       \
-	    banner="$$error of $$all tests malfunctioned";		       \
+	    banner="$$error of $$all test suites malfunctioned";	       \
 	  else								       \
-	    banner="$$failed of $$all tests failed and $$error malfunctioned"; \
+	    banner="$$failed of $$all test suites failed"		       \
+	    banner="$$banner and $$error malfunctioned";		       \
 	  fi;								       \
 	fi;								       \
 	rl=`echo $$report | wc -c`;					       \
@@ -657,11 +658,10 @@ mostlyclean-local:
 .PRECIOUS: run_tester_tests run_unit_tests run_lua_tests
 
 mostlyclean-local:
-	rm -rf tester_dir unit-tests package_full_revision.txt
+	rm -rf tester_dir unit-tests html
 
 DISTCLEANFILES = mt-stdint.h xgettext.opts pch-build.hh.gch.dep	\
 	run_tester_tests run_unit_tests run_lua_tests		\
-	report_tester_tests report_unit_tests report_lua_tests	\
 	tester_tests.status unit_tests.status lua_tests.status
 
 # distcheck stuff
@@ -689,9 +689,12 @@ $(srcdir)/package.m4: $(top_srcdir)/conf
 # that need to be generated early on 'make all'; this is _not_ true of
 # generated source files, but it is true for the PCH if used.
 
+# package_revision.txt and package_full_revision_dist.txt are shipped
+# in the distribution, so don't delete them here
 CLEAN_SOURCES = std_hooks.c testlib.c schema.c \
-	package_revision.c package_full_revision.txt \
-	package_full_revision_raw.txt package_full_revision.c
+	package_revision.c package_full_revision.c \
+	package_revision_raw.txt \
+	package_full_revision.txt package_full_revision_raw.txt 
 
 BUILT_SOURCES = $(PCH_FILE) $(PCH_BUILD)
 
============================================================
--- debian/changelog	b4c21564bc2a25ed785836d9984c54cd6943d7f3
+++ debian/changelog	0bb40040c673eb8e70d731f4fd2902c896747e47
@@ -1,3 +1,11 @@
+monotone (0.40-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Upstream "make distclean" now cleans up after "make html".
+      (Closes: #473402)
+
+ -- Zack Weinberg <address@hidden>  Mon, 31 Mar 2008 20:47:30 -0400
+
 monotone (0.39-90) unstable; urgency=low
 
   * monotone-server.postinst: update the trigger version for a db migrate,
@@ -5,19 +13,34 @@ monotone (0.39-90) unstable; urgency=low
 
  -- Richard Levitte <address@hidden>  Mon, 31 Mar 2008 14:05:43 +0200
 
+monotone (0.39-2) unstable; urgency=low
+
+  * Build-dependency on patch (not dpatch) restored; it was accidentally
+    removed in 0.39-1 along with dpatch.  The test suite uses it.
+  * Various vestiges of dpatch use removed from debian/rules.
+
+ -- Zack Weinberg <address@hidden>  Mon, 31 Mar 2008 20:47:30 -0400
+
 monotone (0.39-1) unstable; urgency=low
 
   [ Zack Weinberg ]
-  * New upstream release.
+  * New upstream release.  Closes: #473252.
     - Can now be built with gcc 4.3 snapshots.  (Closes: #455646)
   * Enable use of system libpcre, set appropriate Build-Depends.
 
+  [ Richard Levitte ]
+  * The patch to disable the SIGPIPE test isn't needed any more.
+  * Build-dependency on dpatch dropped again, as it is unused.
+
  -- Richard Levitte <address@hidden>  Mon, 25 Feb 2008 10:55:36 -0500
 
 monotone (0.38-1) unstable; urgency=low
 
   [ Richard Levitte ]
   * New upstream release.
+  * The log_quits_on_SIGPIPE test malfunctions on Linux.  Add a temporary
+    patch disabling it on Debian, giving upstream a chance to fix the
+    problem while being able to build the Debian package without trouble.
 
   [ Zack Weinberg ]
   * monotone-server.postrm: Delete default.mtn~ on purge.
@@ -25,6 +48,9 @@ monotone (0.38-1) unstable; urgency=low
   * Add Homepage: and Vcs-Browser: fields to debian/control.
   * Standards-Version: 3.7.3 (no changes required).
 
+  [Ludovic Brenta]
+  * Build-depend on dpatch.
+
  -- Richard Levitte <address@hidden>  Wed, 12 Dec 2007 20:52:32 +0100
 
 monotone (0.37-4) unstable; urgency=low