diff -u quota-4.00/debian/control quota-4.00/debian/control
--- quota-4.00/debian/control
+++ quota-4.00/debian/control
@@ -1,7 +1,8 @@
 Source: quota
 Section: admin
 Priority: optional
-Maintainer: Michael Meskes <meskes@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Meskes <meskes@debian.org>
 Build-Depends: debhelper (>= 6.0.7~), gettext, libwrap0-dev, e2fslibs-dev,
 	       po-debconf (>= 0.5.0), libldap2-dev, libssl-dev, quilt (>= 0.46-7),
                libnl-3-dev, libnl-genl-3-dev, libdbus-1-dev
diff -u quota-4.00/debian/changelog quota-4.00/debian/changelog
--- quota-4.00/debian/changelog
+++ quota-4.00/debian/changelog
@@ -1,3 +1,9 @@
+quota (4.00-4ubuntu1) precise; urgency=low
+
+  * Fix repquota on xfs. (LP: #1044516)
+
+ -- Chris J Arges <chris.j.arges@canonical.com>  Mon, 17 Sep 2012 13:38:49 -0500
+
 quota (4.00-4) unstable; urgency=low
 
   * Added upstream patch to fix problem with editing of several users.
diff -u quota-4.00/debian/patches/series quota-4.00/debian/patches/series
--- quota-4.00/debian/patches/series
+++ quota-4.00/debian/patches/series
@@ -4,0 +5 @@
+repquota_fix_xfs_reporting.diff
only in patch2:
unchanged:
--- quota-4.00.orig/debian/patches/repquota_fix_xfs_reporting.diff
+++ quota-4.00/debian/patches/repquota_fix_xfs_reporting.diff
@@ -0,0 +1,25 @@
+Author: Jan Kara <jack@suse.cz>
+Description; repquota: Fix reporting for XFS
+
+Conversion to generic quota scanning introduced a bug for XFS where we
+stopped scanning after quotactl reported first error. quotactl for XFS
+however reports ENOENT when it has nothing to report for a particular user
+/ group and we shouldn't stop scanning after that. We tried to test for this
+but the test was wrong. Fix it.
+
+cherry-picked from commit 6ba6546dd167297cb9ed69d0257ee245b0faea47
+
+--- a/quotaio_xfs.c
++++ b/quotaio_xfs.c
+@@ -183,9 +183,9 @@ static int xfs_get_dquot(struct dquot *d
+ 	memset(&d, 0, sizeof(d));
+ 	ret = quotactl(qcmd, dq->dq_h->qh_quotadev, dq->dq_id, (void *)&d);
+ 	if (ret < 0) {
+-		if (ret == -ENOENT)
++		if (errno == ENOENT)
+ 			return 0;
+-		return ret;
++		return -1;
+ 	}
+ 	xfs_kern2utildqblk(&dq->dq_dqb, &d);
+ 	return 0;