#
#
# patch "debian/changelog"
#  from [6170c77c0102fb31112ad345d6ed782a8a77fc36]
#    to [48e3822599249be6d30ae91bf6a97431ff5f5502]
# 
# patch "debian/control"
#  from [5bf605bb6bd33c0b7a92302d6c0f54303ce7e742]
#    to [62318b78abab9543f3cbc183c190230e499bb5f9]
# 
# patch "debian/rules"
#  from [0e91278af8d26745788f97c1839a131a1fe334f8]
#    to [0bd97c7aaece3021a5522460346ad25a8abc8bb4]
#
============================================================
--- debian/changelog	6170c77c0102fb31112ad345d6ed782a8a77fc36
+++ debian/changelog	48e3822599249be6d30ae91bf6a97431ff5f5502
@@ -1,3 +1,11 @@
+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 ]
@@ -5,6 +13,10 @@ monotone (0.39-1) unstable; urgency=low
     - 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
============================================================
--- debian/control	5bf605bb6bd33c0b7a92302d6c0f54303ce7e742
+++ debian/control	62318b78abab9543f3cbc183c190230e499bb5f9
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.2.0), aut
 Homepage: http://monotone.ca/
 Vcs-Browser: http://viewmtn.angrygoats.net/branch/changes/net.venge.monotone
 Build-Depends: debhelper (>= 4.2.0), autotools-dev, libz-dev, po-debconf,
- libboost-dev (>= 1.34.1-2), libpcre3-dev (>= 7.6)
+ libboost-dev (>= 1.34.1-2), libpcre3-dev (>= 7.6), patch
 Build-Depends-Indep: ps2eps, texlive-base, texlive-generic-recommended,
  texlive-latex-base, texinfo, xpdf-utils
 Standards-Version: 3.7.3
============================================================
--- debian/rules	0e91278af8d26745788f97c1839a131a1fe334f8
+++ debian/rules	0bd97c7aaece3021a5522460346ad25a8abc8bb4
@@ -44,8 +44,6 @@ CFLAGS ?= $(DEFAULT_CFLAGS)
 
 CFLAGS ?= $(DEFAULT_CFLAGS)
 
-#include /usr/share/dpatch/dpatch.make
-
 # put this up top so it's the default rule.
 #
 # Policy (section 4.9) says that build should depend on build-indep.
@@ -101,8 +99,7 @@ build-indep-stamp: config.status
 	make -j$(CPUS) info html monotone.pdf
 	touch $@
 
-clean: clean1
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean