r143 - /web/deps/dep3.mdwn

[hertzog at users.alioth.debian.org]

Author: hertzog
Date: Fri Apr 16 20:47:18 2010
New Revision: 143

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=143
Log:
Add new Applied-Upstream field.

Modified:
    web/deps/dep3.mdwn

Modified: web/deps/dep3.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep3.mdwn?rev=143&op=diff
==============================================================================
--- web/deps/dep3.mdwn (original)
+++ web/deps/dep3.mdwn Fri Apr 16 20:47:18 2010
@@ -178,6 +178,14 @@
     This field can be used to record the date when the meta-information
     was last updated. It should use the ISO date format `YYYY-MM-DD`.
 
+  * `Applied-Upstream` (optional)
+
+    This field can be used to document the fact that the patch has been
+    applied upstream. It may contain the upstream version expected to
+    contain this patch, or the URL or commit identifier of the upstream
+    commit (with commit identifiers prefixed with "commit:", as in the
+    `Origin` field), or both separated by a comma and a space.
+
 Sample DEP-3 compliant headers
 ------------------------------
 
@@ -216,6 +224,15 @@
     Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=80;bug=265678
     Bug-Debian: http://bugs.debian.org/265678
     Author: Thiemo Seufer <ths at debian.org>
+
+A patch submitted and applied upstream:
+
+    Description: Fix widget frobnication speeds
+     Frobnicating widgets too quickly tended to cause explosions.
+    Forwarded: http://lists.example.com/2010/03/1234.html
+    Author: John Doe <johndoe-guest at users.alioth.debian.org>
+    Applied-Upstream: 1.2, http://bzr.example.com/frobnicator/trunk/revision/123
+    Last-Update: 2010-03-29
 
 Related links
 -------------
@@ -246,3 +263,4 @@
   approval of the change.
 * 2009-11-26: Enforce UTF-8 usage for the meta-information and recommend
   ASCII when the patch contains non-UTF-8 characters.
+* 2010-04-16: Add the Applied-Upstream field.