From a0c854d3c0133a45d9651c0b17c10affc8fa2cf0 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sat, 4 May 2013 22:35:36 +0300
Subject: [PATCH] vsroom: Renamed Makefile.internal as Makefile

---
 vsroom/Makefile          |  6 +++---
 vsroom/Makefile.internal | 17 -----------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 vsroom/Makefile.internal

diff --git a/vsroom/Makefile b/vsroom/Makefile
index c334876..2392599 100644
--- a/vsroom/Makefile
+++ b/vsroom/Makefile
@@ -1,8 +1,8 @@
 include $(CURDIR)/../Makefile.inc
 
 BRANCH = default
-SOURCE = https://bitbucket.org/clarifiednetworks/vsroom/get/$(BRANCH).tar.gz
-TARGET = vsroom-$(BRANCH)-$(TIMESTAMP).tar.gz
+SOURCE = https://bitbucket.org/clarifiednetworks/vsroom-internal/get/$(BRANCH).tar.gz
+TARGET = vsroom-internal-$(BRANCH)-$(TIMESTAMP).tar.gz
 
 all:      tarball manifest
 tarball:  $(PACKAGES)/$(TARGET)
@@ -10,7 +10,7 @@ manifest: $(MANIFESTS)/vsroom.pp
 
 $(PACKAGES)/$(TARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -o $@ $(SOURCE)
+	test -f $@ || curl --digest -u $(USER) -o $@ $(SOURCE)
 
 $(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET)
 	@umask 022; echo $@; \
diff --git a/vsroom/Makefile.internal b/vsroom/Makefile.internal
deleted file mode 100644
index 2392599..0000000
--- a/vsroom/Makefile.internal
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(CURDIR)/../Makefile.inc
-
-BRANCH = default
-SOURCE = https://bitbucket.org/clarifiednetworks/vsroom-internal/get/$(BRANCH).tar.gz
-TARGET = vsroom-internal-$(BRANCH)-$(TIMESTAMP).tar.gz
-
-all:      tarball manifest
-tarball:  $(PACKAGES)/$(TARGET)
-manifest: $(MANIFESTS)/vsroom.pp
-
-$(PACKAGES)/$(TARGET):
-	@umask 022; echo $@; \
-	test -f $@ || curl --digest -u $(USER) -o $@ $(SOURCE)
-
-$(MANIFESTS)/vsroom.pp: $(PACKAGES)/$(TARGET)
-	@umask 022; echo $@; \
-	echo '$$vsroom_package_latest = "$(TARGET)"' > $@