Merge pull request #313 from tomaka/crates-io

Pull all dependencies from crates.io

4 files changed, 13 insertions, 44 deletions

diff --git a/.travis.yml b/.travis.yml
index 00d5bb6..0a7ad4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,5 +29,4 @@ after_success:
   - |
       [ $TRAVIS_BRANCH = master ] &&
       [ $TRAVIS_PULL_REQUEST = false ] &&
-      patch Cargo.toml < preupload.patch &&
       cargo publish --token ${CRATESIO_TOKEN}
diff --git a/Cargo.toml b/Cargo.toml
index af7e024..2271bf6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "glutin"
-version = "0.0.8"
+version = "0.0.9"
 authors = ["tomaka <pierre.krieger1708@gmail.com>"]
 description = "Cross-plaform OpenGL context provider. Important: the crates.io only supports Windows and Linux for the moment."
 keywords = ["windowing", "opengl"]
@@ -28,25 +28,25 @@ khronos_api = "*"
 clock_ticks = "*"
 
 [target.arm-linux-androideabi.dependencies.android_glue]
-git = "https://github.com/tomaka/android-rs-glue"
+version = "0"
 
-[target.i686-apple-darwin.dependencies.cocoa]
-git = "https://github.com/servo/rust-cocoa"
+[target.i686-apple-darwin.dependencies.glutin_cocoa]
+version = "0"
 
-[target.x86_64-apple-darwin.dependencies.cocoa]
-git = "https://github.com/servo/rust-cocoa"
+[target.x86_64-apple-darwin.dependencies.glutin_cocoa]
+version = "0"
 
-[target.i686-apple-darwin.dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
+[target.i686-apple-darwin.dependencies.glutin_core_graphics]
+version = "0"
 
-[target.x86_64-apple-darwin.dependencies.core_graphics]
-git = "https://github.com/servo/rust-core-graphics"
+[target.x86_64-apple-darwin.dependencies.glutin_core_graphics]
+version = "0"
 
 [target.i686-apple-darwin.dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
+version = "0"
 
 [target.x86_64-apple-darwin.dependencies.core_foundation]
-git = "https://github.com/servo/rust-core-foundation"
+version = "0"
 
 [target.i686-pc-windows-gnu.dependencies]
 winapi = "0.1"
diff --git a/preupload.patch b/preupload.patch
deleted file mode 100644
index fd68a98..0000000
--- a/preupload.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Cargo.toml.old	2015-02-15 14:00:02.613705211 +0100
-+++ Cargo.toml	2015-02-15 14:00:07.309705073 +0100
-@@ -27,27 +27,6 @@
- [dev-dependencies]
- clock_ticks = "*"
- 
--[target.arm-linux-androideabi.dependencies.android_glue]
--git = "https://github.com/tomaka/android-rs-glue"
--
--[target.i686-apple-darwin.dependencies.cocoa]
--git = "https://github.com/servo/rust-cocoa"
--
--[target.x86_64-apple-darwin.dependencies.cocoa]
--git = "https://github.com/servo/rust-cocoa"
--
--[target.i686-apple-darwin.dependencies.core_graphics]
--git = "https://github.com/servo/rust-core-graphics"
--
--[target.x86_64-apple-darwin.dependencies.core_graphics]
--git = "https://github.com/servo/rust-core-graphics"
--
--[target.i686-apple-darwin.dependencies.core_foundation]
--git = "https://github.com/servo/rust-core-foundation"
--
--[target.x86_64-apple-darwin.dependencies.core_foundation]
--git = "https://github.com/servo/rust-core-foundation"
--
- [target.i686-pc-windows-gnu.dependencies]
- winapi = "0.1"
- gdi32-sys = "*"
diff --git a/src/lib.rs b/src/lib.rs
index 10727d1..916b699 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -42,7 +42,7 @@ extern crate cocoa;
 #[cfg(target_os = "macos")]
 extern crate core_foundation;
 #[cfg(target_os = "macos")]
-extern crate core_graphics;
+extern crate "glutin_core_graphics" as core_graphics;
 
 pub use events::*;
 #[cfg(feature = "headless")]