Merge lp:~dholbach/ubuntu-packaging-guide/996096 into lp:ubuntu-packaging-guide

[Daniel Holbach]

[Andrew Starr-Bochicchio (andrewsomething)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-15 16:41:38 +0000
+++ debian/changelog	2012-06-20 10:03:18 +0000
@@ -17,6 +17,10 @@
   * provide a means to ship per-language per-flavour packages, if a certain
     level of completeness of the translations is reached. (LP: #961936)
 
+  [ Daniel Holbach ]
+  * Integrate sponsoring documentation (setting expectations, explain 
+    process). (LP: #996096)
+
  -- Daniel Holbach <[e-mail]>  Wed, 06 Jun 2012 09:28:00 +0200
 
 ubuntu-packaging-guide (0.1) quantal; urgency=low

=== modified file 'ubuntu-packaging-guide/fixing-a-bug.rst'
--- ubuntu-packaging-guide/fixing-a-bug.rst	2012-05-28 02:15:28 +0000
+++ ubuntu-packaging-guide/fixing-a-bug.rst	2012-06-20 10:03:18 +0000
@@ -205,4 +205,10 @@
 browser. There find the "(+) Propose for merging" link, click it to get the
 change reviewed by somebody and included in Ubuntu.
 
-.. XXX: Link to SRU article.
+Our article about :doc:`seeking sponsorship<./udd-sponsorship>` goes into
+more detail about getting feedback for your proposed changes.
+
+If your branch fixes issues in stable releases or it is a security fix, you
+might want to have a look at our 
+:doc:`Security and stable release updates<./security-and-stable-release-updates>`
+article.

=== modified file 'ubuntu-packaging-guide/udd-sponsorship.rst'
--- ubuntu-packaging-guide/udd-sponsorship.rst	2012-02-29 10:05:20 +0000
+++ ubuntu-packaging-guide/udd-sponsorship.rst	2012-06-20 10:03:18 +0000
@@ -97,3 +97,19 @@
 Note that if you are sponsored via a debdiff attached to a bug report you need
 to manually update by generating a new diff and attaching that to the bug
 report.
+
+
+Expectations
+============
+
+The Ubuntu developers have set up a schedule of "patch pilots", who regularly
+review the sponsoring queue and give feedback on branches and patches. Even
+though this measure has been put in place it might still take several days
+until you hear back. This depends on how busy everybody is, if the development
+release is currently frozen, or other factors.
+
+If you haven't heard back in a while, feel free to join `#ubuntu-devel` on 
+`irc.freenode.net` and find out if somebody can help you there.
+
+For more information on the generall sponsorship process, review the 
+documentation on our wiki as well: https://wiki.ubuntu.com/SponsorshipProcess