diff -u boinc-5.10.45/debian/boinc-client.init boinc-5.10.45/debian/boinc-client.init
--- boinc-5.10.45/debian/boinc-client.init
+++ boinc-5.10.45/debian/boinc-client.init
@@ -114,8 +114,11 @@
     if [ ! -x "`which ionice 2>/dev/null`" ]; then
       log_progress_msg "ionice not found,"
     else
-      ionice -c 3 -p $pid
-      log_progress_msg "idle,"
+      if ionice -c 3 -p $pid 2>/dev/null; then
+        log_progress_msg "idle,"
+      else
+        log_progress_msg "ionice failed,"
+      fi
     fi
 
     if [ ! -x "`which schedtool 2>/dev/null`" ]; then
diff -u boinc-5.10.45/debian/control boinc-5.10.45/debian/control
--- boinc-5.10.45/debian/control
+++ boinc-5.10.45/debian/control
@@ -1,7 +1,8 @@
 Source: boinc
 Section: net
 Priority: optional
-Maintainer: Debian BOINC Maintainers <pkg-boinc-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian BOINC Maintainers <pkg-boinc-devel@lists.alioth.debian.org>
 Uploaders: Steffen Moeller <steffen_moeller@gmx.de>, Frank S. Thomas <fst@debian.org>, Christoph Martin <christoph.martin@uni-mainz.de>
 Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5), quilt (>= 0.40), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libxml2-utils, zlib1g-dev, libssl-dev, libcurl4-openssl-dev | libcurl3-openssl-dev (>= 7.15.5), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
diff -u boinc-5.10.45/debian/changelog boinc-5.10.45/debian/changelog
--- boinc-5.10.45/debian/changelog
+++ boinc-5.10.45/debian/changelog
@@ -1,3 +1,13 @@
+boinc (5.10.45-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #229083)
+   + debian/boinc-client.init:
+    - Do not fail, if ionice/ioprio_set is not allowed
+   + Modify Maintainer value to match the DebianMaintainerField
+     specification.
+
+ -- Emanuele Gentili <emgent@emanuele-gentili.com>  Sat, 10 May 2008 22:03:03 +0200
+
 boinc (5.10.45-2) unstable; urgency=low
 
   [ Debconf translations ]
@@ -11,6 +21,15 @@
 
  -- Frank S. Thomas <fst@debian.org>  Mon, 07 Apr 2008 16:32:01 +0200
 
+boinc (5.10.45-1ubuntu1) hardy; urgency=low
+
+  * debian/boinc-client.init:
+    Do not fail, if ionice/ioprio_set is not allowed (LP: #218468)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Thu, 17 Apr 2008 02:31:28 +0200
+
 boinc (5.10.45-1) unstable; urgency=low
 
   [ Frank S. Thomas ]