From 22e519566e0262c14f3b181ec0e192be38abb05b Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <github@srid.name>
Date: Sat, 14 Jun 2014 23:39:34 -0700
Subject: [PATCH] Fix tomb import

has moved from launchpad.net (now down) to GitHub, and accessible as
gopkg.in/tomb.v1

closes #33
---
 Dockerfile       | 11 ++++-------
 deps.json        |  9 +++++----
 tail.go          |  2 +-
 watch/inotify.go |  2 +-
 watch/polling.go |  2 +-
 watch/watch.go   |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 277dbf9..33b72df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,9 @@
-# -*- sh -*-
-
-FROM ubuntu:13.10
-
-RUN echo "deb http://archive.ubuntu.com/ubuntu quantal main universe" >> /etc/apt/sources.list
+FROM ubuntu
 
 RUN apt-get -qy update
-RUN apt-get -qy install golang-go
-RUN apt-get -qy install git mercurial bzr subversion
+RUN apt-get -y install golang-go
+RUN apt-get -y install git 
+RUN apt-get -y install mercurial subversion
 
 ENV GOPATH $HOME/go
 
diff --git a/deps.json b/deps.json
index 606beb1..87e78bd 100644
--- a/deps.json
+++ b/deps.json
@@ -5,9 +5,10 @@
         "type": "git-clone",
         "alias": "github.com/howeyc/fsnotify"
     },
-    "launchpad.net/tomb": {
-        "repo": "launchpad.net/tomb",
-        "version": "17",
-        "type": "bzr"
+    "gopkg.in/tomb.v1": {
+        "repo": "https://github.com/go-tomb/tomb.git",
+        "version": "c131134a1947e9afd9cecfe11f4c6dff0732ae58",
+        "type": "git-clone",
+        "alias": "gopkg.in/tomb.v1"
     }
 }
diff --git a/tail.go b/tail.go
index e4b770b..f3c6934 100644
--- a/tail.go
+++ b/tail.go
@@ -8,9 +8,9 @@ import (
 	"github.com/ActiveState/tail/ratelimiter"
 	"github.com/ActiveState/tail/util"
 	"github.com/ActiveState/tail/watch"
+	"gopkg.in/tomb.v1"
 	"io"
 	"io/ioutil"
-	"launchpad.net/tomb"
 	"log"
 	"os"
 	"strings"
diff --git a/watch/inotify.go b/watch/inotify.go
index b29a607..c2f13dc 100644
--- a/watch/inotify.go
+++ b/watch/inotify.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/ActiveState/tail/util"
 	"github.com/howeyc/fsnotify"
-	"launchpad.net/tomb"
+	"gopkg.in/tomb.v1"
 	"os"
 	"path/filepath"
 )
diff --git a/watch/polling.go b/watch/polling.go
index b32bf9e..3fe50af 100644
--- a/watch/polling.go
+++ b/watch/polling.go
@@ -4,7 +4,7 @@ package watch
 
 import (
 	"github.com/ActiveState/tail/util"
-	"launchpad.net/tomb"
+	"gopkg.in/tomb.v1"
 	"os"
 	"time"
 )
diff --git a/watch/watch.go b/watch/watch.go
index 4967131..a3c06e8 100644
--- a/watch/watch.go
+++ b/watch/watch.go
@@ -3,7 +3,7 @@
 package watch
 
 import (
-	"launchpad.net/tomb"
+	"gopkg.in/tomb.v1"
 	"os"
 )