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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d98afc970025e539a5243e21f7aa89f2b8f9b21a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 18:19:33 2009 +0000

    2009-10-30  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Patch v1 is a dumb default name for patches
            https://bugs.webkit.org/show_bug.cgi?id=30952
    
            Let's use "Patch" instead.
    
            * Scripts/bugzilla-tool:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50346 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4618b32..189cda4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-30  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Patch v1 is a dumb default name for patches
+        https://bugs.webkit.org/show_bug.cgi?id=30952
+
+        Let's use "Patch" instead.
+
+        * Scripts/bugzilla-tool:
+
 2009-10-30  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
 
         Unreviewed trivial buildfix.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index 8e899b5..cffcc80 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -448,7 +448,7 @@ class PostDiffAsPatchToBug(Command):
         diff = tool.scm().create_patch()
         diff_file = StringIO.StringIO(diff) # add_patch_to_bug expects a file-like object
 
-        description = options.description or "Patch v1"
+        description = options.description or "Patch"
         tool.bugs.add_patch_to_bug(bug_id, diff_file, description, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
 
 
@@ -590,7 +590,7 @@ class CreateBug(Command):
 
         diff = tool.scm().create_patch_from_local_commit(commit_id)
         diff_file = StringIO.StringIO(diff) # create_bug_with_patch expects a file-like object
-        bug_id = tool.bugs.create_bug_with_patch(bug_title, comment_text, options.component, diff_file, "Patch v1", cc=options.cc, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
+        bug_id = tool.bugs.create_bug_with_patch(bug_title, comment_text, options.component, diff_file, "Patch", cc=options.cc, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
 
         if bug_id and len(commit_ids) > 1:
             options.bug_id = bug_id
@@ -610,7 +610,7 @@ class CreateBug(Command):
 
         diff = tool.scm().create_patch()
         diff_file = StringIO.StringIO(diff) # create_bug_with_patch expects a file-like object
-        bug_id = tool.bugs.create_bug_with_patch(bug_title, comment_text, options.component, diff_file, "Patch v1", cc=options.cc, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
+        bug_id = tool.bugs.create_bug_with_patch(bug_title, comment_text, options.component, diff_file, "Patch", cc=options.cc, mark_for_review=options.review, mark_for_commit_queue=options.request_commit)
 
     def prompt_for_bug_title_and_comment(self):
         bug_title = raw_input("Bug title: ")

-- 
WebKit Debian packaging