diff -Nru quilt-0.50/debian/changelog quilt-0.50/debian/changelog --- quilt-0.50/debian/changelog 2011-12-20 10:32:08.000000000 +0000 +++ quilt-0.50/debian/changelog 2012-01-04 18:23:03.000000000 +0000 @@ -1,3 +1,15 @@ +quilt (0.50-1ubuntu1) precise; urgency=low + + [ Adam Conrad ] + * Cherry-pick quilt-versus-mta changes from Debian git (LP: #911631) + + [ Raphaël Hertzog ] + * Recommends "default-mta | mail-transport-agent" instead of plain + mail-transport-agent. Closes: #652734 + * Change the above Recommends into a Suggests. Closes: #652912 + + -- Adam Conrad Wed, 04 Jan 2012 11:20:58 -0700 + quilt (0.50-1) unstable; urgency=low [ Martin Quinson ] diff -Nru quilt-0.50/debian/control quilt-0.50/debian/control --- quilt-0.50/debian/control 2011-12-20 10:32:08.000000000 +0000 +++ quilt-0.50/debian/control 2012-01-04 18:22:24.000000000 +0000 @@ -3,7 +3,8 @@ Source: quilt Section: vcs Priority: optional -Maintainer: Martin Quinson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Martin Quinson Uploaders: Raphaël Hertzog , Ryan Niebur Build-Depends: debhelper (>= 8) Build-Depends-Indep: gettext, hevea, lynx, diffstat, perl, procmail, ed @@ -17,8 +18,7 @@ Package: quilt Architecture: all Depends: patch, diffstat, bzip2, gettext, bsdmainutils, ${misc:Depends}, ${perl:Depends} -Recommends: mail-transport-agent -Suggests: procmail, graphviz +Suggests: procmail, graphviz, default-mta | mail-transport-agent Enhances: debhelper, cdbs Multi-Arch: foreign Description: Tool to work with series of patches