[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mrobinson at webkit.org mrobinson at webkit.org
Wed Dec 22 11:33:51 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5a8a89476f7fecf371ca575396f31f40cd62a0e6
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 16:07:11 2010 +0000

    2010-07-29  Martin Robinson  <mrobinson at igalia.com>
    
            Unreviewed build fix.
    
            Fix installation of autogenerated header files.
    
            * GNUmakefile.am: Fix autogenerated header file installation.
    2010-07-29  Martin Robinson  <mrobinson at igalia.com>
    
            Unreviewed build fix.
    
            Include a missing header in the source list to fix 'make dist.'
    
            * GNUmakefile.am: Include missing header.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64281 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 4930782..335e41c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Unreviewed build fix.
+
+        Fix installation of autogenerated header files.
+
+        * GNUmakefile.am: Fix autogenerated header file installation.
+
 2010-07-27  Martin Robinson  <mrobinson at igalia.com>
 
         Unreviewed build fix.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 0a2721b..1910d1b 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -214,7 +214,10 @@ nodist_libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_
 
 libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit- at WEBKITGTK_API_VERSION@/webkit
 libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
-	$(webkitgtk_static_h_api) \
+	$(webkitgtk_static_h_api)
+
+nodist_libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
+	$(webkitgtk_built_h_api) \
 	WebKit/gtk/webkit/webkitenumtypes.h
 
 libwebkitgtk_ at WEBKITGTK_API_MAJOR_VERSION@_ at WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2e8c1d1..4ca763c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Unreviewed build fix.
+
+        Include a missing header in the source list to fix 'make dist.'
+
+        * GNUmakefile.am: Include missing header.
+
 2010-07-28  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 98f491c..1dd15e4 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -409,6 +409,7 @@ javascriptcore_sources += \
 	JavaScriptCore/wtf/Assertions.h \
 	JavaScriptCore/wtf/Atomics.h \
 	JavaScriptCore/wtf/AVLTree.h \
+	JavaScriptCore/wtf/BumpPointerAllocator.h \
 	JavaScriptCore/wtf/ByteArray.cpp \
 	JavaScriptCore/wtf/ByteArray.h \
 	JavaScriptCore/wtf/CrossThreadRefCounted.h \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list