GSettings Ubuntu touch schemas

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

  1. sync_trunk
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~sil2100/gsettings-ubuntu-touch-schemas/sync_trunk
Merge into: lp:gsettings-ubuntu-touch-schemas
Diff against target: 47 lines (+11/-3)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
schemas/com.ubuntu.touch.sound.gschema.xml.in.in (+2/-2)
To merge this branch: bzr merge lp:~sil2100/gsettings-ubuntu-touch-schemas/sync_trunk
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+192199@code.launchpad.net

Commit message

Sync trunk with distro

Description of the change

Sync trunk with distro

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-30 00:02:37 +0000
3+++ debian/changelog 2013-10-22 17:12:55 +0000
4@@ -1,3 +1,10 @@
5+gsettings-ubuntu-touch-schemas (0.0.1+13.10.20130730-0ubuntu2) saucy; urgency=low
6+
7+ * Change the default sounds for calls and messages, depends on
8+ ubuntu-touch-sounds so we are sure users get the files with the defaults
9+
10+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 14 Oct 2013 16:36:03 +0200
11+
12 gsettings-ubuntu-touch-schemas (0.0.1+13.10.20130730-0ubuntu1) saucy; urgency=low
13
14 [ Sebastien Bacher ]
15
16=== modified file 'debian/control'
17--- debian/control 2013-07-19 12:36:12 +0000
18+++ debian/control 2013-10-22 17:12:55 +0000
19@@ -18,7 +18,8 @@
20 Architecture: all
21 Multi-Arch: foreign
22 Depends: ${misc:Depends},
23- ${shlibs:Depends}
24+ ${shlibs:Depends},
25+ ubuntu-touch-sounds,
26 Description: GSettings deskop-wide schemas for Ubuntu Touch
27 gsettings-desktop-schemas contains a collection of GSettings schemas for
28 settings shared by various components of an Ubuntu Touch environment.
29
30=== modified file 'schemas/com.ubuntu.touch.sound.gschema.xml.in.in'
31--- schemas/com.ubuntu.touch.sound.gschema.xml.in.in 2013-07-29 15:07:45 +0000
32+++ schemas/com.ubuntu.touch.sound.gschema.xml.in.in 2013-10-22 17:12:55 +0000
33@@ -6,12 +6,12 @@
34 <_description>Whether silent mode is active or not.</_description>
35 </key>
36 <key name="incoming-call-sound" type="s">
37- <default>"/usr/share/sounds/ubuntu/stereo/phone-incoming-call.ogg"</default>
38+ <default>"/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"</default>
39 <_summary>Ringtone sound for the phone application.</_summary>
40 <_description>This sound file is played, on incoming calls, by the phone application.</_description>
41 </key>
42 <key name="incoming-message-sound" type="s">
43- <default>"/usr/share/sounds/ubuntu/stereo/message-new-instant.ogg"</default>
44+ <default>"/usr/share/sounds/ubuntu/notifications/Xylo.ogg"</default>
45 <_summary>Incoming message sound for the phone application.</_summary>
46 <_description>This sound file is played, on incoming messages, by the phone application.</_description>
47 </key>

Subscribers

People subscribed via source and target branches