#
#
# patch "debian/changelog"
#  from [27b8d6c10161e5aa71440bbe7ce6958596b7ca6f]
#    to [b4a64a2032332071acb9453f471877c8672e95a4]
# 
# patch "debian/control"
#  from [3790e24f0477f94ba936cf21150190f02834a297]
#    to [3eb1d7b1893528e9a542069d00f66c79bf37ddca]
# 
# patch "debian/monotone-server.postrm"
#  from [7e14df27041654eda98b4317c4a2e90dd34f7ac7]
#    to [deae677274c6bc32cf9aa3296ab4e7513e044d84]
# 
# patch "debian/rules"
#  from [de4544adfb428fd8812305e42720781f13eb0fc1]
#    to [307ef10ce7e3eb38bccdfc8096d901c62ffb3fcb]
#
============================================================
--- debian/changelog	27b8d6c10161e5aa71440bbe7ce6958596b7ca6f
+++ debian/changelog	b4a64a2032332071acb9453f471877c8672e95a4
@@ -7,6 +7,20 @@ monotone (0.36-1) unstable; urgency=low
 
  -- final uploader's name and date here
 
+monotone (0.35-2) unstable; urgency=low
+
+  * Collapse Build-Depends-Indep into Build-Depends to work around
+    a buildd bug.  (Closes: #432657)
+  * Correct Ludovic Brenta's address in Uploaders.
+  * Enable parallel make on multiprocessors.
+
+  [ Ludovic Brenta ]
+  * monotone-server.postrm: do not blindly erase /var/lib/monotone on
+    purge; instead, delete only the default database (created in the
+    postinst), and only delete the directory if empty.
+
+ -- Zack Weinberg <address@hidden>  Fri, 13 Jul 2007 08:39:58 -0700
+
 monotone (0.35-1) unstable; urgency=low
 
   [ Zack Weinberg ]
============================================================
--- debian/control	3790e24f0477f94ba936cf21150190f02834a297
+++ debian/control	3eb1d7b1893528e9a542069d00f66c79bf37ddca
@@ -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
-Build-Depends-Indep: ps2eps, texlive-base, texlive-generic-recommended,
- texlive-latex-base, texinfo, xpdf-utils, po-debconf
+ libboost-regex-dev (>= 1.33.0), libboost-dev (>= 1.33.0), libz-dev,
+ ps2eps, texlive-base, texlive-generic-recommended, texlive-latex-base,
+ texinfo, xpdf-utils, po-debconf
 Standards-Version: 3.7.2.2
 
 Package: monotone
============================================================
--- debian/monotone-server.postrm	7e14df27041654eda98b4317c4a2e90dd34f7ac7
+++ debian/monotone-server.postrm	deae677274c6bc32cf9aa3296ab4e7513e044d84
@@ -18,13 +18,14 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
+# source debconf stuff
+. /usr/share/debconf/confmodule
+
 case "$1" in
     purge)
-       
-       MTN_DB=/var/lib/monotone/default.mtn
-       MTN_HOME=/var/lib/monotone
-       MTN_CONFDIR=/etc/monotone
-       MTN_KEYDIR=$MTN_HOME/keys
+       db_get monotone-server/key
+       MTN_KEY="$RET"
+       MTN_DB=default.mtn
 
        # remove configs from ucf database and filesystem
        /usr/bin/ucf --purge /etc/monotone/write-permissions
@@ -36,15 +37,18 @@ case "$1" in
        rm -f /etc/monotone/hooks.lua || true
 
        if [ -n "`id -u monotone 2>/dev/null`" ]; then
-           /usr/sbin/deluser --quiet --remove-home monotone 2>/dev/null >/dev/null
+           /usr/sbin/deluser --quiet monotone 2>/dev/null >/dev/null
        fi
 
        if [ -n "`id -g monotone 2>/dev/null`" ]; then
            /usr/sbin/delgroup --quiet monotone 2>/dev/null >/dev/null
        fi
        
-       # delete the monotone database (only on purge)
-       rm -rf $MTN_HOME
+       # delete the auto-generated key and database. don't delete
+       # anything else in /var/lib/monotone - there might be
+       # hand-created databases and keys that the admin wants to keep.
+       rm -f /var/lib/monotone/$MTN_DB /var/lib/monotone/keys/$MTN_KEY
+       rmdir --ignore-fail-on-non-empty /var/lib/monotone/keys /var/lib/monotone
 
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -56,6 +60,9 @@ esac
 
 esac
 
+# Stop debconf
+db_stop
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
============================================================
--- debian/rules	de4544adfb428fd8812305e42720781f13eb0fc1
+++ debian/rules	307ef10ce7e3eb38bccdfc8096d901c62ffb3fcb
@@ -6,6 +6,10 @@ DEB_DH_INSTALLINIT_ARGS = --name=monoton
 DEB_MAKE_CHECK_TARGET = check
 DEB_DH_INSTALLINIT_ARGS = --name=monotone
 
+CPUS := $(shell getconf _NPROCESSORS_ONLN)
+
+build : DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(MAKE) -j$(CPUS) -C $(DEB_BUILDDIR)
+
 build/monotone-doc::
 	make monotone.pdf