diffstat of debian/ for xen-common_4.1.2-1 xen-common_4.1.2-1ubuntu1

 changelog                  |   27 +++++++++++++++++++++++++++
 control                    |    3 ++-
 xen-utils-common.xend.init |    3 +++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff -Nru xen-common-4.1.2/debian/changelog xen-common-4.1.2/debian/changelog
--- xen-common-4.1.2/debian/changelog	2011-10-26 23:20:51.000000000 +0000
+++ xen-common-4.1.2/debian/changelog	2012-02-06 15:49:46.000000000 +0000
@@ -1,3 +1,10 @@
+xen-common (4.1.2-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - Upate maintainer according to spec.
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 06 Feb 2012 10:49:43 -0500
+
 xen-common (4.1.2-1) unstable; urgency=low
 
   [ Julien Danjou ]
@@ -10,6 +17,25 @@
 
  -- Bastian Blank <waldi@debian.org>  Thu, 27 Oct 2011 01:20:30 +0200
 
+xen-common (4.1.0~rc6-1ubuntu2) precise; urgency=low
+
+  * debian/xen-utils-common.xend.init: Also added modprobe xen_gntdev.
+    Not sure this is the ultimate place for them but it seems the best
+    compromise. We do not really want to have those built-in into the
+    generic server kernel. The gntdev seems mostly required for xl only
+    but it seemed too much to check every run of xl. And xend init is
+    run when we start in xen dom0 mode... (LP: #894713)
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Wed, 07 Dec 2011 12:20:32 +0000
+
+xen-common (4.1.0~rc6-1ubuntu1) oneiric; urgency=low
+
+  * debian/xen-utils-common.xend.init: Added modprobe xen_blkback and 
+    xen_netback, as they are not automatically loaded with Oneiric.
+    This can be dropped for 12.04 release. (LP: #803488)
+
+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com>  Fri, 07 Oct 2011 18:47:50 +0100
+
 xen-common (4.1.0~rc6-1) unstable; urgency=low
 
   * New upstream release candidate.
@@ -183,3 +209,4 @@
   * Initial release.
 
  -- Bastian Blank <waldi@debian.org>  Sun, 27 Aug 2006 17:46:22 +0000
+
diff -Nru xen-common-4.1.2/debian/control xen-common-4.1.2/debian/control
--- xen-common-4.1.2/debian/control	2011-10-26 07:56:43.000000000 +0000
+++ xen-common-4.1.2/debian/control	2012-02-06 15:49:10.000000000 +0000
@@ -1,7 +1,8 @@
 Source: xen-common
 Section: kernel
 Priority: optional
-Maintainer: Debian Xen Team <pkg-xen-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Xen Team <pkg-xen-devel@lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter@debian.org>, Bastian Blank <waldi@debian.org>
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>> 7)
diff -Nru xen-common-4.1.2/debian/xen-utils-common.xend.init xen-common-4.1.2/debian/xen-utils-common.xend.init
--- xen-common-4.1.2/debian/xen-utils-common.xend.init	2011-03-19 11:15:46.000000000 +0000
+++ xen-common-4.1.2/debian/xen-utils-common.xend.init	2011-12-07 16:01:00.000000000 +0000
@@ -34,6 +34,9 @@
 {
 	modprobe xenfs 2>/dev/null
 	modprobe xen-evtchn 2>/dev/null
+	modprobe xen_blkback 2>/dev/null
+	modprobe xen_netback 2>/dev/null
+	modprobe xen_gntdev 2>/dev/null
 }
 
 xenfs_setup()