#
#
# patch "debian/changelog"
#  from [02c2c68e550e694ca609a15a26ac3cb50d8361fa]
#    to [811387507e1131cf301ca00a6bf369839b2c0ff0]
# 
# patch "debian/control"
#  from [3eb1d7b1893528e9a542069d00f66c79bf37ddca]
#    to [f4612c94bff8260e95c61b64f142d08cba97ef0e]
# 
# patch "tests/invalid_--root_settings/__driver__.lua"
#  from [26934fdd5e8c6fe71b0e8ff17750e64ee58304dc]
#    to [c346aad2f308183234c8a46e50ef5190cbcbdee9]
#
============================================================
--- debian/changelog	02c2c68e550e694ca609a15a26ac3cb50d8361fa
+++ debian/changelog	811387507e1131cf301ca00a6bf369839b2c0ff0
@@ -1,3 +1,16 @@
+monotone (0.36-2) unstable; urgency=low
+
+  * Bump boost build-deps to (>= 1.34.1-2) for packaging changes that make
+    the configure script find the single-threaded version of
+    libboost-regex.
+  * Re-enable -DBOOST_SP_DISABLE_THREADS; the above should render it
+    unnecessary.  This eliminates the sole divergence from upstream.
+  * Correct invalid assumption in tests/invalid_--root_settings that
+    the build directory is not a subdirectory of /tmp.
+  * Build-depend on patch, for the sake of the testsuite.
+
+ -- Zack Weinberg <address@hidden>  Wed, 22 Aug 2007 15:06:51 -0700
+
 monotone (0.36-1) unstable; urgency=low
 
   [ Richard Levitte ]
============================================================
--- debian/control	3eb1d7b1893528e9a542069d00f66c79bf37ddca
+++ debian/control	f4612c94bff8260e95c61b64f142d08cba97ef0e
@@ -1,12 +1,12 @@ Build-Depends: cdbs (>= 0.4.28), debhelp
 Source: monotone
 Section: devel
 Priority: optional
 Maintainer: Debian Maintainers for Monotone <address@hidden>
 Uploaders: Richard Levitte <address@hidden>, Zack Weinberg <address@hidden>, Ludovic Brenta <address@hidden>
 Build-Depends: cdbs (>= 0.4.28), debhelper (>= 4.2.0), autotools-dev,
- libboost-regex-dev (>= 1.33.0), libboost-dev (>= 1.33.0), libz-dev,
+ libboost-regex-dev (>= 1.34.1-2), libboost-dev (>= 1.34.1-2), libz-dev,
  ps2eps, texlive-base, texlive-generic-recommended, texlive-latex-base,
- texinfo, xpdf-utils, po-debconf
+ texinfo, xpdf-utils, po-debconf, patch
 Standards-Version: 3.7.2.2
 
 Package: monotone
============================================================
--- tests/invalid_--root_settings/__driver__.lua	26934fdd5e8c6fe71b0e8ff17750e64ee58304dc
+++ tests/invalid_--root_settings/__driver__.lua	c346aad2f308183234c8a46e50ef5190cbcbdee9
@@ -10,7 +10,9 @@ check(indir("foo", mtn("status", "--root
 check(indir("foo", mtn("status", "--root", ".")), 1, false, false)
 
 -- workspace outside of root
-check(mtn("status", "--root", "/tmp"), 1, false, false)
+tmpdir = make_temp_dir()
+check(mtn("status", "--root", tmpdir), 1, false, false)
+remove(tmpdir)
 
 -- root below workspace
 check(mtn("status", "--root", "foo"), 1, false, false)