Ubuntu CD Images

Merge lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-image into lp:ubuntu-cdimage

  1. lubuntu-next-image
  2. Merge into mainline
Proposed by Simon Quigley
Status: Merged
Merged at revision: 1618
Proposed branch: lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-image
Merge into: lp:ubuntu-cdimage
Diff against target: 83 lines (+9/-2)
6 files modified
bin/daily-checks (+1/-0)
etc/config (+1/-1)
etc/crontab (+1/-1)
etc/qa-products (+3/-0)
lib/cdimage/tests/test_tree.py (+2/-0)
lib/cdimage/tree.py (+1/-0)
To merge this branch: bzr merge lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-image
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team Pending
Review via email: mp+301203@code.launchpad.net

Description of the change

This adds the Lubuntu Next image.

https://code.launchpad.net/~tsimonq2/livecd-rootfs/lubuntu-next-image/+merge/301202 should be merged before this one.

To post a comment you must log in.
lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-image updated
1616. By Adam Conrad

No more trusty builds

1617. By Adam Conrad

Disable edubuntu and mythbuntu in the devel series

1618. By Steve Langasek

Merge lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-image

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/daily-checks'
2--- bin/daily-checks 2016-04-22 12:51:19 +0000
3+++ bin/daily-checks 2016-07-26 17:50:29 +0000
4@@ -248,6 +248,7 @@
5 'kubuntu-plasma5',
6 'mythbuntu',
7 'lubuntu',
8+ 'lubuntu-next',
9 'ubuntu-gnome',
10 'ubuntu-mate',
11 'ubuntukylin',
12
13=== modified file 'etc/config'
14--- etc/config 2016-06-14 14:23:22 +0000
15+++ etc/config 2016-07-26 17:50:29 +0000
16@@ -50,7 +50,7 @@
17 ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu edubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin}"
18 ;;
19 *)
20- ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio mythbuntu lubuntu ubuntu-gnome ubuntukylin ubuntu-mate}"
21+ ALL_PROJECTS="${ALL_PROJECTS:-ubuntu kubuntu xubuntu ubuntustudio mythbuntu lubuntu lubuntu-next ubuntu-gnome ubuntukylin ubuntu-mate}"
22 ;;
23 esac
24
25
26=== modified file 'etc/crontab'
27--- etc/crontab 2016-06-13 13:41:46 +0000
28+++ etc/crontab 2016-07-26 17:50:29 +0000
29@@ -39,7 +39,7 @@
30 17 18 * * * for-project ubuntustudio cron.dvd --live
31 # mythbuntu will only release for LTS releases, but we keep daily builds around to ensure it remains working
32 29 10 * * * for-project mythbuntu cron.daily-live --live
33-29 16 * * * for-project lubuntu cron.daily; for-project lubuntu cron.daily-live --live
34+29 16 * * * for-project lubuntu cron.daily; for-project lubuntu cron.daily-live --live; for-project lubuntu-next cron.daily-live --live
35 32 4 * * * for-project ubuntu-base cron.daily-live --live
36 56 4 * * * SUBPROJECT=system-image EXTRA_PPAS=snappy-dev/image for-project ubuntu-core cron.daily-preinstalled --live
37 #57 4 * * * DIST=vivid SUBPROJECT=system-image EXTRA_PPAS=snappy-dev/image for-project ubuntu-core cron.daily-preinstalled --live
38
39=== modified file 'etc/qa-products'
40--- etc/qa-products 2016-07-16 20:40:41 +0000
41+++ etc/qa-products 2016-07-26 17:50:29 +0000
42@@ -23,6 +23,9 @@
43 Lubuntu Desktop amd64+mac lubuntu daily-live desktop amd64+mac iso
44 Lubuntu Desktop i386 lubuntu daily-live desktop i386 iso
45 Lubuntu Desktop powerpc lubuntu daily-live desktop powerpc iso
46+Lubuntu Next Desktop amd64 lubuntu-next daily-live desktop amd64 iso
47+Lubuntu Next Desktop i386 lubuntu-next daily-live desktop i386 iso
48+Lubuntu Next Desktop powerpc lubuntu-next daily-live desktop powerpc iso
49 Lubuntu Desktop Preinstalled armhf+ac100 lubuntu daily-preinstalled preinstalled-desktop armhf+ac100 iso
50
51 # Mythbuntu
52
53=== modified file 'lib/cdimage/tests/test_tree.py'
54--- lib/cdimage/tests/test_tree.py 2016-07-05 23:00:07 +0000
55+++ lib/cdimage/tests/test_tree.py 2016-07-26 17:50:29 +0000
56@@ -1225,6 +1225,7 @@
57 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
58 ("lubuntu", "daily", "alternate", "Lubuntu Alternate"),
59 ("lubuntu", "daily-live", "desktop", "Lubuntu Desktop"),
60+ ("lubuntu-next", "daily-live", "desktop", "Lubuntu Next Desktop"),
61 ("ubuntu-base", "daily", "base", "Ubuntu Base"),
62 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
63 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
64@@ -1295,6 +1296,7 @@
65 ("mythbuntu", "daily-live", "desktop", "Mythbuntu Desktop"),
66 ("lubuntu", "daily", "alternate", "Lubuntu Alternate"),
67 ("lubuntu", "daily-live", "desktop", "Lubuntu Desktop"),
68+ ("lubuntu-next", "daily-live", "desktop", "Lubuntu Next Desktop"),
69 ("ubuntu-base", "daily", "base", "Ubuntu Base"),
70 ("ubuntukylin", "daily-live", "desktop", "Ubuntu Kylin Desktop"),
71 ("ubuntu-gnome", "daily-live", "desktop", "Ubuntu GNOME Desktop"),
72
73=== modified file 'lib/cdimage/tree.py'
74--- lib/cdimage/tree.py 2016-07-21 12:35:37 +0000
75+++ lib/cdimage/tree.py 2016-07-26 17:50:29 +0000
76@@ -65,6 +65,7 @@
77 "kubuntu-netbook",
78 "kubuntu-plasma5",
79 "lubuntu",
80+ "lubuntu-next",
81 "mythbuntu",
82 "ubuntu",
83 "ubuntu-desktop-next",

Subscribers

People subscribed via source and target branches