From 96e8c1f8ad14a6205a0ea885ace896c6e3e996cf Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Fri, 27 Sep 2013 15:40:03 -0600
Subject: [PATCH 1/2] Switch to rustpkg.

---
 io_surface.rc => lib.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename io_surface.rc => lib.rs (97%)

diff --git a/io_surface.rc b/lib.rs
similarity index 97%
rename from io_surface.rc
rename to lib.rs
index 51151b1..2d9c331 100644
--- a/io_surface.rc
+++ b/lib.rs
@@ -7,14 +7,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[link(name = "io_surface",
-	   vers = "0.1")];
-#[crate_type = "lib"];
-
-extern mod core_foundation;
-extern mod geom;
-extern mod opengles;
 extern mod std;
+extern mod core_foundation = "rust-core-foundation";
+extern mod geom = "rust-geom";
+extern mod opengles = "rust-opengles";
 
 // Rust bindings to the IOSurface framework on Mac OS X.
 

From b4df5c4703de7bd74968ea14d40903f53ce31622 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Wed, 6 Nov 2013 17:49:44 -0800
Subject: [PATCH 2/2] Remove old build system

---
 Makefile.in | 31 -------------------------------
 configure   |  5 -----
 2 files changed, 36 deletions(-)
 delete mode 100644 Makefile.in
 delete mode 100644 configure

diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index c6bc0b8..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-VPATH=%VPATH%
-
-CC ?= gcc
-CXX ?= g++
-CXXFLAGS ?=
-AR ?= ar
-RUSTC ?= rustc
-RUSTFLAGS ?=
-
-RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
-
-.PHONY: all
-all:	librustiosurface.dummy
-
-%.o:	%.c
-	$(CC) $< -o $@ -c $(CFLAGS)
-
-librustiosurface.dummy: io_surface.rc $(RUST_SRC)
-	$(RUSTC) $(RUSTFLAGS) $< --out-dir .
-	touch $@
-
-rustiosurface-test: io_surface.rc $(RUST_SRC)
-	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
-
-check: rustiosurface-test
-	./rustiosurface-test
-
-.PHONY: clean
-clean:
-	rm -f *.o *.a *.so *.dylib *.dll *.dummy rustiosurface-test
-
diff --git a/configure b/configure
deleted file mode 100644
index ed6c06e..0000000
--- a/configure
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-SRCDIR="$(cd $(dirname $0) && pwd)"
-sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
-