[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ae5e967fc5e48f801bccd51d2f6348135da784cd
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 09:51:01 2010 +0000

    2010-01-07  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Maciej Stachowiak.
    
            Add prepare and post to webkit-patch main help
            https://bugs.webkit.org/show_bug.cgi?id=33313
    
            * Scripts/webkitpy/commands/upload.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52909 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8f4921a..0927b7a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-07  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Add prepare and post to webkit-patch main help
+        https://bugs.webkit.org/show_bug.cgi?id=33313
+
+        * Scripts/webkitpy/commands/upload.py:
+
 2010-01-07  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/commands/upload.py b/WebKitTools/Scripts/webkitpy/commands/upload.py
index a689d55..2fbfefe 100644
--- a/WebKitTools/Scripts/webkitpy/commands/upload.py
+++ b/WebKitTools/Scripts/webkitpy/commands/upload.py
@@ -113,6 +113,7 @@ class Post(AbstractPatchUploadingCommand):
     name = "post"
     help_text = "Attach the current working directory diff to a bug as a patch file"
     argument_names = "[BUGID]"
+    show_in_main_help = True
     steps = [
         steps.ConfirmDiff,
         steps.ObsoletePatches,
@@ -131,6 +132,7 @@ class Prepare(AbstractSequencedCommmand):
     name = "prepare"
     help_text = "Creates a bug (or prompts for an existing bug) and prepares the ChangeLogs"
     argument_names = "[BUGID]"
+    show_in_main_help = True
     steps = [
         steps.PromptForBugOrTitle,
         steps.CreateBug,

-- 
WebKit Debian packaging