[Monotone-commits-diffs] org.debian.monotone: 8133506942344632c4a23947bdf58d36cedca119

[code]

revision:            8133506942344632c4a23947bdf58d36cedca119
date:                2009-11-14T19:24:51
author:              address@hidden
branch:              org.debian.monotone
changelog:
Finalize fix for runlevels bug; allow use of poppler-utils in build

manifest:
format_version "1"

new_manifest [3ee2ae3795a1a2d832928d0af5cc8c4e859069a3]

old_revision [5f4a10c34ba009cf929dcad3e23d24cc9fddebab]

patch "NEWS"
 from [4174f66d73dc8d3a62506b565f93e8b4d252b13e]
   to [77ba5a0fef89afdd23d5e71f6f0f07e8f5cf9e96]

patch "changelog"
 from [9a35f549850481a363c74b9d7c97b9a82c1ccf5a]
   to [54d7f05d977c4839318851494f6656221955609b]

patch "control"
 from [1ed73f4ef8a6f771cba0c462d23511f981e872af]
   to [efc67d42caeb96ff67063ab555355e9d17337f92]

patch "monotone-server.postinst"
 from [c4c19a0df6173da16f25a2824a4a67c57594ee39]
   to [998d0e0d46d0263fd18dbd09bd4137622d312b65]
============================================================
--- NEWS	4174f66d73dc8d3a62506b565f93e8b4d252b13e
+++ NEWS	77ba5a0fef89afdd23d5e71f6f0f07e8f5cf9e96
@@ -1,5 +1,11 @@ monotone (0.45-1) unstable; urgency=low
 monotone (0.45-1) unstable; urgency=low
 
+  * The fix for bug #542287 changes the default run-levels in which
+    the monotone server is started, and may overwrite local customizations
+    to those run-levels in some cases.  If you use the monotone-server
+    package and you changed the /etc/rc*.d links for it, check after
+    upgrade to make sure they are the way you want them.
+
   * Upstream made major changes to key handling: certs now refer to
     the key that signed them by hash, not name.  This permits some
     significant security and usability improvements: for instance, it
============================================================
--- changelog	9a35f549850481a363c74b9d7c97b9a82c1ccf5a
+++ changelog	54d7f05d977c4839318851494f6656221955609b
@@ -8,8 +8,11 @@ monotone (0.45-1) unstable; urgency=low
     - Incorporates 00-upstream-fix-shebang-for-bash-script.diff.
   * Bump version for automatic database migration in monotone-server.postinst.
   * Backport upstream fix for 'mtn clone' documentation (closes: #555652).
-  * Adjust LSB header in monotone-server.monotone.init per advice by
-    Petter Reinholdtsen (closes: #542287).
+  * Adjust LSB header in monotone-server.monotone.init to match update-rc.d
+    settings, and force those settings to be applied on upgrade from 0.44-2
+    or earlier (closes: #542287).
+  * Build-depend on poppler-utils | xpdf-utils, as the latter may be dropped
+    from squeeze (closes: #549386).
   * New template translations:
     - Russian, thanks to Yuri Kozlov (closes: #541758).
     - Italian, thanks to Vincenzo Campanella (no bug).
============================================================
--- control	1ed73f4ef8a6f771cba0c462d23511f981e872af
+++ control	efc67d42caeb96ff67063ab555355e9d17337f92
@@ -9,8 +9,8 @@ Build-Depends: debhelper (>= 7), autotoo
 Build-Depends: debhelper (>= 7), autotools-dev, po-debconf, quilt, patch,
  libboost-dev, libbotan1.8-dev, libidn11-dev, liblua5.1-0-dev, libpcre3-dev,
  libsqlite3-dev, libz-dev
-Build-Depends-Indep: texinfo, xpdf-utils, ps2eps, texlive-generic-recommended,
- texlive-latex-base
+Build-Depends-Indep: texinfo, poppler-utils | xpdf-utils, ps2eps,
+ texlive-generic-recommended, texlive-latex-base
 Standards-Version: 3.8.3
 
 Package: monotone
============================================================
--- monotone-server.postinst	c4c19a0df6173da16f25a2824a4a67c57594ee39
+++ monotone-server.postinst	998d0e0d46d0263fd18dbd09bd4137622d312b65
@@ -223,6 +223,24 @@ db_stop
 # stop debconf
 db_stop
 
+# Those using dependency based boot sequencing and installing
+# monotone before version 0.44-2 would miss the runlevel 2 symlink.
+# Recover from this.  Try not to mess with local configuration --
+# look for the specific combination of S and K links that we
+# know was wrong.
+
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "0.44-2" \
+   && [ -L /etc/rc0.d/K[0-9][0-9]monotone ] \
+   && [ -L /etc/rc1.d/K[0-9][0-9]monotone ] \
+   && [ -L /etc/rc2.d/[SK][0-9][0-9]monotone ] \
+   && [ -L /etc/rc3.d/S[0-9][0-9]monotone ] \
+   && [ -L /etc/rc4.d/S[0-9][0-9]monotone ] \
+   && [ -L /etc/rc5.d/S[0-9][0-9]monotone ] \
+   && [ -L /etc/rc6.d/K[0-9][0-9]monotone ]
+then
+   update-rc.d -f monotone remove
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.