Title: [96004] releases/WebKitGTK/webkit-1.6
- Revision
- 96004
- Author
- a...@webkit.org
- Date
- 2011-09-26 15:19:05 -0700 (Mon, 26 Sep 2011)
Log Message
Merging http://trac.webkit.org/changeset/95996
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.6/ChangeLog (96003 => 96004)
--- releases/WebKitGTK/webkit-1.6/ChangeLog 2011-09-26 22:16:39 UTC (rev 96003)
+++ releases/WebKitGTK/webkit-1.6/ChangeLog 2011-09-26 22:19:05 UTC (rev 96004)
@@ -1,3 +1,15 @@
+2011-09-26 Alejandro G. Castro <a...@igalia.com>
+
+ [GTK] pot file is not properly remove during distcheck
+ https://bugs.webkit.org/show_bug.cgi?id=68797
+
+ Defined DOMAIN variable before DISTCLEANFILES because we are using
+ it there to identify the .pot file.
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+
2011-09-20 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Update NEWS and configure.ac for 1.5.90 release
Modified: releases/WebKitGTK/webkit-1.6/GNUmakefile.am (96003 => 96004)
--- releases/WebKitGTK/webkit-1.6/GNUmakefile.am 2011-09-26 22:16:39 UTC (rev 96003)
+++ releases/WebKitGTK/webkit-1.6/GNUmakefile.am 2011-09-26 22:19:05 UTC (rev 96004)
@@ -89,6 +89,7 @@
EXTRA_DIST :=
BUILT_SOURCES :=
CLEANFILES :=
+DOMAIN :=
DISTCLEANFILES :=
MAINTAINERCLEANFILES :=
pkgconfig_DATA :=
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/po/ChangeLog (96003 => 96004)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/po/ChangeLog 2011-09-26 22:16:39 UTC (rev 96003)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/po/ChangeLog 2011-09-26 22:19:05 UTC (rev 96004)
@@ -1,3 +1,14 @@
+2011-09-26 Alejandro G. Castro <a...@igalia.com>
+
+ [GTK] pot file is not properly remove during distcheck
+ https://bugs.webkit.org/show_bug.cgi?id=68797
+
+ DOMAIN is already defined, we just add the value to the variable.
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am:
+
2011-09-19 Gustavo Noronha Silva <g...@gnome.org>
Fix paths used by update-po, and avoid changing directory
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/po/GNUmakefile.am (96003 => 96004)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/po/GNUmakefile.am 2011-09-26 22:16:39 UTC (rev 96003)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit/gtk/po/GNUmakefile.am 2011-09-26 22:19:05 UTC (rev 96004)
@@ -15,7 +15,7 @@
#
# Origin: gettext-0.17
-DOMAIN := $(GETTEXT_PACKAGE)
+DOMAIN += $(GETTEXT_PACKAGE)
MSGFMT := $(shell which msgfmt)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
