From 5748a4c1112b2015390eb703e413eb52c295dc3a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 9 Jul 2014 12:42:14 +0200
Subject: Change ubuntu 14.04 configs to 14

---
 remote/modules/vbox/module.conf.ubuntu.14    | 20 ++++++++++++++++++++
 remote/modules/vbox/module.conf.ubuntu.14.04 | 20 --------------------
 2 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 remote/modules/vbox/module.conf.ubuntu.14
 delete mode 100644 remote/modules/vbox/module.conf.ubuntu.14.04

(limited to 'remote/modules/vbox')

diff --git a/remote/modules/vbox/module.conf.ubuntu.14 b/remote/modules/vbox/module.conf.ubuntu.14
new file mode 100644
index 00000000..5691459b
--- /dev/null
+++ b/remote/modules/vbox/module.conf.ubuntu.14
@@ -0,0 +1,20 @@
+REQUIRED_VBOX_OSCODE='Ubuntu~raring'	# raring: 13.04, but also used here. Should be changed when
+					# version for 14.04 appears on virtualbox.org.
+
+REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
+REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
+
+
+REQUIRED_CONTENT_PACKAGES="
+				libsdl1.2debian
+				libpng12-0
+"
+
+REQUIRED_INSTALLED_PACKAGES="
+				libsdl1.2debian
+				libpng12-0
+"
+
+REQUIRED_LIBRARIES="
+				libpng12
+"
diff --git a/remote/modules/vbox/module.conf.ubuntu.14.04 b/remote/modules/vbox/module.conf.ubuntu.14.04
deleted file mode 100644
index 5691459b..00000000
--- a/remote/modules/vbox/module.conf.ubuntu.14.04
+++ /dev/null
@@ -1,20 +0,0 @@
-REQUIRED_VBOX_OSCODE='Ubuntu~raring'	# raring: 13.04, but also used here. Should be changed when
-					# version for 14.04 appears on virtualbox.org.
-
-REQUIRED_VBOXBASEURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/virtualbox-${REQUIRED_VBOX_VERSION_MAJOR}_${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}~${REQUIRED_VBOX_OSCODE}_${AMD64_I386}.deb"
-REQUIRED_VBOXEXTURL="http://download.virtualbox.org/virtualbox/${REQUIRED_VBOX_VERSION}/Oracle_VM_VirtualBox_Extension_Pack-${REQUIRED_VBOX_VERSION}-${REQUIRED_VBOX_VERSIONCODE}.vbox-extpack"
-
-
-REQUIRED_CONTENT_PACKAGES="
-				libsdl1.2debian
-				libpng12-0
-"
-
-REQUIRED_INSTALLED_PACKAGES="
-				libsdl1.2debian
-				libpng12-0
-"
-
-REQUIRED_LIBRARIES="
-				libpng12
-"
-- 
cgit v1.2.3-55-g7522