[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

kov at webkit.org kov at webkit.org
Thu Apr 8 02:18:03 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 3220fd70eccce11b36508596ba65fd1d697431e7
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 21:25:36 2010 +0000

    Unreviewed. Versioning, and documentation control files update for 1.1.23.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8ddd3cf..e3b807a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-03-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
+        Unreviewed. Versioning for 1.1.23.
+
+        * configure.ac:
+
+2010-03-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
         Unreviewed distcheck fix.
 
         * GNUmakefile.am:
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 94ec288..b83babd 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Unreviewed. Documentation control files update for 1.1.23.
+
+        * docs/webkitgtk-docs.sgml:
+
 2010-03-08  Csaba Osztrogonác  <ossy at webkit.org>
 
         [GTK] Unreviewed buildfix after r55688.
diff --git a/WebKit/gtk/docs/webkitgtk-docs.sgml b/WebKit/gtk/docs/webkitgtk-docs.sgml
index 6c84dcb..fb9ae09 100644
--- a/WebKit/gtk/docs/webkitgtk-docs.sgml
+++ b/WebKit/gtk/docs/webkitgtk-docs.sgml
@@ -104,4 +104,7 @@
   <index id="index-1.1.20" role="1.1.20">
     <title>Index of new symbols in 1.1.20</title>
   </index>
+  <index id="index-1.1.23" role="1.1.23">
+    <title>Index of new symbols in 1.1.23</title>
+  </index>
 </book>
diff --git a/configure.ac b/configure.ac
index f0f11bf..9405123 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
 m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [22])
+m4_define([webkit_micro_version], [23])
 
 # This is the version we'll be using as part of our User-Agent string
 # e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -35,7 +35,7 @@ AC_CONFIG_SRCDIR([WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
 dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=18:0:16
+LIBWEBKITGTK_VERSION=19:0:17
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list