Title: [106322] releases/WebKitGTK/webkit-1.6
- Revision
- 106322
- Author
- [email protected]
- Date
- 2012-01-30 19:28:31 -0800 (Mon, 30 Jan 2012)
Log Message
Small build fixes.
* configure.ac: Correct the version number to be 1.6.2 and fix
a bad merge of gtkdoc patches.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.6/ChangeLog (106321 => 106322)
--- releases/WebKitGTK/webkit-1.6/ChangeLog 2012-01-31 03:14:19 UTC (rev 106321)
+++ releases/WebKitGTK/webkit-1.6/ChangeLog 2012-01-31 03:28:31 UTC (rev 106322)
@@ -1,3 +1,10 @@
+2012-01-30 Martin Robinson <[email protected]>
+
+ Small build fixes.
+
+ * configure.ac: Correct the version number to be 1.6.2 and fix
+ a bad merge of gtkdoc patches.
+
2012-01-30 Priit Laes <[email protected]>
[GTK] Create .xz tarballs during distcheck
Modified: releases/WebKitGTK/webkit-1.6/configure.ac (106321 => 106322)
--- releases/WebKitGTK/webkit-1.6/configure.ac 2012-01-31 03:14:19 UTC (rev 106321)
+++ releases/WebKitGTK/webkit-1.6/configure.ac 2012-01-31 03:28:31 UTC (rev 106322)
@@ -2,7 +2,7 @@
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [6])
-m4_define([webkit_micro_version], [1])
+m4_define([webkit_micro_version], [2])
# This is the version we'll be using as part of our User-Agent string
# e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -1184,13 +1184,10 @@
AC_CONFIG_FILES([
-Documentation/version.xml:Source/WebKit/gtk/docs/version.xml.in
-])
-
-AC_CONFIG_FILES([
Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in
Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in
Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in
+Documentation/version.xml:Source/WebKit/gtk/docs/version.xml.in
Source/_javascript_Core/_javascript_coregtk-${WEBKITGTK_API_VERSION}.pc:Source/_javascript_Core/_javascript_coregtk.pc.in
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
@@ -1200,8 +1197,6 @@
if test "$enable_webkit2" = "yes"; then
AC_CONFIG_FILES([
Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
- Source/WebKit2/UIProcess/API/gtk/docs/version.xml
- Source/WebKit2/UIProcess/API/gtk/docs/GNUmakefile
]
,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
