Merge lp:~laney/ubiquity/adwaita-icon-theme into lp:ubiquity

[Iain Lane]

gnome-icon-theme is dead, long live adwaita-icon-theme

I want to move main off gnome-icon-theme; upstream the package adwaita-icon-theme replaces it.

[Mathieu Trudel-Lapierre (cyphermox)]

The change looks fine. Have you verified that icons show properly in both the "Try Ubuntu..." and "Install .." options on the CD?

How is this going to affect flavours other than Ubuntu & Kubuntu? Any expected impact on Xubuntu, Lubuntu, etc.?

review: Needs Information

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

=== modified file 'd-i/update-control'
--- d-i/update-control	2015-01-15 06:20:28 +0000
+++ d-i/update-control	2015-01-29 18:06:21 +0000
@@ -28,6 +28,7 @@
 
 # Always include base ubiquity build dependencies.
 my @basebd = (
+    'adwaita-icon-theme',
     'apt',
     'autopoint',
     'dctrl-tools',
@@ -41,7 +42,6 @@
     'gir1.2-soup-2.4',
     'gir1.2-timezonemap-1.0',
     'gir1.2-webkit-3.0',
-    'gnome-icon-theme',
     'intltool (>= 0.40.0)',
     'imagemagick',
     'libcairo2-dev',

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-28 19:33:47 +0000
+++ debian/changelog	2015-01-29 18:06:21 +0000
@@ -1,9 +1,14 @@
 ubiquity (2.21.7) UNRELEASED; urgency=medium
 
+  [ Mathieu Trudel-Lapierre ]
   * bin/ubiquity-dm: update to use the proper gsettings keys for the MATE
     installer.
   * Automatic update of included source packages: partman-lvm 105.
 
+  [ Iain Lane ]
+  * Build-Depend on the new adwaita-icon-theme instead of the old
+    gnome-icon-theme.
+
  -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 28 Jan 2015 14:08:41 -0500
 
 ubiquity (2.21.6) vivid; urgency=medium

=== modified file 'debian/control'
--- debian/control	2015-01-15 06:20:28 +0000
+++ debian/control	2015-01-29 18:06:21 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Installer Team <[e-mail]>
 Uploaders: Colin Watson <[e-mail]>, Evan Dandrea <[e-mail]>
-Build-Depends: apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gnome-icon-theme, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
+Build-Depends: adwaita-icon-theme, apt, autopoint, bf-utf-source, check, dctrl-tools, debconf (>= 1.5.43), debconf-utils, debhelper (>= 9), devio, dh-autoreconf, dh-di (>= 3), dh-systemd, dpkg-dev (>= 1.15.7), gir1.2-soup-2.4, gir1.2-timezonemap-1.0, gir1.2-webkit-3.0, gir1.2-xkl-1.0, gobject-introspection, imagemagick, intltool (>= 0.40.0), intltool-debian (>= 0.30+20040212), iso-codes, isoquery, keymapper (>= 0.5.3-7), libbogl-dev, libcairo2-dev, libdebconfclient0-dev (>= 0.68), libdebian-installer4-dev (>= 0.76), libgirepository1.0-dev, libglib2.0-dev, libgtk-3-dev, libido3-0.1-dev, libindicator3-dev, libiw-dev (>= 27+28pre9), liblocale-gettext-perl, libparted-dev (>= 2.2), librsvg2-bin, locales, pep8, pkg-config, po-debconf (>= 1.0), pyflakes (>= 0.7.2), python-gi-dev, python-scour, python3-all (>= 3.1), python3-apt (>= 0.7.100.3~), python3-cairo, python3-dbus, python3-gi, python3-gi-cairo, python3-icu (>= 1.0), python3-mock (>= 0.7.0), python3-pam, tzdata, ubuntu-artwork, udev, wget, xkb-data (>= 0.9), xkb-data-i18n, xvfb
 Standards-Version: 3.9.4
 X-Python3-Version: >= 3.1
 XS-Testsuite: autopkgtest