diff -u policycoreutils-2.0.69/debian/local.mk policycoreutils-2.0.69/debian/local.mk
--- policycoreutils-2.0.69/debian/local.mk
+++ policycoreutils-2.0.69/debian/local.mk
@@ -79,6 +79,7 @@
 	ln -s                se_dpkg                    $(SBINDIR)/se_dpkg-reconfigure
 	ln -s                se_dpkg                    $(SBINDIR)/se_aptitude
 	ln -s                se_dpkg                    $(SBINDIR)/se_synaptic
+	ln -s                /sbin/load_policy          $(SBINDIR)/load_policy
 	test ! -d            $(TMPTOP)/etc/cron.weekly ||                              \
            rm -rf            $(TMPTOP)/etc/cron.weekly
 	$(install_file)      debian/changelog       $(DOCDIR)/changelog.Debian
diff -u policycoreutils-2.0.69/debian/control policycoreutils-2.0.69/debian/control
--- policycoreutils-2.0.69/debian/control
+++ policycoreutils-2.0.69/debian/control
@@ -3,7 +3,8 @@
 VCS-Browser: http://git.debian.org/git/?p=users/srivasta/debian/policycoreutils.git
 Priority: standard
 Section: utils
-Maintainer: Russell Coker <russell@coker.com.au>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Russell Coker <russell@coker.com.au>
 Uploaders: Manoj Srivastava <srivasta@debian.org>
 Standards-Version: 3.8.2.0
 Build-Depends: libselinux1-dev (>= 2.0.85), libpam0g-dev,
diff -u policycoreutils-2.0.69/debian/postinst policycoreutils-2.0.69/debian/postinst
--- policycoreutils-2.0.69/debian/postinst
+++ policycoreutils-2.0.69/debian/postinst
@@ -88,7 +88,7 @@
 ##: [ ! -x /usr/bin/update-menus ] || /usr/bin/update-menus
 
 # Arrange for a daemon to be started at system boot time
-update-rc.d ${package_name} defaults >/dev/null
+update-rc.d ${package_name} start 00 S 2 3 4 5 . stop 99 0 1 6 . >/dev/null
 
 OLD_FILES='/etc/init.d/selinux /etc/rcS.d/S02selinux /etc/default/selinux /ss_policy'
 OLD_FILES="$OLD_FILES /etc/mkinitrd/scripts/selinux  /etc/security/apt-get_context"
diff -u policycoreutils-2.0.69/debian/changelog policycoreutils-2.0.69/debian/changelog
--- policycoreutils-2.0.69/debian/changelog
+++ policycoreutils-2.0.69/debian/changelog
@@ -1,3 +1,14 @@
+policycoreutils (2.0.69-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #400111
+    - load_policy/Makefile, debian/local.mk: move load_policy to /sbin
+      ensuring it is available during early boot.
+    - restorecond/restorecond.conf: adding more files from the /var/run
+      pseudo fs.
+    - debian/postinst: move restorecon to a higher startup level.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Thu, 20 Aug 2009 19:55:18 +0530
+
 policycoreutils (2.0.69-1) unstable; urgency=low
 
   * New upstream release
@@ -47,6 +58,17 @@
 
  -- Manoj Srivastava <srivasta@debian.org>  Mon, 15 Jun 2009 16:24:38 -0500
 
+policycoreutils (2.0.55-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - load_policy/Makefile, debian/local.mk: move load_policy to /sbin
+      ensuring it is available during early boot.
+    - restorecond/restorecond.conf: adding more files from the /var/run
+      pseudo fs.
+    - debian/postinst: move restorecon to a higher startup level.
+
+ -- Kees Cook <kees@ubuntu.com>  Sun, 10 May 2009 16:07:46 -0700
+
 policycoreutils (2.0.55-1) unstable; urgency=low
 
   * New upstream release
@@ -66,6 +88,19 @@
 
  -- Manoj Srivastava <srivasta@debian.org>  Thu, 12 Feb 2009 22:52:54 -0600
 
+policycoreutils (2.0.49-8ubuntu2) jaunty; urgency=low
+
+  * Moving restorecon to a higher startup level.
+  * Adding files from the /var/run pseudo fs (LP: #352756).
+
+ -- Caleb Case <ccase@tresys.com>  Tue, 31 Mar 2009 11:30:42 -0400
+
+policycoreutils (2.0.49-8ubuntu1) jaunty; urgency=low
+
+  * Move load_policy to /sbin ensuring it is available at boot (LP: #126415).
+
+ -- Caleb Case <ccase@tresys.com>  Tue, 17 Mar 2009 11:57:03 -0400
+
 policycoreutils (2.0.49-8) unstable; urgency=high
 
   * [62526b0]: Fix fr.po which causes semanage to fail
@@ -1042,0 +1078 @@
+
only in patch2:
unchanged:
--- policycoreutils-2.0.69.orig/restorecond/restorecond.conf
+++ policycoreutils-2.0.69/restorecond/restorecond.conf
@@ -2,6 +2,11 @@
 /etc/resolv.conf
 /etc/samba/secrets.tdb
 /etc/mtab
+/var/run/cups
+/var/run/dbus
+/var/run/network
+/var/run/network/ifstate
+/var/run/PolicyKit
 /var/run/utmp
 /var/log/wtmp
 ~/*
only in patch2:
unchanged:
--- policycoreutils-2.0.69.orig/load_policy/Makefile
+++ policycoreutils-2.0.69/load_policy/Makefile
@@ -1,5 +1,5 @@
 # Installation directories.
-PREFIX ?= ${DESTDIR}/usr
+PREFIX ?= ${DESTDIR}
 SBINDIR ?= $(PREFIX)/sbin
 MANDIR ?= $(PREFIX)/share/man
 LOCALEDIR ?= /usr/share/locale