[Libosinfo] [PATCH osinfo-db v2] ubuntu: correct EOL dates

[Jeremy Bicha]

>From 1fbc2983dcc860ec3af1729cafe3838eb61a8031 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha at ubuntu.com>
Date: Sun, 16 Sep 2018 18:18:50 -0400
Subject: [PATCH] ubuntu: correct EOL dates

Use the dates from https://wiki.ubuntu.com/Releases

For currently supported releases where no exact EOL
date has been announced yet, I used the same day of
the month as the release since that's what Canonical did
for the 17.* releases.
---
 data/os/ubuntu.com/ubuntu-12.04.xml.in | 2 +-
 data/os/ubuntu.com/ubuntu-15.04.xml.in | 2 +-
 data/os/ubuntu.com/ubuntu-15.10.xml.in | 2 +-
 data/os/ubuntu.com/ubuntu-16.04.xml.in | 2 +-
 data/os/ubuntu.com/ubuntu-17.04.xml.in | 1 +
 data/os/ubuntu.com/ubuntu-17.10.xml.in | 1 +
 data/os/ubuntu.com/ubuntu-18.04.xml.in | 1 +
 7 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/data/os/ubuntu.com/ubuntu-12.04.xml.in
b/data/os/ubuntu.com/ubuntu-12.04.xml.in
index 3054dda..b731f87 100644
--- a/data/os/ubuntu.com/ubuntu-12.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-12.04.xml.in
@@ -14,7 +14,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/11.10"/>

     <release-date>2012-04-26</release-date>
-    <eol-date>2017-04-26</eol-date>
+    <eol-date>2017-04-28</eol-date>

     <resources arch="all">
       <minimum>
diff --git a/data/os/ubuntu.com/ubuntu-15.04.xml.in
b/data/os/ubuntu.com/ubuntu-15.04.xml.in
index e9426be..35acaf7 100644
--- a/data/os/ubuntu.com/ubuntu-15.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.04.xml.in
@@ -14,7 +14,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/14.10"/>

     <release-date>2015-04-23</release-date>
-    <eol-date>2016-01-23</eol-date>
+    <eol-date>2016-02-04</eol-date>

     <resources arch="all">
       <minimum>
diff --git a/data/os/ubuntu.com/ubuntu-15.10.xml.in
b/data/os/ubuntu.com/ubuntu-15.10.xml.in
index f99b523..4ef334b 100644
--- a/data/os/ubuntu.com/ubuntu-15.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-15.10.xml.in
@@ -14,7 +14,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/15.04"/>

     <release-date>2015-10-22</release-date>
-    <eol-date>2016-07-22</eol-date>
+    <eol-date>2016-07-28</eol-date>

     <resources arch="all">
       <minimum>
diff --git a/data/os/ubuntu.com/ubuntu-16.04.xml.in
b/data/os/ubuntu.com/ubuntu-16.04.xml.in
index d42e227..c8a16a3 100644
--- a/data/os/ubuntu.com/ubuntu-16.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-16.04.xml.in
@@ -14,7 +14,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/15.10"/>

     <release-date>2016-04-21</release-date>
-    <eol-date>2021-04-22</eol-date>
+    <eol-date>2021-04-21</eol-date>

     <resources arch="all">
       <minimum>
diff --git a/data/os/ubuntu.com/ubuntu-17.04.xml.in
b/data/os/ubuntu.com/ubuntu-17.04.xml.in
index ab46a81..28e9784 100644
--- a/data/os/ubuntu.com/ubuntu-17.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.04.xml.in
@@ -14,6 +14,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/16.10"/>

     <release-date>2017-04-13</release-date>
+    <eol-date>2018-01-13</eol-date>

     <devices>
       <device id="http://pcisig.com/pci/1af4/1041"/> <!-- virtio1.0-net -->
diff --git a/data/os/ubuntu.com/ubuntu-17.10.xml.in
b/data/os/ubuntu.com/ubuntu-17.10.xml.in
index 55ae649..0e9ad0f 100644
--- a/data/os/ubuntu.com/ubuntu-17.10.xml.in
+++ b/data/os/ubuntu.com/ubuntu-17.10.xml.in
@@ -14,6 +14,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/17.04"/>

     <release-date>2017-10-19</release-date>
+    <eol-date>2018-07-19</eol-date>

     <resources arch="all">
       <minimum>
diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in
b/data/os/ubuntu.com/ubuntu-18.04.xml.in
index 0efc5c2..2903f11 100644
--- a/data/os/ubuntu.com/ubuntu-18.04.xml.in
+++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in
@@ -15,6 +15,7 @@
     <derives-from id="http://ubuntu.com/ubuntu/17.10"/>

     <release-date>2018-04-26</release-date>
+    <eol-date>2023-04-26</eol-date>

     <resources arch="all">
       <minimum>
-- 
2.17.1