From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'

---
 install/lib/install.lib.php |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 9bd0e1d..f17b982 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -86,6 +86,9 @@
 			$mainver = array_filter($mainver);
 			$mainver = current($mainver).'.'.next($mainver);
 			switch ($mainver){
+			case "15.04":
+				$relname = "(Vivid Vervet)";
+				break;
 			case "14.10":
 				$relname = "(Utopic Unicorn)";
 				break;
@@ -178,6 +181,12 @@
 			$distid = 'debian60';
 			$distbaseid = 'debian';
 			swriteln("Operating System: Debian 7.0 (Wheezy/Sid) or compatible\n");
+		} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '8') || substr(trim(file_get_contents('/etc/debian_version')),0,1) == '8') {
+			$distname = 'Debian';
+			$distver = 'Jessie';
+			$distid = 'debian60';
+			$distbaseid = 'debian';
+			swriteln("Operating System: Debian 8.0 (Jessie) or compatible\n");
 		} else {
 			$distname = 'Debian';
 			$distver = 'Unknown';

--
Gitblit v1.9.1