From c9674f84e82118d5a4dac460ae0b6a281136e3fd Mon Sep 17 00:00:00 2001
From: toni-moreno <toni.moreno@gmail.com>
Date: Fri, 4 Dec 2015 22:36:38 +0100
Subject: [PATCH 1/2] add option pkg-rpm and pkg-deb to create separately both
 packages #3407

---
 build.go | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/build.go b/build.go
index 4a345c5fc73..22ba4a29f01 100644
--- a/build.go
+++ b/build.go
@@ -76,6 +76,14 @@ func main() {
 			grunt("release")
 			createLinuxPackages()
 
+		case "pkg-rpm":
+			grunt("release")
+			createRpmPackages()
+      
+		case "pkg-deb":
+			grunt("release")
+			createDebPackages()
+
 		case "latest":
 			makeLatestDistCopies()
 
@@ -146,8 +154,7 @@ type linuxPackageOptions struct {
 
 	depends []string
 }
-
-func createLinuxPackages() {
+func createDebPackages() {
 	createPackage(linuxPackageOptions{
 		packageType:            "deb",
 		homeDir:                "/usr/share/grafana",
@@ -167,7 +174,9 @@ func createLinuxPackages() {
 
 		depends: []string{"adduser", "libfontconfig"},
 	})
+}
 
+func createRpmPackages() {
 	createPackage(linuxPackageOptions{
 		packageType:            "rpm",
 		homeDir:                "/usr/share/grafana",
@@ -189,6 +198,11 @@ func createLinuxPackages() {
 	})
 }
 
+func createLinuxPackages() {
+	createDebPackages()
+	createRpmPackages()
+}
+
 func createPackage(options linuxPackageOptions) {
 	packageRoot, _ := ioutil.TempDir("", "grafana-linux-pack")
 

From 7e63978a3f18550cfd3c1ce6dcb35fc9d50176c8 Mon Sep 17 00:00:00 2001
From: toni-moreno <toni.moreno@gmail.com>
Date: Fri, 4 Dec 2015 22:55:23 +0100
Subject: [PATCH 2/2] fix formatting for CircleCI test

---
 build.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.go b/build.go
index 22ba4a29f01..2b0b6069ac7 100644
--- a/build.go
+++ b/build.go
@@ -79,7 +79,7 @@ func main() {
 		case "pkg-rpm":
 			grunt("release")
 			createRpmPackages()
-      
+
 		case "pkg-deb":
 			grunt("release")
 			createDebPackages()
@@ -154,6 +154,7 @@ type linuxPackageOptions struct {
 
 	depends []string
 }
+
 func createDebPackages() {
 	createPackage(linuxPackageOptions{
 		packageType:            "deb",