Merge lp:~sil2100/gsettings-ubuntu-touch-schemas/sync_trunk into lp:gsettings-ubuntu-touch-schemas

[Łukasz Zemczak]

Sync trunk with distro

Sync trunk with distro

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:15
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-saucy-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-saucy-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-saucy-i386-ci/2

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/gsettings-ubuntu-touch-schemas-ci/2/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-30 00:02:37 +0000
+++ debian/changelog	2013-10-22 17:12:55 +0000
@@ -1,3 +1,10 @@
+gsettings-ubuntu-touch-schemas (0.0.1+13.10.20130730-0ubuntu2) saucy; urgency=low
+
+  * Change the default sounds for calls and messages, depends on 
+    ubuntu-touch-sounds so we are sure users get the files with the defaults
+
+ -- Sebastien Bacher <[e-mail]>  Mon, 14 Oct 2013 16:36:03 +0200
+
 gsettings-ubuntu-touch-schemas (0.0.1+13.10.20130730-0ubuntu1) saucy; urgency=low
 
   [ Sebastien Bacher ]
 
=== modified file 'debian/control'
--- debian/control	2013-07-19 12:36:12 +0000
+++ debian/control	2013-10-22 17:12:55 +0000
@@ -18,7 +18,8 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ubuntu-touch-sounds,
 Description: GSettings deskop-wide schemas for Ubuntu Touch
  gsettings-desktop-schemas contains a collection of GSettings schemas for
  settings shared by various components of an Ubuntu Touch environment.
 
=== modified file 'schemas/com.ubuntu.touch.sound.gschema.xml.in.in'
--- schemas/com.ubuntu.touch.sound.gschema.xml.in.in	2013-07-29 15:07:45 +0000
+++ schemas/com.ubuntu.touch.sound.gschema.xml.in.in	2013-10-22 17:12:55 +0000
@@ -6,12 +6,12 @@
       <_description>Whether silent mode is active or not.</_description>
     </key>
     <key name="incoming-call-sound" type="s">
-      <default>"/usr/share/sounds/ubuntu/stereo/phone-incoming-call.ogg"</default>
+      <default>"/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"</default>
       <_summary>Ringtone sound for the phone application.</_summary>
       <_description>This sound file is played, on incoming calls, by the phone application.</_description>
     </key>
     <key name="incoming-message-sound" type="s">
-      <default>"/usr/share/sounds/ubuntu/stereo/message-new-instant.ogg"</default>
+      <default>"/usr/share/sounds/ubuntu/notifications/Xylo.ogg"</default>
       <_summary>Incoming message sound for the phone application.</_summary>
       <_description>This sound file is played, on incoming messages, by the phone application.</_description>
     </key>