#
#
# add_file "debian/monotone-doc.postinst"
#  content [42173087f1dc1dadf9365e37d71b02121f6f03b8]
# 
# patch "debian/changelog"
#  from [745809e3237682ec51b2b64ab3545e2ce43e2746]
#    to [b724d70f4bb1d65f85ada08fdc1573aa2ccf29c0]
# 
# patch "debian/monotone-server.dirs"
#  from [f375fd99eb1d2d4d378db7e40a9cf0fe97ee11b6]
#    to [5830a3e0a1f30faa3ebb0e40074a2b4e138b7bed]
# 
# patch "debian/monotone-server.postinst"
#  from [5dd82e1fb21bc562b4b40a4262a2b469e382544f]
#    to [dd07d64f755d847f2a6d8e60ce309ab3a981baeb]
# 
# patch "debian/rules"
#  from [780f817596b52a973ac43d0df3d577990727d410]
#    to [dc5413bd12361de35bcd3def7e5549af8f5a8af0]
#
============================================================
--- debian/monotone-doc.postinst	42173087f1dc1dadf9365e37d71b02121f6f03b8
+++ debian/monotone-doc.postinst	42173087f1dc1dadf9365e37d71b02121f6f03b8
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+case "$1" in
+    configure)
+        # directory turned into symlink; give dpkg a hand
+	if [ ! -L /usr/share/doc/monotone-doc ] && \
+	   [ -e /usr/share/doc/monotone-doc ]; then
+            rmdir /usr/share/doc/monotone-doc
+	    ln -sf monotone /usr/share/doc/monotone-doc
+	fi
+esac
+
+#DEBHELPER#
============================================================
--- debian/changelog	745809e3237682ec51b2b64ab3545e2ce43e2746
+++ debian/changelog	b724d70f4bb1d65f85ada08fdc1573aa2ccf29c0
@@ -1,3 +1,14 @@
+monotone (0.40-4) unstable; urgency=low
+
+  * Corrected .diff.gz including regeneration of Makefile.in.
+    (Closes: #483090, #483018)
+  * monotone-server.postinst, monotone-doc.postinst: help out dpkg
+    with directory->symlink conversion.  (Closes: #483155)
+  * Install ucf baselines in /usr/share/monotone instead of getting
+    them from /usr/share/doc/monotone/..., per Policy 12.3.
+
+ -- Zack Weinberg <address@hidden>  Wed, 28 May 2008 23:48:47 -0400
+
 monotone (0.40-3) unstable; urgency=low
 
   * Don't compress the pdf documentation.
============================================================
--- debian/monotone-server.dirs	f375fd99eb1d2d4d378db7e40a9cf0fe97ee11b6
+++ debian/monotone-server.dirs	5830a3e0a1f30faa3ebb0e40074a2b4e138b7bed
@@ -1,6 +1,7 @@ usr/share/doc
 var/lib/monotone
 var/lib/monotone/keys
 etc/monotone
 var/log/monotone
 var/run/monotone
 usr/share/doc
+usr/share/monotone
============================================================
--- debian/monotone-server.postinst	5dd82e1fb21bc562b4b40a4262a2b469e382544f
+++ debian/monotone-server.postinst	dd07d64f755d847f2a6d8e60ce309ab3a981baeb
@@ -107,14 +107,21 @@ case "$1" in
 case "$1" in
     configure)
 
+        # directory turned into symlink; give dpkg a hand
+	if [ ! -L /usr/share/doc/monotone-server ] && \
+	   [ -e /usr/share/doc/monotone-server ]; then
+            rmdir /usr/share/doc/monotone-server
+	    ln -sf monotone /usr/share/doc/monotone-server
+	fi
+
        MTN_HOME=/var/lib/monotone
        MTN_DB=$MTN_HOME/default.mtn
        MTN_CONFDIR=/etc/monotone
        MTN_KEYDIR=$MTN_HOME/keys
 	       
-       ucf --debconf-ok /usr/share/doc/monotone-server/examples/write-permissions /etc/monotone/write-permissions
-       ucf --debconf-ok /usr/share/doc/monotone-server/examples/read-permissions /etc/monotone/read-permissions
-       ucf --debconf-ok /usr/share/doc/monotone/contrib/get_passphrase_from_file.lua /etc/monotone/hooks.lua
+       ucf --debconf-ok /usr/share/monotone/write-permissions.base /etc/monotone/write-permissions
+       ucf --debconf-ok /usr/share/monotone/read-permissions.base /etc/monotone/read-permissions
+       ucf --debconf-ok /usr/share/monotone/hooks.lua.base /etc/monotone/hooks.lua
 
        ucfr monotone-server /etc/monotone/write-permissions
        ucfr monotone-server /etc/monotone/read-permissions
============================================================
--- debian/rules	780f817596b52a973ac43d0df3d577990727d410
+++ debian/rules	dc5413bd12361de35bcd3def7e5549af8f5a8af0
@@ -142,6 +142,13 @@ binary-indep: build-indep
 	    debian/monotone-doc/usr/share/doc/monotone/html/figures
 	dh_installdocs -p monotone-doc -X copyright -X NEWS
 
+	cp -p examples/read-permissions \
+	    debian/monotone-server/usr/share/monotone/read-permissions.base
+	cp -p examples/write-permissions \
+	    debian/monotone-server/usr/share/monotone/write-permissions.base
+	cp -p contrib/get_passphrase_from_file.lua \
+	    debian/monotone-server/usr/share/monotone/hooks.lua.base
+
 	dh_installdebconf -i
 
 # we should have logrotate support for monotone-server, but currently we don't