[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 30649477c41ff70e7e379efa3df2181010a93490
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 11:50:55 2009 +0000

    2009-10-19  Daniel Macks  <dmacks at netspace.org>
    
            Reviewed by Adam Barth.
    
            Inconsistent handling of gettext domain can cause compile failure
            https://bugs.webkit.org/show_bug.cgi?id=30292
    
            * GNUmakefile.am: Use DOMAIN variable instead of hard-coded value
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49773 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/po/ChangeLog b/WebKit/gtk/po/ChangeLog
index b0c89ab..d7eee3a 100644
--- a/WebKit/gtk/po/ChangeLog
+++ b/WebKit/gtk/po/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19  Daniel Macks  <dmacks at netspace.org>
+
+        Reviewed by Adam Barth.
+
+        Inconsistent handling of gettext domain can cause compile failure
+        https://bugs.webkit.org/show_bug.cgi?id=30292
+
+        * GNUmakefile.am: Use DOMAIN variable instead of hard-coded value
+
 2009-10-15  Jan Michael Alonzo  <jmalonzo at webkit.org>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/po/GNUmakefile.am b/WebKit/gtk/po/GNUmakefile.am
index 42beb24..2c5ff94 100644
--- a/WebKit/gtk/po/GNUmakefile.am
+++ b/WebKit/gtk/po/GNUmakefile.am
@@ -73,7 +73,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/WebKit/gtk/po/POTFILES
 	      --files-from=$(srcdir)/WebKit/gtk/po/POTFILES \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
-	      --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/webkit.pot \
+	      --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot \
 	    ;; \
 	  *) \
 	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
@@ -83,7 +83,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/WebKit/gtk/po/POTFILES
 	      --package-name="$${package_gnu}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
-	      --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/webkit.pot \
+	      --keyword=_ --keyword=N_ -o $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot \
 	    ;; \
 	esac
 

-- 
WebKit Debian packaging