Ubuntu
ubuntuone-client-gnome package

Merge lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/missing-schemas into lp:ubuntu/oneiric/ubuntuone-client-gnome

  1. Oneiric (11.10)
  2. missing-schemas
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 7
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/missing-schemas
Merge into: lp:ubuntu/oneiric/ubuntuone-client-gnome
Diff against target: 233 lines (+71/-12)
8 files modified
configure (+10/-10)
configure.ac (+1/-1)
debian/changelog (+8/-0)
debian/install (+1/-0)
gsd/gsd-ubuntuone.gschema.xml.in.in (+5/-0)
nautilus/Makefile.am (+16/-1)
nautilus/Makefile.in (+11/-0)
nautilus/nautilus-ubuntuone.gschema.xml.in.in (+19/-0)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/missing-schemas
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+78132@code.launchpad.net
To post a comment you must log in.
lp:~dobey/ubuntu/oneiric/ubuntuone-client-gnome/missing-schemas updated
8. By dobey

Idiot, no e in usr

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2011-09-27 18:30:52 +0000
3+++ configure 2011-10-04 18:11:24 +0000
4@@ -1,6 +1,6 @@
5 #! /bin/sh
6 # Guess values for system-dependent variables and create Makefiles.
7-# Generated by GNU Autoconf 2.67 for ubuntuone-client-gnome 2.0.0.
8+# Generated by GNU Autoconf 2.67 for ubuntuone-client-gnome 2.0.1.
9 #
10 #
11 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
12@@ -698,8 +698,8 @@
13 # Identity of this package.
14 PACKAGE_NAME='ubuntuone-client-gnome'
15 PACKAGE_TARNAME='ubuntuone-client-gnome'
16-PACKAGE_VERSION='2.0.0'
17-PACKAGE_STRING='ubuntuone-client-gnome 2.0.0'
18+PACKAGE_VERSION='2.0.1'
19+PACKAGE_STRING='ubuntuone-client-gnome 2.0.1'
20 PACKAGE_BUGREPORT=''
21 PACKAGE_URL=''
22
23@@ -1481,7 +1481,7 @@
24 # Omit some internal or obsolete options to make the list less imposing.
25 # This message is too long to be a string in the A/UX 3.1 sh.
26 cat <<_ACEOF
27-\`configure' configures ubuntuone-client-gnome 2.0.0 to adapt to many kinds of systems.
28+\`configure' configures ubuntuone-client-gnome 2.0.1 to adapt to many kinds of systems.
29
30 Usage: $0 [OPTION]... [VAR=VALUE]...
31
32@@ -1552,7 +1552,7 @@
33
34 if test -n "$ac_init_help"; then
35 case $ac_init_help in
36- short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.0.0:";;
37+ short | recursive ) echo "Configuration of ubuntuone-client-gnome 2.0.1:";;
38 esac
39 cat <<\_ACEOF
40
41@@ -1673,7 +1673,7 @@
42 test -n "$ac_init_help" && exit $ac_status
43 if $ac_init_version; then
44 cat <<\_ACEOF
45-ubuntuone-client-gnome configure 2.0.0
46+ubuntuone-client-gnome configure 2.0.1
47 generated by GNU Autoconf 2.67
48
49 Copyright (C) 2010 Free Software Foundation, Inc.
50@@ -1951,7 +1951,7 @@
51 This file contains any messages produced by compilers while
52 running configure, to aid debugging if configure makes a mistake.
53
54-It was created by ubuntuone-client-gnome $as_me 2.0.0, which was
55+It was created by ubuntuone-client-gnome $as_me 2.0.1, which was
56 generated by GNU Autoconf 2.67. Invocation command line was
57
58 $ $0 $@
59@@ -2768,7 +2768,7 @@
60
61 # Define the identity of the package.
62 PACKAGE='ubuntuone-client-gnome'
63- VERSION='2.0.0'
64+ VERSION='2.0.1'
65
66
67 cat >>confdefs.h <<_ACEOF
68@@ -13330,7 +13330,7 @@
69 # report actual input values of CONFIG_FILES etc. instead of their
70 # values after options handling.
71 ac_log="
72-This file was extended by ubuntuone-client-gnome $as_me 2.0.0, which was
73+This file was extended by ubuntuone-client-gnome $as_me 2.0.1, which was
74 generated by GNU Autoconf 2.67. Invocation command line was
75
76 CONFIG_FILES = $CONFIG_FILES
77@@ -13396,7 +13396,7 @@
78 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
79 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
80 ac_cs_version="\\
81-ubuntuone-client-gnome config.status 2.0.0
82+ubuntuone-client-gnome config.status 2.0.1
83 configured by $0, generated by GNU Autoconf 2.67,
84 with options \\"\$ac_cs_config\\"
85
86
87=== modified file 'configure.ac'
88--- configure.ac 2011-09-27 18:30:52 +0000
89+++ configure.ac 2011-10-04 18:11:24 +0000
90@@ -1,7 +1,7 @@
91 dnl Process this file with autoconf to produce a configure script.
92 AC_PREREQ(2.53)
93
94-AC_INIT([ubuntuone-client-gnome], [2.0.0])
95+AC_INIT([ubuntuone-client-gnome], [2.0.1])
96 AC_CONFIG_SRCDIR([config.h.in])
97
98 AM_INIT_AUTOMAKE([1.10 foreign])
99
100=== modified file 'debian/changelog'
101--- debian/changelog 2011-10-02 23:02:47 +0000
102+++ debian/changelog 2011-10-04 18:11:24 +0000
103@@ -1,3 +1,11 @@
104+ubuntuone-client-gnome (2.0.1-0ubuntu1) oneiric; urgency=low
105+
106+ * New upstream release.
107+ - Install nautilus gsettings schemas (LP: #865567)
108+ * debian/install: Include the gschema files
109+
110+ -- Rodney Dawes <rodney.dawes@ubuntu.com> Tue, 04 Oct 2011 13:47:57 -0400
111+
112 ubuntuone-client-gnome (2.0.0-0ubuntu2) oneiric; urgency=low
113
114 * debian/install: Remove the override file, fixes FTBFS.
115
116=== modified file 'debian/install'
117--- debian/install 2011-10-02 23:02:47 +0000
118+++ debian/install 2011-10-04 18:11:24 +0000
119@@ -1,3 +1,4 @@
120 debian/*/usr/lib/gnome-settings-daemon-*/*
121 debian/*/usr/lib/nautilus/extensions-*/libnautilus-ubuntuone.*
122+debian/*/usr/share/glib-*/schemas/*
123
124
125=== modified file 'gsd/gsd-ubuntuone.gschema.xml.in.in'
126--- gsd/gsd-ubuntuone.gschema.xml.in.in 2011-09-27 18:30:52 +0000
127+++ gsd/gsd-ubuntuone.gschema.xml.in.in 2011-10-04 18:11:24 +0000
128@@ -10,5 +10,10 @@
129 <summary>Priority for loading Ubuntu One features in gnome-settings-daemon</summary>
130 <description>The startup queue priority for the Ubuntu One gnome-settings-daemon plug-in.</description>
131 </key>
132+ <key name="checked-bookmark-file" type="b">
133+ <default>false</default>
134+ <summary>Whether the bookmarks file configuration has been done yet.</summary>
135+ <description>True if the bookmarks file has been configured with the Ubuntu One bookmark already.</description>
136+ </key>
137 </schema>
138 </schemalist>
139
140=== modified file 'nautilus/Makefile.am'
141--- nautilus/Makefile.am 2011-08-11 12:52:11 +0000
142+++ nautilus/Makefile.am 2011-10-04 18:11:24 +0000
143@@ -4,6 +4,20 @@
144
145 extension_LTLIBRARIES = libnautilus-ubuntuone.la
146
147+gschema_in_files = nautilus-ubuntuone.gschema.xml.in.in
148+gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
149+
150+if HAVE_NAUTILUS_30
151+gsettingsdir = $(datadir)/glib-2.0/schemas
152+
153+%.gschema.xml.in: %.gschema.xml.in.in
154+ $(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@
155+
156+@INTLTOOL_XML_NOMERGE_RULE@
157+
158+@GSETTINGS_RULES@
159+endif
160+
161 libnautilus_ubuntuone_la_CFLAGS = \
162 -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" \
163 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
164@@ -70,7 +84,8 @@
165 test-highlight.c
166 test_highlight_LDADD = $(NAUTILUS_LIBS)
167
168-EXTRA_DIST = \
169+EXTRA_DIST = \
170+ $(gschema_in_files) \
171 ubuntuone-marshallers.list
172
173 MAINTAINERCLEANFILES = \
174
175=== modified file 'nautilus/Makefile.in'
176--- nautilus/Makefile.in 2011-09-27 18:30:52 +0000
177+++ nautilus/Makefile.in 2011-10-04 18:11:24 +0000
178@@ -297,6 +297,9 @@
179 MARSHAL_PREFIX = ubuntuone_nautilus_marshal
180 extensiondir = $(libdir)/nautilus/$(NAUTILUS_EXTENSIONDIR_NAME)
181 extension_LTLIBRARIES = libnautilus-ubuntuone.la
182+gschema_in_files = nautilus-ubuntuone.gschema.xml.in.in
183+gsettings_SCHEMAS = $(gschema_in_files:.xml.in.in=.xml)
184+@HAVE_NAUTILUS_30_TRUE@gsettingsdir = $(datadir)/glib-2.0/schemas
185 libnautilus_ubuntuone_la_CFLAGS = \
186 -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" \
187 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
188@@ -355,6 +358,7 @@
189
190 test_highlight_LDADD = $(NAUTILUS_LIBS)
191 EXTRA_DIST = \
192+ $(gschema_in_files) \
193 ubuntuone-marshallers.list
194
195 MAINTAINERCLEANFILES = \
196@@ -911,6 +915,13 @@
197 uninstall-am uninstall-extensionLTLIBRARIES
198
199
200+@HAVE_NAUTILUS_30_TRUE@%.gschema.xml.in: %.gschema.xml.in.in
201+@HAVE_NAUTILUS_30_TRUE@ $(AM_V_GEN) sed -e "s|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g" $< > $@
202+
203+@HAVE_NAUTILUS_30_TRUE@@INTLTOOL_XML_NOMERGE_RULE@
204+
205+@HAVE_NAUTILUS_30_TRUE@@GSETTINGS_RULES@
206+
207 ubuntuone-marshallers.c: ubuntuone-marshallers.list
208 glib-genmarshal --body --prefix=$(MARSHAL_PREFIX) $< > $@
209
210
211=== added file 'nautilus/nautilus-ubuntuone.gschema.xml.in.in'
212--- nautilus/nautilus-ubuntuone.gschema.xml.in.in 1970-01-01 00:00:00 +0000
213+++ nautilus/nautilus-ubuntuone.gschema.xml.in.in 2011-10-04 18:11:24 +0000
214@@ -0,0 +1,19 @@
215+<schemalist>
216+ <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.nautilus.extensions.ubuntuone" path="/org/gnome/nautilus/extensions/ubuntuone/">
217+ <key name="recently-used-contacts" type="as">
218+ <default>[]</default>
219+ <summary>Recently used contacts</summary>
220+ <description>Contacts which have been used recently in the Ubuntu One share dialog.</description>
221+ </key>
222+ <key name="expand-location" type="b">
223+ <default>false</default>
224+ <summary>Whether the location bar is expanded</summary>
225+ <description>True if the location bar is expanded.</description>
226+ </key>
227+ <key name="show-location" type="b">
228+ <default>false</default>
229+ <summary>Hide the location bar.</summary>
230+ <description>True if the Ubuntu One location bar is to be hidden.</description>
231+ </key>
232+ </schema>
233+</schemalist>

Subscribers

People subscribed via source and target branches

to all changes: