# 
# 
# patch "debian/changelog"
#  from [0a516555a6eae09b4c104be84e5509847a7e0013]
#    to [fffcef90a91c00dcb711d28c546005c20bb7ab07]
# 
# patch "debian/control"
#  from [f0b337159d958006b5f009aebe3375b2ee2a17c0]
#    to [72d4ce11e07e8653805b1872da91c6b52cc4acb3]
# 
# patch "debian/monotone-server.templates"
#  from [6f83862f226fad9a45b5a82db41cca23371a479f]
#    to [81b54e05c8042bb136e4092a955b6af0047f8346]
# 
# patch "debian/po/templates.pot"
#  from [6da5d40b74b130b38cb4d4066f9057a8f5bc803a]
#    to [3e991807bcccfe5716852258543200d833582698]
# 
============================================================
--- debian/changelog	0a516555a6eae09b4c104be84e5509847a7e0013
+++ debian/changelog	fffcef90a91c00dcb711d28c546005c20bb7ab07
@@ -6,6 +6,15 @@ monotone (0.31-90.1) unstable; urgency=l
 
  -- Richard Levitte <address@hidden>  Mon, 13 Nov 2006 23:50:45 +0100
 
+monotone (0.31-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update policy to version 3.7.2.2. No changes were necessary.
+  * New packages: monotone-doc and monotone-server.
+  * Add ps2eps, tetex-bin, texinfo, xpdf-utils to Build-Depends-Indep.
+
+ -- Shaun Jackman <address@hidden>  Mon, 13 Nov 2006 10:16:14 -0700
+
 monotone (0.31-0.1) unstable; urgency=low
 
   * New upstream release.
============================================================
--- debian/control	f0b337159d958006b5f009aebe3375b2ee2a17c0
+++ debian/control	72d4ce11e07e8653805b1872da91c6b52cc4acb3
@@ -1,15 +1,16 @@ Build-Depends: cdbs (>= 0.4.28), debhelp
 Source: monotone
 Section: devel
 Priority: optional
 Maintainer: Shaun Jackman <address@hidden>
 Build-Depends: cdbs (>= 0.4.28), debhelper (>= 4.0.0), autotools-dev,
  libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev,
- libboost-test-dev, libboost-dev, texinfo, libz-dev
-Standards-Version: 3.7.2.1
+ libboost-test-dev, libboost-dev, libz-dev,
+Build-Depends-Indep: ps2eps, tetex-bin, texinfo, xpdf-utils
+Standards-Version: 3.7.2.2
 
 Package: monotone
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 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
@@ -20,7 +21,7 @@ Architecture: all
 
 Package: monotone-server
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, monotone (= ${Source-Version}), adduser, ucf (>= 0.28)
+Depends: monotone (>= ${source:Version}), adduser, ucf (>= 0.28), ${misc:Depends}
 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
@@ -29,12 +30,11 @@ Description: A distributed version (revi
  network protocol, performs history-sensitive merging, and delegates
  trust functions to client-side RSA certificates.
  .
- This package contains files to make running a monotone server easier.
+ This package contains scripts to facilitate running a monotone server.
 
 Package: monotone-doc
 Section: doc
-Architecture: any
-Build-Depends: tetex-bin, texinfo, xpdf-utils, ps2eps
+Architecture: all
 Description: A distributed version (revision) control system
+ This package contains the documentation for monotone in HTML and PDF
+ formats. See the description of the package monotone for more details.
- This is the documentation for monotone in HTML and PDF formats.  See
- the monotone description for more details.
============================================================
--- debian/monotone-server.templates	6f83862f226fad9a45b5a82db41cca23371a479f
+++ debian/monotone-server.templates	81b54e05c8042bb136e4092a955b6af0047f8346
@@ -8,8 +8,9 @@ Type: string
 
 Template: monotone-server/key
 Type: string
-_Description: Monotone key id.
- Enter the id of the key your monotone server will use.
+_Description: Monotone key id:
+ Enter the id of the key your monotone server will use. The key id
+ is typically an email address.
 
 Template: monotone-server/passphrase
 Type: password
============================================================
--- debian/po/templates.pot	6da5d40b74b130b38cb4d4066f9057a8f5bc803a
+++ debian/po/templates.pot	3e991807bcccfe5716852258543200d833582698
@@ -7,8 +7,8 @@ msgstr ""
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-12-06 10:24-0600\n"
+"Report-Msgid-Bugs-To: address@hidden"
+"POT-Creation-Date: 2006-11-13 14:30-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -34,24 +34,26 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../monotone-server.templates:11
-msgid "Monotone key id."
+msgid "Monotone key id:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../monotone-server.templates:11
-msgid "Enter the id of the key your monotone server will use."
+msgid ""
+"Enter the id of the key your monotone server will use. The key id is "
+"typically an email address."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../monotone-server.templates:16
+#: ../monotone-server.templates:17
 msgid "Monotone key passphrase:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../monotone-server.templates:16
+#: ../monotone-server.templates:17
 msgid ""
 "Please choose a passphrase for your monotone key. If left blank, one will be "
 "generated for you."