Merge lp:~serge-hallyn/ubuntu/maverick/lxc/fix-restart into lp:ubuntu/maverick/lxc

[Serge Hallyn]

[Clint Byrum (clint-fewbar)]

Uploaded to maverick-proposed

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-04 13:23:42 +0000
+++ debian/changelog	2011-08-01 19:26:38 +0000
@@ -1,3 +1,12 @@
+lxc (0.7.2-1ubuntu1) UNRLEASED; urgency=low
+
+  * debian/rules: add -r (--no-restart-on-upgrade) to DEB_DH_INSTALLINIT_ARGS
+    to prevent upgrading lxc from forcing lxc autostart containers to
+    stop and restart.  (LP: #753308)
+  * debian/control: set ubuntu maintainer.
+
+ -- Serge Hallyn <[e-mail]>  Mon, 01 Aug 2011 13:34:40 -0500
+
 lxc (0.7.2-1) unstable; urgency=low
 
   * New upstream version

=== modified file 'debian/control'
--- debian/control	2010-08-04 13:23:42 +0000
+++ debian/control	2011-08-01 19:26:38 +0000
@@ -1,7 +1,8 @@
 Source: lxc
 Section: admin
 Priority: optional
-Maintainer: Guido Trotter <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Guido Trotter <[e-mail]>
 Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libcap-dev (>= 1:2.17-2), linux-libc-dev
 Standards-Version: 3.9.1
 Homepage: http://lxc.sourceforge.net/

=== modified file 'debian/rules'
--- debian/rules	2010-08-04 13:23:42 +0000
+++ debian/rules	2011-08-01 19:26:38 +0000
@@ -9,6 +9,7 @@
 LIBDIR="\$${prefix}/lib/lxc"
 DEB_CONFIGURE_EXTRA_FLAGS=--libdir=$(LIBDIR) \
 			  --with-rootfs-path=$(LIBDIR)
+DEB_DH_INSTALLINIT_ARGS=-r
 
 binary-install/lxc::
 	cp debian/lxc.overrides debian/lxc/usr/share/lintian/overrides/lxc