Merge lp:~ubuntubudgie-dev/tasksel/ubuntu-budgie-tasksel-proposal.zesty into lp:~ubuntu-core-dev/tasksel/ubuntu

Proposed by fossfreedom
Status: Rejected
Rejected by: Mathieu Trudel-Lapierre
Proposed branch: lp:~ubuntubudgie-dev/tasksel/ubuntu-budgie-tasksel-proposal.zesty
Merge into: lp:~ubuntu-core-dev/tasksel/ubuntu
Diff against target: 75 lines (+28/-1)
5 files modified
Makefile (+1/-1)
debian/changelog (+6/-0)
ubuntu-seeds.pl (+3/-0)
ubuntu-tasks/ubuntu-budgie-desktop (+8/-0)
ubuntu-tasks/ubuntu-budgie-live (+10/-0)
To merge this branch: bzr merge lp:~ubuntubudgie-dev/tasksel/ubuntu-budgie-tasksel-proposal.zesty
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Disapprove
Review via email: mp+313844@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

The change looks correct, but is made on a very out-of-date branch (which was caused by the importer breaking); I'll apply these manually to the package.

review: Disapprove

Unmerged revisions

1500. By fossfreedom

community flavor ubuntu-budgie tasks

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2015-02-25 10:51:36 +0000
+++ Makefile 2016-12-23 16:47:21 +0000
@@ -4,7 +4,7 @@
4DESCDIR=tasks4DESCDIR=tasks
5UDOMAIN=ubuntu-tasks5UDOMAIN=ubuntu-tasks
6USUITE=vivid6USUITE=vivid
7UFLAVOURS=platform ubuntu kubuntu edubuntu xubuntu mythbuntu ubuntustudio kubuntu-active lubuntu ubuntu-gnome ubuntu-mate7UFLAVOURS=platform ubuntu kubuntu edubuntu xubuntu mythbuntu ubuntustudio kubuntu-active lubuntu ubuntu-gnome ubuntu-mate ubuntu-budgie
8UTASKDESC=$(UDOMAIN).desc8UTASKDESC=$(UDOMAIN).desc
9UDESCDIR=ubuntu-tasks9UDESCDIR=ubuntu-tasks
10DESCPO=$(DESCDIR)/po10DESCPO=$(DESCDIR)/po
1111
=== modified file 'debian/changelog'
--- debian/changelog 2015-02-25 10:52:25 +0000
+++ debian/changelog 2016-12-23 16:47:21 +0000
@@ -1,3 +1,9 @@
1tasksel (2.88ubuntu18) UNRELEASED; urgency=medium
2
3 * Add Ubuntu Budgie tasks (LP: #1652343)
4
5 -- David Mohammed <fossfreedom@ubuntu.com> Fri, 23 Dec 2016 16:14:43 +0000
6
1tasksel (2.88ubuntu17) vivid; urgency=medium7tasksel (2.88ubuntu17) vivid; urgency=medium
28
3 * Point Ubuntu task update script at vivid.9 * Point Ubuntu task update script at vivid.
410
=== modified file 'ubuntu-seeds.pl'
--- ubuntu-seeds.pl 2015-02-25 10:51:36 +0000
+++ ubuntu-seeds.pl 2016-12-23 16:47:21 +0000
@@ -33,6 +33,7 @@
33my $ubuntustudio_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntustudio-dev/ubuntu-seeds';33my $ubuntustudio_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntustudio-dev/ubuntu-seeds';
34my $lubuntu_seed_base='bzr+ssh://bazaar.launchpad.net/~lubuntu-dev/ubuntu-seeds';34my $lubuntu_seed_base='bzr+ssh://bazaar.launchpad.net/~lubuntu-dev/ubuntu-seeds';
35my $ubuntu_gnome_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntu-gnome-dev/ubuntu-seeds';35my $ubuntu_gnome_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntu-gnome-dev/ubuntu-seeds';
36my $ubuntu_budgie_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntubudgie-dev/ubuntu-seeds';
36my $ubuntu_mate_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntu-mate-dev/ubuntu-seeds';37my $ubuntu_mate_seed_base='bzr+ssh://bazaar.launchpad.net/~ubuntu-mate-dev/ubuntu-seeds';
37my $outdir=shift or die "no output directory specified\n";38my $outdir=shift or die "no output directory specified\n";
38my $suite=shift or die "no suite specified\n";39my $suite=shift or die "no suite specified\n";
@@ -87,6 +88,8 @@
87 push @command, "$lubuntu_seed_base/$flavour.$suite";88 push @command, "$lubuntu_seed_base/$flavour.$suite";
88 } elsif ($flavour eq 'ubuntu-gnome') {89 } elsif ($flavour eq 'ubuntu-gnome') {
89 push @command, "$ubuntu_gnome_seed_base/$flavour.$suite";90 push @command, "$ubuntu_gnome_seed_base/$flavour.$suite";
91 } elsif ($flavour eq 'ubuntu-budgie') {
92 push @command, "$ubuntu_budgie_seed_base/$flavour.$suite";
90 } elsif ($flavour eq 'ubuntu-mate') {93 } elsif ($flavour eq 'ubuntu-mate') {
91 push @command, "$ubuntu_mate_seed_base/$flavour.$suite";94 push @command, "$ubuntu_mate_seed_base/$flavour.$suite";
92 } else {95 } else {
9396
=== added file 'ubuntu-tasks/ubuntu-budgie-desktop'
--- ubuntu-tasks/ubuntu-budgie-desktop 1970-01-01 00:00:00 +0000
+++ ubuntu-tasks/ubuntu-budgie-desktop 2016-12-23 16:47:21 +0000
@@ -0,0 +1,8 @@
1Task: ubuntu-budgie-desktop
2Section: user
3Description: Ubuntu Budgie desktop
4 This task provides the Ubuntu Budgie desktop environment.
5Key:
6 ubuntu-budgie-desktop
7Seeds: desktop-common
8Packages: task-fields
09
=== added file 'ubuntu-tasks/ubuntu-budgie-live'
--- ubuntu-tasks/ubuntu-budgie-live 1970-01-01 00:00:00 +0000
+++ ubuntu-tasks/ubuntu-budgie-live 2016-12-23 16:47:21 +0000
@@ -0,0 +1,10 @@
1Task: ubuntu-budgie-live
2Section: user
3Description: Ubuntu Budgie live CD
4 This task provides the extra packages installed on the Ubuntu Budgie live CD. It is neither useful nor recommended to install this task in other environments.
5Relevance: 2
6Key:
7 ubiquity-frontend-gtk
8Test-new-install: skip show
9Seeds: live-common
10Packages: task-fields

Subscribers

People subscribed via source and target branches

to all changes: