From 40f26cf63eb8a093a3aed1df28f7aec21f8b6c11 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Mon, 15 Oct 2012 15:49:47 -0700
Subject: [PATCH] Move rust-css to rust-netsurfcss

---
 .gitmodules         | 6 +++---
 configure           | 2 +-
 mk/sub.mk           | 2 +-
 src/rust-css        | 1 -
 src/rust-netsurfcss | 1 +
 src/servo/servo.rc  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 160000 src/rust-css
 create mode 160000 src/rust-netsurfcss

diff --git a/.gitmodules b/.gitmodules
index 4f82a162380..d92cb9838f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,6 +59,6 @@
     path = src/libcss
     url = git://github.com/pcwalton/libcss.git
 
-[submodule "src/rust-css"]
-	path = src/rust-css
-	url = git://github.com/brson/rust-css.git
+[submodule "src/rust-netsurfcss"]
+	path = src/rust-netsurfcss
+	url = git://github.com/brson/rust-netsurfcss.git
diff --git a/configure b/configure
index 6fd6463e0db..f2664052464 100755
--- a/configure
+++ b/configure
@@ -344,7 +344,7 @@ step_msg "running submodule autoconf scripts"
 
 (cd ${CFG_SRC_DIR}src/mozjs/js/src && "${CFG_AUTOCONF213}") || exit $?
 
-CFG_SUBMODULES="libwapcaplet rust-harfbuzz rust-opengles rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-css servo-sandbox rust-hubbub sharegl rust-mozjs mozjs"
+CFG_SUBMODULES="libwapcaplet rust-harfbuzz rust-opengles rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss servo-sandbox rust-hubbub sharegl rust-mozjs mozjs"
 
 if [ $CFG_OSTYPE = "darwin" ]
 then
diff --git a/mk/sub.mk b/mk/sub.mk
index 2848d8bf950..5b3861c8bd6 100644
--- a/mk/sub.mk
+++ b/mk/sub.mk
@@ -21,7 +21,7 @@ DEPS_servo-sandbox += \
 DEPS_rust-hubbub += \
 	libhubbub
 
-DEPS_rust-css += \
+DEPS_rust-netsurfcss += \
 	libcss
 
 CFLAGS_mozjs += \
diff --git a/src/rust-css b/src/rust-css
deleted file mode 160000
index 0424ff2d467..00000000000
--- a/src/rust-css
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0424ff2d46795d7d3c374b41cf258266fb486e08
diff --git a/src/rust-netsurfcss b/src/rust-netsurfcss
new file mode 160000
index 00000000000..4da616ec41a
--- /dev/null
+++ b/src/rust-netsurfcss
@@ -0,0 +1 @@
+Subproject commit 4da616ec41a9f8ae2a83ae5a21e9383dbf5ed175
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index 9e3b80e26c6..30be7d471d8 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -18,7 +18,7 @@ extern mod opengles;
 extern mod http_client;
 extern mod hubbub;
 extern mod sharegl;
-extern mod cssparser (name = "css");
+extern mod netsurfcss;
 
 pub mod engine;