From 06ace4941d122c5e6ac4de11a2148173ecab9666 Mon Sep 17 00:00:00 2001
From: Julius Volz <julius@soundcloud.com>
Date: Thu, 7 Feb 2013 14:32:18 +0100
Subject: [PATCH] Remove/replace last references to github.com/matttproud/...

---
 README.md                                   | 2 +-
 config/lexer.l.go                           | 6 +++---
 config/parser.y                             | 2 +-
 config/parser.y.go                          | 2 +-
 documentation/guides/getting-started-osx.md | 4 ++--
 rules/Makefile                              | 4 ----
 rules/lexer.l                               | 2 +-
 rules/lexer.l.go                            | 2 +-
 rules/parser.y                              | 4 ++--
 rules/parser.y.go                           | 4 ++--
 10 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 46187deba5..dfa21834f8 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ action if some condition is observed to be true.
   4. goprotobuf: the code generator and runtime library: (http://code.google.com/p/goprotobuf/).
   5. Levigo, a Go-wrapper around LevelDB's C library: (https://github.com/jmhodges/levigo).
   6. GoRest, a RESTful style web-services framework: (http://code.google.com/p/gorest/).
-  7. Prometheus Client, Prometheus in Prometheus (https://github.com/matttproud/golang_instrumentation).
+  7. Prometheus Client, Prometheus in Prometheus (https://github.com/prometheus/client_golang).
   8. Snappy, a compression library for LevelDB and Levigo (code.google.com/p/snappy/).
 
 ## Getting started
diff --git a/config/lexer.l.go b/config/lexer.l.go
index 008b14a484..3355b498c4 100644
--- a/config/lexer.l.go
+++ b/config/lexer.l.go
@@ -217,12 +217,12 @@ func yylex() int {
 	return 0
 }
 var S_TARGETS yystartcondition = 1027
-var S_GLOBAL_LABELS yystartcondition = 1025
 var S_JOB yystartcondition = 1026
-var S_TARGET_LABELS yystartcondition = 1028
 var S_GLOBAL yystartcondition = 1024
+var S_GLOBAL_LABELS yystartcondition = 1025
 var S_COMMENTS yystartcondition = 1029
-var yystartconditionexclmap = map[yystartcondition]bool{S_COMMENTS: true, S_TARGETS: false, S_GLOBAL_LABELS: false, S_JOB: false, S_TARGET_LABELS: false, S_GLOBAL: false, }
+var S_TARGET_LABELS yystartcondition = 1028
+var yystartconditionexclmap = map[yystartcondition]bool{S_GLOBAL: false, S_GLOBAL_LABELS: false, S_COMMENTS: true, S_TARGET_LABELS: false, S_TARGETS: false, S_JOB: false, }
 var yyrules []yyrule = []yyrule{{regexp.MustCompile("[^\\n]"), nil, []yystartcondition{}, false, func() (yyar yyactionreturn) {
 	defer func() {
 		if r := recover(); r != nil {
diff --git a/config/parser.y b/config/parser.y
index b24dbf7713..b083a4a9b0 100644
--- a/config/parser.y
+++ b/config/parser.y
@@ -15,7 +15,7 @@
         package config
 
         import "fmt"
-        import "github.com/matttproud/prometheus/model"
+        import "github.com/prometheus/prometheus/model"
 %}
 
 %union {
diff --git a/config/parser.y.go b/config/parser.y.go
index e9da8a6f4b..614d514f4a 100644
--- a/config/parser.y.go
+++ b/config/parser.y.go
@@ -3,7 +3,7 @@
         package config
 
         import "fmt"
-        import "github.com/matttproud/prometheus/model"
+        import "github.com/prometheus/prometheus/model"
 
 //line parser.y:21
 type yySymType struct {
diff --git a/documentation/guides/getting-started-osx.md b/documentation/guides/getting-started-osx.md
index e1bf160bb9..bce1dbd24e 100644
--- a/documentation/guides/getting-started-osx.md
+++ b/documentation/guides/getting-started-osx.md
@@ -39,14 +39,14 @@ brew install leveldb protobuf
 go get code.google.com/p/goprotobuf/{proto,protoc-gen-go}
 go get github.com/jmhodges/levigo
 go get code.google.com/p/gorest
-go get github.com/matttproud/{prometheus,golang_instrumentation}
+go get github.com/prometheus/{prometheus,client_golang}
 ```
 
 
 ## Build
 
 ```bash
-cd ${GOPATH}/src/github.com/matttproud/prometheus
+cd ${GOPATH}/src/github.com/prometheus/prometheus
 make build
 ```
 
diff --git a/rules/Makefile b/rules/Makefile
index 7305903d26..bf8fc38993 100644
--- a/rules/Makefile
+++ b/rules/Makefile
@@ -19,9 +19,5 @@ parser.y.go: parser.y
 lexer.l.go: parser.y.go lexer.l
 	golex lexer.l
 
-test: all
-	go test -i github.com/matttproud/prometheus/rules
-	go test github.com/matttproud/prometheus/rules
-
 clean:
 	rm lexer.l.go parser.y.go
diff --git a/rules/lexer.l b/rules/lexer.l
index 0f7fc7e156..f174f0bbf5 100644
--- a/rules/lexer.l
+++ b/rules/lexer.l
@@ -15,7 +15,7 @@
 package rules
 
 import (
-        "github.com/matttproud/prometheus/model"
+        "github.com/prometheus/prometheus/model"
         "strconv"
 )
 %}
diff --git a/rules/lexer.l.go b/rules/lexer.l.go
index a6e6876af0..aceeaec4ae 100644
--- a/rules/lexer.l.go
+++ b/rules/lexer.l.go
@@ -10,7 +10,7 @@ import (
 	"sort"
 )
 import (
-"github.com/matttproud/prometheus/model"
+"github.com/prometheus/prometheus/model"
 "strconv"
 )
 
diff --git a/rules/parser.y b/rules/parser.y
index 850cf95362..73eb28b6ec 100644
--- a/rules/parser.y
+++ b/rules/parser.y
@@ -15,8 +15,8 @@
         package rules
 
         import "fmt"
-        import "github.com/matttproud/prometheus/model"
-        import "github.com/matttproud/prometheus/rules/ast"
+        import "github.com/prometheus/prometheus/model"
+        import "github.com/prometheus/prometheus/rules/ast"
 %}
 
 %union {
diff --git a/rules/parser.y.go b/rules/parser.y.go
index 2ca007bd73..467b1bddc6 100644
--- a/rules/parser.y.go
+++ b/rules/parser.y.go
@@ -3,8 +3,8 @@
         package rules
 
         import "fmt"
-        import "github.com/matttproud/prometheus/model"
-        import "github.com/matttproud/prometheus/rules/ast"
+        import "github.com/prometheus/prometheus/model"
+        import "github.com/prometheus/prometheus/rules/ast"
 
 //line parser.y:22
 type yySymType struct {