Merge lp:~mzanetti/ubuntu/saucy/lxc-android-config/drop-set-display-mir into lp:ubuntu/saucy/lxc-android-config

[Michael Zanetti]

Dropping set-display-mir.conf. We're only using Mir as of now.

[Oliver Grawert (ogra)]

looks fine

review: Approve

[lp:~mzanetti/ubuntu/saucy/lxc-android-config/drop-set-display-mir]

118. By Michael Zanetti on 2014-03-31

break older unity8 versions

Unmerged revisions

118. By Michael Zanetti on 2014-03-31

break older unity8 versions

117. By Michael Zanetti on 2014-03-28

drop set-display-mir.conf. We're only using Mir as of now.

=== modified file 'debian/control'
--- debian/control	2013-08-27 16:55:57 +0000
+++ debian/control	2014-03-31 15:15:35 +0000
@@ -9,6 +9,7 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: lxc, cgroup-lite, debianutils, upstart, ${misc:Depends}
+Breaks: unity8 (<< 8.85)
 Recommends: ofono
 Description: configuration to fire up an ubuntu-touch android container
  This package contains the scripts to boot an Ubuntu Touch device.

=== removed file 'etc/init/boot-hooks/set-display-mir.conf'
--- etc/init/boot-hooks/set-display-mir.conf	2013-10-09 08:27:21 +0000
+++ etc/init/boot-hooks/set-display-mir.conf	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# set-display-mir - creates .display-mir file once (on supported devices)
-
-author "Loïc Minier <[e-mail]>"
-description "Creates .display-mir file once"
-
-# start when first boot-hooks event is emitted and before lxc-android-config
-# starts as it disables SurfaceFlinger based on the Mir flag
-start on boot-hooks and starting lxc-android-config
-
-# NOT a task as otherwise this would block restarting lxc-android-config
-
-setuid phablet
-setgid phablet
-chdir /home/phablet
-env FLAG=.set-display-mir-done2
-env OLDFLAG=.set-display-mir-done
-env DISPLAY_MIR=.display-mir
-
-# work needs to be done in pre-start as this really is a job with nothing to
-# start
-pre-start script
-    rm -f "$OLDFLAG"
-
-    # XXX this is what we should be using, but this job gets started with
-    # "WHEN=every-boot" and then doesn't get the second event for
-    # "WHEN=new-version"
-    #if [ "$WHEN" = "new-version" ] && [ ! -e "$FLAG" ]; then
-    if [ ! -e "$FLAG" ]; then
-        # only enable on supported devices
-        case "$(getprop ro.product.device)" in
-          grouper|maguro|mako)
-            touch "$DISPLAY_MIR"
-          ;;
-        esac
-
-        touch "$FLAG"
-    fi
-end script
-