[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c348518609d032cd3e285a09d2fdd51514a6ea23
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 18:03:20 2010 +0000

    2010-12-29  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Ojan Vafai.
    
            prepare-ChangeLog should support the -g option for specifying the git-commit
            https://bugs.webkit.org/show_bug.cgi?id=51708
    
            Add a -g shortcut for the --git-commit prepare-ChangeLog option. This matches
            webkit-patch, though the exact meaning of the two options remain different.
    
            * Scripts/prepare-ChangeLog: Add -g.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3003f18..54e7fdc 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Ojan Vafai.
+
+        prepare-ChangeLog should support the -g option for specifying the git-commit
+        https://bugs.webkit.org/show_bug.cgi?id=51708
+
+        Add a -g shortcut for the --git-commit prepare-ChangeLog option. This matches
+        webkit-patch, though the exact meaning of the two options remain different.
+
+        * Scripts/prepare-ChangeLog: Add -g.
+
 2010-12-29  Kent Hansen  <kent.hansen at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog
index 2fc03d2..f7a82f3 100755
--- a/Tools/Scripts/prepare-ChangeLog
+++ b/Tools/Scripts/prepare-ChangeLog
@@ -117,7 +117,7 @@ my $parseOptionsResult =
                "name:s" => \$name,
                "email:s" => \$emailAddress,
                "merge-base:s" => \$mergeBase,
-               "git-commit:s" => \$gitCommit,
+               "git-commit|g:s" => \$gitCommit,
                "git-index" => \$gitIndex,
                "git-reviewer:s" => \$gitReviewer,
                "help|h!" => \$showHelp,
@@ -125,18 +125,18 @@ my $parseOptionsResult =
                "write!" => \$writeChangeLogs,
                "update!" => \$updateChangeLogs);
 if (!$parseOptionsResult || $showHelp) {
-    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";
-    print STDERR "  --git-index    Populate the ChangeLogs from the git index only\n";
-    print STDERR "  --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";
-    print STDERR "                 This option is useful when the git commit lacks a Signed-Off-By: line\n";
-    print STDERR "  -h|--help      Show this help message\n";
-    print STDERR "  -o|--open      Open ChangeLogs in an editor when done\n";
-    print STDERR "  --[no-]update  Update ChangeLogs from svn before adding entry (default: update)\n";
-    print STDERR "  --[no-]write   Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n";
+    print STDERR basename($0) . " [-b|--bug=<bugid>] [-d|--diff] [-h|--help] [-o|--open] [-g|--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 "  -g|--git-commit Populate the ChangeLogs from the specified git commit\n";
+    print STDERR "  --git-index     Populate the ChangeLogs from the git index only\n";
+    print STDERR "  --git-reviewer  When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n";
+    print STDERR "                  This option is useful when the git commit lacks a Signed-Off-By: line\n";
+    print STDERR "  -h|--help       Show this help message\n";
+    print STDERR "  -o|--open       Open ChangeLogs in an editor when done\n";
+    print STDERR "  --[no-]update   Update ChangeLogs from svn before adding entry (default: update)\n";
+    print STDERR "  --[no-]write    Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n";
     exit 1;
 }
 

-- 
WebKit Debian packaging