#
#
# patch "debian/changelog"
#  from [b724d70f4bb1d65f85ada08fdc1573aa2ccf29c0]
#    to [f4383665041ab3263c55b3b96b1c60c652ac8c77]
# 
# patch "debian/control"
#  from [73ee7b2329440674ddd9cf8100c08676e91a3ed2]
#    to [57951fba1a69612e4f835e808295c7454b2bf384]
# 
# patch "debian/rules"
#  from [dc5413bd12361de35bcd3def7e5549af8f5a8af0]
#    to [ffb0ab1ceb6447e4663d2a9c185ef0cfb94af99c]
#
============================================================
--- debian/changelog	b724d70f4bb1d65f85ada08fdc1573aa2ccf29c0
+++ debian/changelog	f4383665041ab3263c55b3b96b1c60c652ac8c77
@@ -1,3 +1,18 @@
+monotone (0.40-5) unstable; urgency=low
+
+  * Backport from upstream development tree:
+    - fix for broken ssh_agent support
+    - testsuite hardening against unusable network, and DISABLE_NETWORK_TESTS
+      environment variable support
+    - improved contrib/dump-test-logs.sh
+  * debian/rules: Set DISABLE_NETWORK_TESTS when running the testsuite;
+    this may cure the mips buildd problems for real.  Also, implement
+    support for DEB_BUILD_OPTS=parallel rather than probing available CPUs.
+  * monotone binary package Suggests: monotone-doc and monotone-server
+    (Closes: #476155)
+
+ -- Zack Weinberg <address@hidden>  Sun, 08 Jun 2008 18:55:02 -0400
+
 monotone (0.40-4) unstable; urgency=low
 
   * Corrected .diff.gz including regeneration of Makefile.in.
============================================================
--- debian/control	73ee7b2329440674ddd9cf8100c08676e91a3ed2
+++ debian/control	57951fba1a69612e4f835e808295c7454b2bf384
@@ -14,6 +14,7 @@ Depends: ${shlibs:Depends}
 Package: monotone
 Architecture: any
 Depends: ${shlibs:Depends}
+Suggests: monotone-doc, monotone-server
 Description: A distributed version (revision) control system
  Monotone is a free, distributed version control system. It provides
  fully disconnected operation, manages complete tree versions, keeps
============================================================
--- debian/rules	dc5413bd12361de35bcd3def7e5549af8f5a8af0
+++ debian/rules	ffb0ab1ceb6447e4663d2a9c185ef0cfb94af99c
@@ -23,7 +23,9 @@ endif
 endif
 
 # This enables parallelism.
-CPUS ?= $(shell getconf _NPROCESSORS_ONLN)
+ifneq (,$(findstring parallel=,$(DEB_BUILD_OPTIONS)))
+PAR := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
 
 # DEB_BUILD_OPTIONS=noopt handling (Policy 10.1) and arch-specific
 # compiler options.  Allow total override of CFLAGS from the
@@ -78,17 +80,23 @@ endif
 		    --infodir='$${prefix}/share/info' CFLAGS="$(CFLAGS)" \
 		    CXXFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
+# We don't want to generate the info documentation in build-arch, so
+# we have to bypass the 'all' target.  (Revisit after automake-ectomy.)
+
+# The testsuite is still not entirely reliable in parallel mode, and
+# thanks to buildd configuration decisions that no one will explain to
+# me in sufficient detail to detect reliably, we have to disable all
+# netsync tests.  (We could get away with only doing that on mips, but
+# who knows whether another architecture will decide to do the same
+# thing.)  The real fix for both these issues will be network tests
+# over local domain sockets, coming Real Soon Now from upstream.
 build-arch: build-arch-stamp
 build-arch-stamp: config.status
-
-# We don't want to generate the info documentation in build-arch, so
-# we have to bypass the 'all' target.  (Revisit after automake-ectomy.)
-# The testsuite is still not entirely reliable in parallel mode.
-	make -j$(CPUS) -C po all
-	make -j$(CPUS) mtn
+	make $(PAR) -C po all
+	make $(PAR) mtn
 ifeq "$(findstring nocheck, $(DEB_BUILD_OPTIONS))" ""
-	make -j$(CPUS) unit_tester tester check_net
-	make check-local || sh contrib/dump-test-logs.sh
+	make $(PAR) unit_tester tester check_net
+	DISABLE_NETWORK_TESTS=1 make check-local || sh contrib/dump-test-logs.sh
 endif
 	touch $@
 
@@ -96,7 +104,7 @@ build-indep-stamp: config.status
 build-indep-stamp: config.status
 
 # Just the formatted documentation.
-	make -j$(CPUS) info html monotone.pdf
+	make $(PAR) info html monotone.pdf
 	touch $@
 
 clean: