Merge lp:~pishuilu1128/ubuntukylin/ubuntukylin-wallpapers into lp:~ubuntukylin-members/ubuntukylin/ubuntukylin-wallpapers

Proposed by ShuiLu Pi
Status: Merged
Merged at revision: 26
Proposed branch: lp:~pishuilu1128/ubuntukylin/ubuntukylin-wallpapers
Merge into: lp:~ubuntukylin-members/ubuntukylin/ubuntukylin-wallpapers
Diff against target: 30 lines (+7/-0)
3 files modified
30_ubuntukylin-wallpapers.gschema.override (+5/-0)
debian/ubuntukylin-wallpapers.install (+1/-0)
setup.py (+1/-0)
To merge this branch: bzr merge lp:~pishuilu1128/ubuntukylin/ubuntukylin-wallpapers
Reviewer Review Type Date Requested Status
ShuiLu Pi Pending
Review via email: mp+185708@code.launchpad.net

Description of the change

set the default wallpaper

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '30_ubuntukylin-wallpapers.gschema.override'
2--- 30_ubuntukylin-wallpapers.gschema.override 1970-01-01 00:00:00 +0000
3+++ 30_ubuntukylin-wallpapers.gschema.override 2013-09-16 06:13:15 +0000
4@@ -0,0 +1,5 @@
5+[com.canonical.unity-greeter]
6+background="/usr/share/backgrounds/warty-final-ubuntukylin.jpg"
7+
8+[org.gnome.desktop.background]
9+picture-uri='file:///usr/share/backgrounds/warty-final-ubuntukylin.jpg'
10
11=== modified file 'debian/ubuntukylin-wallpapers.install'
12--- debian/ubuntukylin-wallpapers.install 2013-09-03 18:54:46 +0000
13+++ debian/ubuntukylin-wallpapers.install 2013-09-16 06:13:15 +0000
14@@ -1,3 +1,4 @@
15 usr/share/backgrounds/warty-final-ubuntukylin.jpg
16 usr/share/gnome-background-properties/ubuntukylin-wallpapers.xml
17 usr/share/locale/*
18+usr/share/glib-2.0/schemas/30_ubuntukylin-wallpapers.gschema.override
19
20=== modified file 'setup.py'
21--- setup.py 2013-09-03 17:41:15 +0000
22+++ setup.py 2013-09-16 06:13:15 +0000
23@@ -17,6 +17,7 @@
24 version = version,
25 data_files=[('share/backgrounds', glob.glob('*.png')+glob.glob('*.jpg')),
26 ('share/backgrounds/ubuntukylin', glob.glob('ubuntukylin/*.xml')),
27+ ('share/glib-2.0/schemas',glob.glob('*.override')),
28 ],
29 cmdclass = { "build" : build_extra.build_extra,
30 "build_i18n" : build_i18n.build_i18n }

Subscribers

People subscribed via source and target branches