Merge lp:~bfiller/telephony-service/conflicts-replaces-phone-app into lp:telephony-service

[Bill Filler]

Add Conflicts and Replaces phone-app such that both can't be installed at the same time

Add Conflicts and Replaces phone-app such that both can't be installed at the same time

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:734
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-amd64-ci/33
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-armhf-ci/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins:8080/job/telephony-service-ci/33/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/telephony-service-autolanding/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-amd64-autolanding/20/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-armhf-autolanding/20
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-armhf-autolanding/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-saucy-i386-autolanding/20

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-26 10:24:16 +0000
+++ debian/control	2013-08-26 17:27:41 +0000
@@ -33,6 +33,8 @@
 Architecture: any
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.15.6~)
+Conflicts: phone-app
+Replaces: phone-app
 Depends: gsettings-ubuntu-touch-schemas (>= 0.0.1+13.10.20130730),
          history-service,
          libnotify4,