Temporarily install the to-be-moved click packages in both core and

custom databases, to simplify the landing process.

debian/changelog

@@ -1,8 +1,13 @@
 livecd-rootfs (2.255) UNRELEASED; urgency=medium
 
+  [ Steve Langasek ]
   * Add support to the ubuntu-touch target to generate a separate custom
     tarball as part of the build, moving most click packages into it.
 
+  [ Colin Watson ]
+  * Temporarily install the to-be-moved click packages in both core and
+    custom databases, to simplify the landing process.
+
  -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 09 Oct 2014 20:46:46 -0700
 
 livecd-rootfs (2.254) utopic; urgency=medium

live-build/ubuntu-touch/hooks/60-install-click.chroot

@@ -41,13 +41,15 @@ do
             com.ubuntu.reminders_*|\
             com.ubuntu.sudoku_*|\
             com.ubuntu.terminal_*)
-                root="$click_db_custom"
+                roots="$click_db $click_db_custom"
                 ;;
             *)
-                root="$click_db"
+                roots="$click_db"
                 ;;
         esac
-        click install --force-missing-framework --root="$root" --all-users \
+        for root in $roots; do
-            "$tmpdir/$package"
+            click install --force-missing-framework --root="$root" --all-users \
+                "$tmpdir/$package"
+        done
     fi
 done