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/cups/module.conf.ubuntu.14            | 16 ++++++++++++++++
 remote/modules/cups/module.conf.ubuntu.14.04         | 16 ----------------
 remote/modules/nvidia_kernel/module.conf.ubuntu.14   |  4 ++++
 .../modules/nvidia_kernel/module.conf.ubuntu.14.04   |  4 ----
 remote/modules/nvidia_libs/module.conf.ubuntu.14     | 10 ++++++++++
 remote/modules/nvidia_libs/module.conf.ubuntu.14.04  | 10 ----------
 remote/modules/openstack/module.conf.ubuntu.14       |  9 +++++++++
 remote/modules/openstack/module.conf.ubuntu.14.04    |  9 ---------
 remote/modules/vbox/module.conf.ubuntu.14            | 20 ++++++++++++++++++++
 remote/modules/vbox/module.conf.ubuntu.14.04         | 20 --------------------
 10 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 remote/modules/cups/module.conf.ubuntu.14
 delete mode 100644 remote/modules/cups/module.conf.ubuntu.14.04
 create mode 100644 remote/modules/nvidia_kernel/module.conf.ubuntu.14
 delete mode 100644 remote/modules/nvidia_kernel/module.conf.ubuntu.14.04
 create mode 100644 remote/modules/nvidia_libs/module.conf.ubuntu.14
 delete mode 100644 remote/modules/nvidia_libs/module.conf.ubuntu.14.04
 create mode 100644 remote/modules/openstack/module.conf.ubuntu.14
 delete mode 100644 remote/modules/openstack/module.conf.ubuntu.14.04
 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')

diff --git a/remote/modules/cups/module.conf.ubuntu.14 b/remote/modules/cups/module.conf.ubuntu.14
new file mode 100644
index 00000000..23dcf226
--- /dev/null
+++ b/remote/modules/cups/module.conf.ubuntu.14
@@ -0,0 +1,16 @@
+REQUIRED_INSTALLED_PACKAGES="
+		cups
+		cups-daemon
+		cups-filters
+		cups-core-drivers
+		cups-filters-core-drivers
+		ghostscript
+"
+REQUIRED_CONTENT_PACKAGES="
+		cups
+		cups-daemon
+		cups-filters
+		cups-core-drivers
+		cups-filters-core-drivers
+		ghostscript
+"
diff --git a/remote/modules/cups/module.conf.ubuntu.14.04 b/remote/modules/cups/module.conf.ubuntu.14.04
deleted file mode 100644
index 23dcf226..00000000
--- a/remote/modules/cups/module.conf.ubuntu.14.04
+++ /dev/null
@@ -1,16 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-		cups
-		cups-daemon
-		cups-filters
-		cups-core-drivers
-		cups-filters-core-drivers
-		ghostscript
-"
-REQUIRED_CONTENT_PACKAGES="
-		cups
-		cups-daemon
-		cups-filters
-		cups-core-drivers
-		cups-filters-core-drivers
-		ghostscript
-"
diff --git a/remote/modules/nvidia_kernel/module.conf.ubuntu.14 b/remote/modules/nvidia_kernel/module.conf.ubuntu.14
new file mode 100644
index 00000000..73887357
--- /dev/null
+++ b/remote/modules/nvidia_kernel/module.conf.ubuntu.14
@@ -0,0 +1,4 @@
+REQUIRED_VERSION="337.12"
+REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
+REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
+
diff --git a/remote/modules/nvidia_kernel/module.conf.ubuntu.14.04 b/remote/modules/nvidia_kernel/module.conf.ubuntu.14.04
deleted file mode 100644
index 73887357..00000000
--- a/remote/modules/nvidia_kernel/module.conf.ubuntu.14.04
+++ /dev/null
@@ -1,4 +0,0 @@
-REQUIRED_VERSION="337.12"
-REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
-REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
-
diff --git a/remote/modules/nvidia_libs/module.conf.ubuntu.14 b/remote/modules/nvidia_libs/module.conf.ubuntu.14
new file mode 100644
index 00000000..98083b50
--- /dev/null
+++ b/remote/modules/nvidia_libs/module.conf.ubuntu.14
@@ -0,0 +1,10 @@
+REQUIRED_VERSION="337.12"
+REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
+REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
+REQUIRED_FILES="
+				/etc/OpenCL/vendors/nvidia.icd
+				/usr/share/nvidia/nvidia-application-profiles-$REQUIRED_VERSION-rc
+				/usr/share/applications/nvidia-settings.desktop
+				/opt/openslx/etc/nvidia.whiteout
+"
+
diff --git a/remote/modules/nvidia_libs/module.conf.ubuntu.14.04 b/remote/modules/nvidia_libs/module.conf.ubuntu.14.04
deleted file mode 100644
index 98083b50..00000000
--- a/remote/modules/nvidia_libs/module.conf.ubuntu.14.04
+++ /dev/null
@@ -1,10 +0,0 @@
-REQUIRED_VERSION="337.12"
-REQUIRED_NVIDIA="NVIDIA-Linux-x86_64-$REQUIRED_VERSION.run"
-REQUIRED_URL="http://download.nvidia.com/XFree86/Linux-x86_64/$REQUIRED_VERSION/$REQUIRED_NVIDIA"
-REQUIRED_FILES="
-				/etc/OpenCL/vendors/nvidia.icd
-				/usr/share/nvidia/nvidia-application-profiles-$REQUIRED_VERSION-rc
-				/usr/share/applications/nvidia-settings.desktop
-				/opt/openslx/etc/nvidia.whiteout
-"
-
diff --git a/remote/modules/openstack/module.conf.ubuntu.14 b/remote/modules/openstack/module.conf.ubuntu.14
new file mode 100644
index 00000000..7c24b4a9
--- /dev/null
+++ b/remote/modules/openstack/module.conf.ubuntu.14
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	neutron-common
+	neutron-plugin-ml2
+	neutron-plugin-openvswitch-agent
+	nova-compute-kvm
+	python-guestfs
+	python-mysqldb
+"
+REQUIRED_CONTENT_PACKAGES="$REQUIRED_INSTALLED_PACKAGES"
diff --git a/remote/modules/openstack/module.conf.ubuntu.14.04 b/remote/modules/openstack/module.conf.ubuntu.14.04
deleted file mode 100644
index 7c24b4a9..00000000
--- a/remote/modules/openstack/module.conf.ubuntu.14.04
+++ /dev/null
@@ -1,9 +0,0 @@
-REQUIRED_INSTALLED_PACKAGES="
-	neutron-common
-	neutron-plugin-ml2
-	neutron-plugin-openvswitch-agent
-	nova-compute-kvm
-	python-guestfs
-	python-mysqldb
-"
-REQUIRED_CONTENT_PACKAGES="$REQUIRED_INSTALLED_PACKAGES"
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