[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[joepeck at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c7bc540a4df64e62cc8d50fc0be795f71541653e
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 11 02:02:47 2010 +0000

    2010-12-10  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by Darin Adler.
    
            prepare-ChangeLog --help doesn't mention --bug shorthand -b
            https://bugs.webkit.org/show_bug.cgi?id=50835
    
            * Scripts/prepare-ChangeLog: be more explicit about -b and match file style.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3de173c..9d41cf2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-10  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        prepare-ChangeLog --help doesn't mention --bug shorthand -b
+        https://bugs.webkit.org/show_bug.cgi?id=50835
+
+        * Scripts/prepare-ChangeLog: be more explicit about -b and match file style.
+
 2010-12-10  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index ad84e4f..2fc03d2 100755
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -113,7 +113,7 @@ my $spewDiff = $ENV{"PREPARE_CHANGELOG_DIFF"};
 my $updateChangeLogs = 1;
 my $parseOptionsResult =
     GetOptions("diff|d!" => \$spewDiff,
-               "bug:i" => \$bugNumber,
+               "bug|b:i" => \$bugNumber,
                "name:s" => \$name,
                "email:s" => \$emailAddress,
                "merge-base:s" => \$mergeBase,
@@ -125,8 +125,8 @@ my $parseOptionsResult =
                "write!" => \$writeChangeLogs,
                "update!" => \$updateChangeLogs);
 if (!$parseOptionsResult || $showHelp) {
-    print STDERR basename($0) . " [--bug] [-d|--diff] [-h|--help] [-o|--open] [--git-commit=<committish>] [--git-reviewer=<name>] [svndir1 [svndir2 ...]]\n";
-    print STDERR "  --bug          Fill in the ChangeLog bug information from the given bug.\n";
+    print STDERR basename($0) . " [-b|--bug=<bugid>] [-d|--diff] [-h|--help] [-o|--open] [--git-commit=<committish>] [--git-reviewer=<name>] [svndir1 [svndir2 ...]]\n";
+    print STDERR "  -b|--bug       Fill in the ChangeLog bug information from the given bug.\n";
     print STDERR "  -d|--diff      Spew diff to stdout when running\n";
     print STDERR "  --merge-base   Populate the ChangeLogs with the diff to this branch\n";
     print STDERR "  --git-commit   Populate the ChangeLogs from the specified git commit\n";

-- 
WebKit Debian packaging