Merge lp:~laney/gsettings-ubuntu-touch-schemas/add-accountsservice-schema into lp:gsettings-ubuntu-touch-schemas

[Iain Lane]

Move AccountsService vendor extension schema from ubuntu-system-settings.

Add and install AS vendor extension schemas.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/4/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, it would have been nice to have only 1 binary for the a-s and gsettings schemas (those are only a bunch of text files), but if we want to make the schemas depends on the service it makes sense

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-07-19 11:57:43 +0000
+++ Makefile.am	2014-01-13 17:38:42 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = schemas po
+SUBDIRS = accountsservice schemas po
 
 EXTRA_DIST = autogen.sh
 

=== added directory 'accountsservice'
=== added file 'accountsservice/Makefile.am'
--- accountsservice/Makefile.am	1970-01-01 00:00:00 +0000
+++ accountsservice/Makefile.am	2014-01-13 17:38:42 +0000
@@ -0,0 +1,19 @@
+accountsservice_schemas = \
+	com.ubuntu.touch.AccountsService.SecurityPrivacy.xml
+
+EXTRA_DIST =				\
+	$(accountsservice_schemas)	
+
+install-data-hook:
+	$(MKDIR_P) $(DESTDIR)$(datadir)/dbus-1/interfaces			\
+		       $(DESTDIR)$(datadir)/accountsservice/interfaces
+	
+	for file in $(accountsservice_schemas); do 							\
+		$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/dbus-1/interfaces;	\
+		$(LN_S) ../../dbus-1/interfaces/$$file							\
+             	$(DESTDIR)$(datadir)/accountsservice/interfaces;		\
+	done
+
+CLEANFILES =						\
+	$(accountsservice_schemas)
+

=== added file 'accountsservice/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml'
--- accountsservice/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml	1970-01-01 00:00:00 +0000
+++ accountsservice/com.ubuntu.touch.AccountsService.SecurityPrivacy.xml	2014-01-13 17:38:42 +0000
@@ -0,0 +1,15 @@
+<node>
+  <interface name="com.ubuntu.touch.AccountsService.SecurityPrivacy">
+
+    <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
+
+    <property name="StatsWelcomeScreen" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+    </property>
+
+    <property name="MessagesWelcomeScreen" type="b" access="readwrite">
+      <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
+    </property>
+
+  </interface>
+</node>

=== modified file 'configure.ac'
--- configure.ac	2013-07-19 12:17:08 +0000
+++ configure.ac	2014-01-13 17:38:42 +0000
@@ -9,6 +9,8 @@
 AM_MAINTAINER_MODE([enable])
 
 AC_PROG_SED
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
 
 GIO_MIN_VERSION=[2.31.0]
 PKG_CHECK_EXISTS([gio-2.0 >= $GIO_MIN_VERSION],[],
@@ -22,6 +24,7 @@
 
 AC_OUTPUT([
 Makefile
+accountsservice/Makefile
 schemas/Makefile
 po/Makefile.in
 ])

=== added file 'debian/accountsservice-ubuntu-touch-schemas.install'
--- debian/accountsservice-ubuntu-touch-schemas.install	1970-01-01 00:00:00 +0000
+++ debian/accountsservice-ubuntu-touch-schemas.install	2014-01-13 17:38:42 +0000
@@ -0,0 +1,2 @@
+usr/share/dbus-1
+usr/share/accountsservice

=== modified file 'debian/control'
--- debian/control	2013-10-22 17:08:18 +0000
+++ debian/control	2014-01-13 17:38:42 +0000
@@ -23,3 +23,16 @@
 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.
+
+Package: accountsservice-ubuntu-touch-schemas
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         accountsservice
+Breaks: ubuntu-system-settings (<= 0.1+14.04.20140110-0ubuntu1)
+Replaces: ubuntu-system-settings (<= 0.1+14.04.20140110-0ubuntu1)
+Description: AccountsService schemas for Ubuntu Touch
+ accountsservice-ubuntu-touch-schemas contains a collection of AccountsService
+ vendor extension schemas used by various components of an Ubuntu Touch
+ environment.

=== added file 'debian/gsettings-ubuntu-touch-schemas.install'
--- debian/gsettings-ubuntu-touch-schemas.install	1970-01-01 00:00:00 +0000
+++ debian/gsettings-ubuntu-touch-schemas.install	2014-01-13 17:38:42 +0000
@@ -0,0 +1,1 @@
+usr/share/glib-2.0