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

aroben at apple.com aroben at apple.com
Wed Dec 22 17:52:41 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 18081bbdfc45e22224f2374dc803216a2344fc06
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 23:08:52 2010 +0000

    Teach git to ignore files installed by WebKitSupportLibrary and WebKitAuxiliaryLibrary
    
    Fixes <http://webkit.org/b/50348> Git complains about lots of
    untracked files in WebKitLibraries/win
    
    Reviewed by Steve Falkenburg.
    
    * .gitignore: Added files from these libraries.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index 68133fb..823a467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,49 @@ LayoutTests/java/*.class
 /gtk-doc.make
 /INSTALL
 /README
+
+# Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary
+/WebKitSupportLibrary.zip
+/WebKitLibraries/win/Software License Agreement for WebKit Support Libraries.rtf
+/WebKitLibraries/win/WebKitChangesToPthreads.diff
+/WebKitLibraries/win/include/ApplicationServices/
+/WebKitLibraries/win/include/AssertMacros.h
+/WebKitLibraries/win/include/Availability.h
+/WebKitLibraries/win/include/AvailabilityInternal.h
+/WebKitLibraries/win/include/AvailabilityMacros.h
+/WebKitLibraries/win/include/CFNetwork/
+/WebKitLibraries/win/include/ColorSync/
+/WebKitLibraries/win/include/ConditionalMacros.h
+/WebKitLibraries/win/include/CoreFoundation/
+/WebKitLibraries/win/include/CoreGraphics/
+/WebKitLibraries/win/include/CoreServices/
+/WebKitLibraries/win/include/ImageIO/
+/WebKitLibraries/win/include/QuartzCore/
+/WebKitLibraries/win/include/SQLite/
+/WebKitLibraries/win/include/SafariTheme/
+/WebKitLibraries/win/include/TargetConditionals.h
+/WebKitLibraries/win/include/checkint.h
+/WebKitLibraries/win/include/dispatch/
+/WebKitLibraries/win/include/inttypes.h
+/WebKitLibraries/win/include/libxml/
+/WebKitLibraries/win/include/libxslt/
+/WebKitLibraries/win/include/pthreads/
+/WebKitLibraries/win/include/stdbool.h
+/WebKitLibraries/win/include/stdint.h
+/WebKitLibraries/win/include/unicode/
+/WebKitLibraries/win/include/unistd.h
+/WebKitLibraries/win/include/xlocale.h
+/WebKitLibraries/win/include/zlib/
+/WebKitLibraries/win/lib/CFNetwork.lib
+/WebKitLibraries/win/lib/CoreFoundation.lib
+/WebKitLibraries/win/lib/CoreGraphics.lib
+/WebKitLibraries/win/lib/QuartzCore.lib
+/WebKitLibraries/win/lib/SQLite3.lib
+/WebKitLibraries/win/lib/SafariTheme.lib
+/WebKitLibraries/win/lib/icuin.lib
+/WebKitLibraries/win/lib/icuuc.lib
+/WebKitLibraries/win/lib/libdispatch.lib
+/WebKitLibraries/win/lib/libxml2.lib
+/WebKitLibraries/win/lib/libxslt.lib
+/WebKitLibraries/win/lib/pthreadVC2.lib
+/WebKitLibraries/win/lib/zdll.lib
diff --git a/ChangeLog b/ChangeLog
index 2d6fa8d..5470269 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-01  Adam Roben  <aroben at apple.com>
+
+        Teach git to ignore files installed by WebKitSupportLibrary and
+        WebKitAuxiliaryLibrary
+
+        Fixes <http://webkit.org/b/50348> Git complains about lots of
+        untracked files in WebKitLibraries/win
+
+        Reviewed by Steve Falkenburg.
+
+        * .gitignore: Added files from these libraries.
+
 2010-12-01  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Adam Roben.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list