[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

abarth at webkit.org abarth at webkit.org
Fri Jan 21 14:42:51 UTC 2011 

The following commit has been merged in the debian/experimental branch:
commit e897991cf091f5c5ca255461c8e2098829b164c9
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 27 07:24:31 2010 +0000

    2010-12-26  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [Meta] Move source code into Sources
            https://bugs.webkit.org/show_bug.cgi?id=51606
    
            * PrettyPatch/PrettyPatch.rb:
              - Remove reference to non-existant autotools directory.
    2010-12-26  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Siedel.
    
            [Meta] Move source code into Sources
            https://bugs.webkit.org/show_bug.cgi?id=51606
    
            * .gitignore:
            * GNUmakefile.am:
            * Sources/autotools: Copied from autotools.
            * autogen.sh:
            * autotools: Removed.
            * autotools/acinclude.m4: Removed.
            * autotools/dolt.m4: Removed.
            * autotools/gsettings.m4: Removed.
            * autotools/symbols.filter: Removed.
            * autotools/webkit.m4: Removed.
            * configure.ac:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/.gitignore b/.gitignore
index 32dbe0d..2fac9d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,19 +72,19 @@ LayoutTests/java/*.class
 # a few files into the source tree.
 /aclocal.m4
 /autom4te.cache
-/autotools/compile
-/autotools/config.guess
-/autotools/config.sub
-/autotools/depcomp
-/autotools/gtk-doc.m4
-/autotools/install-sh
-/autotools/libtool.m4
-/autotools/ltmain.sh
-/autotools/ltoptions.m4
-/autotools/ltsugar.m4
-/autotools/ltversion.m4
-/autotools/lt~obsolete.m4
-/autotools/missing
+/Sources/autotools/compile
+/Sources/autotools/config.guess
+/Sources/autotools/config.sub
+/Sources/autotools/depcomp
+/Sources/autotools/gtk-doc.m4
+/Sources/autotools/install-sh
+/Sources/autotools/libtool.m4
+/Sources/autotools/ltmain.sh
+/Sources/autotools/ltoptions.m4
+/Sources/autotools/ltsugar.m4
+/Sources/autotools/ltversion.m4
+/Sources/autotools/lt~obsolete.m4
+/Sources/autotools/missing
 /autotoolsconfig.h.in
 /configure
 /GNUmakefile.in
diff --git a/ChangeLog b/ChangeLog
index 3dca706..55c2128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2010-12-26  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Siedel.
+
+        [Meta] Move source code into Sources
+        https://bugs.webkit.org/show_bug.cgi?id=51606
+
+        * .gitignore:
+        * GNUmakefile.am:
+        * Sources/autotools: Copied from autotools.
+        * autogen.sh:
+        * autotools: Removed.
+        * autotools/acinclude.m4: Removed.
+        * autotools/dolt.m4: Removed.
+        * autotools/gsettings.m4: Removed.
+        * autotools/symbols.filter: Removed.
+        * autotools/webkit.m4: Removed.
+        * configure.ac:
+
+2010-12-26  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         Move cmake into Sources
diff --git a/GNUmakefile.am b/GNUmakefile.am
index b569e89..2db5848 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -102,7 +102,7 @@ version_script = -export-symbols-regex "^(webkit_|k?JS).*"
 endif
 
 if OS_GNU
-version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter
+version_script = -Wl,--version-script,$(srcdir)/Sources/autotools/symbols.filter
 endif
 
 # Convenience libraries
@@ -196,7 +196,7 @@ global_cppflags += \
 endif
 
 EXTRA_DIST += \
-	$(srcdir)/autotools/symbols.filter \
+	$(srcdir)/Sources/autotools/symbols.filter \
 	$(srcdir)/gtk-doc.make \
 	$(srcdir)/WebKit/LICENSE
 
@@ -227,11 +227,11 @@ MAINTAINERCLEANFILES += \
 	$(builddir)/doltcompile \
 	$(builddir)/doltlibtool \
 	$(srcdir)/aconfig.h.in \
-	$(srcdir)/autotools/config.* \
-	$(srcdir)/autotools/compile \
-	$(srcdir)/autotools/depcomp \
-	$(srcdir)/autotools/install-sh \
-	$(srcdir)/autotools/missing \
+	$(srcdir)/Sources/autotools/config.* \
+	$(srcdir)/Sources/autotools/compile \
+	$(srcdir)/Sources/autotools/depcomp \
+	$(srcdir)/Sources/autotools/install-sh \
+	$(srcdir)/Sources/autotools/missing \
 	$(srcdir)/configure \
 	$(srcdir)/GNUmakefile.in \
 	$(srcdir)/INSTALL \
diff --git a/autotools/acinclude.m4 b/Sources/autotools/acinclude.m4
similarity index 100%
rename from autotools/acinclude.m4
rename to Sources/autotools/acinclude.m4
diff --git a/autotools/dolt.m4 b/Sources/autotools/dolt.m4
similarity index 100%
rename from autotools/dolt.m4
rename to Sources/autotools/dolt.m4
diff --git a/autotools/gsettings.m4 b/Sources/autotools/gsettings.m4
similarity index 100%
rename from autotools/gsettings.m4
rename to Sources/autotools/gsettings.m4
diff --git a/autotools/symbols.filter b/Sources/autotools/symbols.filter
similarity index 100%
rename from autotools/symbols.filter
rename to Sources/autotools/symbols.filter
diff --git a/autotools/webkit.m4 b/Sources/autotools/webkit.m4
similarity index 100%
rename from autotools/webkit.m4
rename to Sources/autotools/webkit.m4
diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index 8f938c6..bc20ec3 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Eric Seidel.
 
+        [Meta] Move source code into Sources
+        https://bugs.webkit.org/show_bug.cgi?id=51606
+
+        * PrettyPatch/PrettyPatch.rb:
+          - Remove reference to non-existant autotools directory.
+
+2010-12-26  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         Move cmake into Sources
         https://bugs.webkit.org/show_bug.cgi?id=51631
 
diff --git a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
index 3e8e090..5d7f030 100644
--- a/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
+++ b/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb
@@ -76,7 +76,6 @@ private
         WebKit2
         WebKitLibraries
         Websites
-        autotools
     ]
 
     def self.find_url_and_path(file_path)
diff --git a/autogen.sh b/autogen.sh
index 60b163d..0496fec 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ cd $srcdir
 
 GTKDOCIZE_FLAGS="--copy"
 LIBTOOLIZE_FLAGS="--force --automake"
-ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS"
+ACLOCAL_FLAGS="-I Sources/autotools $ACLOCAL_FLAGS"
 AUTOMAKE_FLAGS="--foreign --add-missing"
 
 DIE=0
diff --git a/configure.ac b/configure.ac
index 9a45d0c..9724adc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,9 +13,9 @@ m4_define([webkit_user_agent_minor_version], [7])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
-AC_CONFIG_MACRO_DIR([autotools])
-AC_CONFIG_AUX_DIR([autotools])
-AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools")
+AC_CONFIG_MACRO_DIR([Sources/autotools])
+AC_CONFIG_AUX_DIR([Sources/autotools])
+AC_SUBST(ACLOCAL_AMFLAGS, "-I Sources/autotools")
 
 AC_CONFIG_HEADERS([autotoolsconfig.h])
 AC_CANONICAL_HOST

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list