Remove /var/run and /var/lock migration code from debian-fixup

The /run migration was completed in wheezy so this is no longer
necessary.

debian/changelog

@@ -1,5 +1,6 @@
 systemd (220-1) UNRELEASED; urgency=medium
 
+  [ Martin Pitt ]
   * New upstream release:
     - Ship sdio.ids and ids-update.pl in upstream tarball. (Closes: #780650)
     - Drop non-working "journalctl /dev/sda" example from manpage
@@ -33,6 +34,10 @@ systemd (220-1) UNRELEASED; urgency=medium
   * systemd-fsckd autopkgtest: In test_systemd_fsck_with_plymouth_failure(),
     fix plymouthd status check to work under both Debian and Ubuntu.
 
+  [ Michael Biebl ]
+  * Remove /var/run and /var/lock migration code from debian-fixup. The /run
+    migration was completed in wheezy so this is no longer necessary.
+
  -- Martin Pitt <mpitt@debian.org>  Fri, 22 May 2015 14:41:48 +0200
 
 systemd (219-10) experimental; urgency=medium

debian/extra/debian-fixup

@@ -6,21 +6,4 @@ if [ ! -L /etc/mtab ]; then
     ln -sf /proc/mounts /etc/mtab
 fi
 
-# Migrate /var/run to be a symlink to /run, unless /run is already a
-# symlink, to prevent loops.
-if [ ! -L /var/run ]; then
-    if [ ! -L /run ]; then
-        rm -rf /var/run
-        ln -s /run /var/run
-    fi
-fi
-
-# Migrate /var/lock to be a symlink to /run/lock, unless /run/lock is
-# already a symlink, to prevent loops.
-if [ ! -L /var/lock ]; then
-    if [ ! -L /run/lock ]; then
-        rm -rf /var/lock
-        ln -s /run/lock /var/lock
-    fi
-fi
 exit 0

debian/extra/units/debian-fixup.service

@@ -1,12 +1,8 @@
 [Unit]
 Description=Various fixups to make systemd work better on Debian
-Before=var-run.mount var-lock.mount sysinit.target
 After=systemd-remount-fs.service
 DefaultDependencies=no
-RequiresMountsFor=/var
 ConditionPathIsSymbolicLink=|!/etc/mtab
-ConditionPathIsSymbolicLink=|!/var/run
-ConditionPathIsSymbolicLink=|!/var/lock
 
 [Service]
 ExecStart=/lib/systemd/debian-fixup