diff -Nru sysvinit-2.88dsf/debian/changelog sysvinit-2.88dsf/debian/changelog
--- sysvinit-2.88dsf/debian/changelog	2015-05-20 05:23:25.000000000 +0000
+++ sysvinit-2.88dsf/debian/changelog	2015-07-03 15:05:44.000000000 +0000
@@ -1,3 +1,29 @@
+sysvinit (2.88dsf-59.2ubuntu1) wily; urgency=medium
+
+  * Merge with Debian unstable, updating for the /bin/mountpoint move.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 03 Jul 2015 09:02:08 -0600
+
+sysvinit (2.88dsf-59.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Previous version introduced a circular dependency sysvinit-utils →
+    util-linux → initscripts →  sysvinit-utils. Drop sysvinit-utils' versioned
+    Depends: on util-linux again and replace with versioned Breaks:.
+    This fixes debootstrap troubles like LP: #1456670.
+  * service, invoke-rc.d: Don't ignore systemd unit dependencies in "degraded"
+    mode. Followup fix for #777113, see LP: #1429734.
+  * Drop 91_sulogin_lockedpw.dpatch: Obsolete now that we ship sulogin from
+    util-linux.
+
+  [ Andreas Henriksson ]
+  * Update dependency for /bin/mountpoint being moved to util-linux instead
+    of mount. Use breaks instead of depends to avoid circular dependency.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 21 May 2015 13:33:26 +0200
+
 sysvinit (2.88dsf-59.1ubuntu3) wily; urgency=medium
 
   * Drop sysvinit-utils' versioned Depends: on util-linux again, it introduces a
diff -Nru sysvinit-2.88dsf/debian/control sysvinit-2.88dsf/debian/control
--- sysvinit-2.88dsf/debian/control	2015-05-20 05:16:55.000000000 +0000
+++ sysvinit-2.88dsf/debian/control	2015-07-03 15:01:28.000000000 +0000
@@ -62,8 +62,6 @@
  lsb-base (>= 3.2-14),
  sysvinit-utils (>= 2.88dsf-50), sysv-rc | file-rc,
  coreutils (>= 5.93),
-# mountpoint was moved to the mount package (src:util-linux)
- mount (>= 2.26.2-3)
 Recommends: psmisc, e2fsprogs
 Conflicts:
  libdevmapper1.02.1 (<< 2:1.02.24-1),
@@ -71,8 +69,8 @@
 Breaks:
 # Needed for ifquery
  ifupdown (<< 0.7.46),
-# Needed to ensure migration of UTC setting before /etc/default/rcS is updated.
- util-linux (<< 2.20.1-5),
+# /bin/mountpoint was moved to util-linux
+ util-linux (<< 2.26.2-4~),
 # Packages using /lib/init/rw which must transition to /run.
 # These breaks may be removed after wheezy is released.
  aide (<< 0.15.1-5),
diff -Nru sysvinit-2.88dsf/debian/patches/91_sulogin_lockedpw.dpatch sysvinit-2.88dsf/debian/patches/91_sulogin_lockedpw.dpatch
--- sysvinit-2.88dsf/debian/patches/91_sulogin_lockedpw.dpatch	2015-05-18 14:57:41.000000000 +0000
+++ sysvinit-2.88dsf/debian/patches/91_sulogin_lockedpw.dpatch	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-debian/patches/91_sulogin_lockedpw.dpatch (Thom May):
-Purpose: Make sure file systems can be fixed on machines with locked
-         root accounts too, by presenting a shell in these cases.
-Authour: Thom May and Ubuntu.
-Fixes:   #326678
-Status:  unknown
-
---- a/src/sulogin.c
-+++ b/src/sulogin.c
-@@ -329,7 +329,11 @@ struct passwd *getrootpwent(int try_manu
- 		fprintf(stderr, "%s: no entry for root\n", F_SHADOW);
- 		strcpy(pwd.pw_passwd, "");
- 	}
--	if (!valid(pwd.pw_passwd)) {
-+
-+	/* disabled passwords are valid too */
-+	if (!(strcmp(pwd.pw_passwd, "*") == 0) ||
-+	    !(strcmp(pwd.pw_passwd, "!") == 0) ||
-+	    !valid(pwd.pw_passwd)) {
- 		fprintf(stderr, "%s: root password garbled\n", F_SHADOW);
- 		strcpy(pwd.pw_passwd, ""); }
- 	return &pwd;
-@@ -585,6 +589,14 @@ int main(int argc, char **argv)
- 		fprintf(stderr, "sulogin: cannot open password database!\n");
- 		sleep(2);
- 	}
-+	/*
-+	 *	If the root password is locked, fire up a shell
-+	 */
-+	if ((strcmp(pwd->pw_passwd, "*") == 0) ||
-+	    (strcmp(pwd->pw_passwd, "!") == 0)) {
-+		/* fprintf(stderr, "sulogin: root account is locked, starting shell\n"); */
-+		sushell(pwd);
-+	}
- 
- 	/*
- 	 *	Ask for the password.
---- a/man/sulogin.8
-+++ b/man/sulogin.8
-@@ -39,6 +39,10 @@ Give root password for system maintenanc
- .br
- (or type Control\-D for normal startup):
- .PP
-+If the root account is locked, as is the default on Ubuntu, no password
-+prompt is displayed and \fIsulogin\fR behaves as if the correct password
-+were entered.
-+.PP
- \fIsulogin\fP will be connected to the current terminal, or to the
- optional device that can be specified on the command line
- (typically \fB/dev/console\fP).