[maemo-commits] [maemo-commits] r15800 - in projects/haf/trunk/gconf2: . debian gconf

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-07-18 23:43:59 +0300 (Fri, 18 Jul 2008)
New Revision: 15800

Added:
   projects/haf/trunk/gconf2/gconf/org.gnome.GConf.service.in
Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/configure.in
   projects/haf/trunk/gconf2/debian/changelog
   projects/haf/trunk/gconf2/debian/gconf2.install
   projects/haf/trunk/gconf2/gconf/
   projects/haf/trunk/gconf2/gconf/Makefile.am
Log:
Changes needed by new D-Bus 1.2.x

Install a system service file under /usr/share/dbus-1/system-services/.
Add a User field to the service file.

Fixes: NB#86734


Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2008-07-18 12:53:54 UTC (rev 15799)
+++ projects/haf/trunk/gconf2/ChangeLog	2008-07-18 20:43:59 UTC (rev 15800)
@@ -1,3 +1,13 @@
+2008-07-18  Guillem Jover  <guillem.jover at nokia.com>
+
+	* configure.in (dbus_systemservice_dir): Add new argument.
+	* gconf/gconf.service.in: Copy to ...
+	* gconf/org.gnome.GConf.service.in: ... this. Add User field.
+	* gconf/Makefile.am (EXTRA_DIST): Add org.gnome.GConf.service.in.
+	(service_in_files): Remove unused variable.
+	(systemservicedir): New variable.
+	(systemservice_DATA): Likewise.
+
 2008-05-15  Richard Hult  <richard at imendio.com>
 
 	* gconf/gconf-database-dbus.c (gconf_database_notify_listeners):

Modified: projects/haf/trunk/gconf2/configure.in
===================================================================
--- projects/haf/trunk/gconf2/configure.in	2008-07-18 12:53:54 UTC (rev 15799)
+++ projects/haf/trunk/gconf2/configure.in	2008-07-18 20:43:59 UTC (rev 15800)
@@ -143,6 +143,14 @@
 DBUS_SERVICE_DIR=$with_dbus_service_dir
 AC_SUBST(DBUS_SERVICE_DIR)
 
+AC_ARG_WITH([dbus_systemservice_dir],
+            [  --with-dbus-systemservice-dir=PATH choose directory for dbus system service files, [default=PREFIX/share/dbus-1/system-services]],
+            [with_dbus_systemservice_dir="$withval"],
+            [with_dbus_systemservice_dir=$datadir/dbus-1/system-services])
+
+DBUS_SYSTEMSERVICE_DIR=$with_dbus_systemservice_dir
+AC_SUBST(DBUS_SYSTEMSERVICE_DIR)
+
 PKGCONFIG_MODULES='glib-2.0 > 2.8.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 dbus-glib-1 >= 0.60'
 PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
 PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.0.0"

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2008-07-18 12:53:54 UTC (rev 15799)
+++ projects/haf/trunk/gconf2/debian/changelog	2008-07-18 20:43:59 UTC (rev 15800)
@@ -1,3 +1,12 @@
+gconf2 (2.16.0-1osso14.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Changes needed by new D-Bus 1.2.x. Fixes: NB#86734
+    - Install a system service file under /usr/share/dbus-1/system-services/.
+    - Add a User field to the service file.
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Fri, 18 Jul 2008 22:51:37 +0300
+
 gconf2 (2.16.0-1osso14) unstable; urgency=low
 
   * Fixes: NB#85503, gconfd-2 died with signal11 under memory full

Modified: projects/haf/trunk/gconf2/debian/gconf2.install
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf2.install	2008-07-18 12:53:54 UTC (rev 15799)
+++ projects/haf/trunk/gconf2/debian/gconf2.install	2008-07-18 20:43:59 UTC (rev 15800)
@@ -3,6 +3,7 @@
 debian/tmp/usr/share/man
 debian/tmp/usr/share/sgml
 debian/tmp/usr/share/dbus-1/services/gconf.service
+debian/tmp/usr/share/dbus-1/system-services/org.gnome.GConf.service
 debian/tmp/etc/dbus-1/system.d/gconfd.conf
 debian/tmp/etc/gconf/2/path
 debian/gconf-daemon.sh /etc/osso-af-init


Property changes on: projects/haf/trunk/gconf2/gconf
___________________________________________________________________
Name: svn:ignore
   - Makefile.in
.deps
Makefile
gconfmarshal.c
gconfmarshal.h
gconftool-2
gconf.service
.libs
default.path
gconfd-2
gconf-sanity-check-2

   + Makefile.in
.deps
Makefile
gconfmarshal.c
gconfmarshal.h
gconftool-2
gconf.service
org.gnome.GConf.service
.libs
default.path
gconfd-2
gconf-sanity-check-2


Modified: projects/haf/trunk/gconf2/gconf/Makefile.am
===================================================================
--- projects/haf/trunk/gconf2/gconf/Makefile.am	2008-07-18 12:53:54 UTC (rev 15799)
+++ projects/haf/trunk/gconf2/gconf/Makefile.am	2008-07-18 20:43:59 UTC (rev 15800)
@@ -129,13 +129,21 @@
 
 libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
 
-EXTRA_DIST=default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh gconf.service.in gconfd.conf
+EXTRA_DIST =				\
+	default.path.in			\
+	gconfmarshal.list		\
+	regenerate-enum-header.sh	\
+	regenerate-enum-footer.sh	\
+	gconfd.conf			\
+	org.gnome.GConf.service.in
 
 
 servicedir       = $(DBUS_SERVICE_DIR)
-service_in_files = gconf.service.in
 service_DATA     = gconf.service
 
+systemservicedir   = $(DBUS_SYSTEMSERVICE_DIR)
+systemservice_DATA = org.gnome.GConf.service
+
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 

Copied: projects/haf/trunk/gconf2/gconf/org.gnome.GConf.service.in (from rev 15781, projects/haf/trunk/gconf2/gconf/gconf.service.in)
===================================================================
--- projects/haf/trunk/gconf2/gconf/gconf.service.in	2008-07-15 12:28:01 UTC (rev 15781)
+++ projects/haf/trunk/gconf2/gconf/org.gnome.GConf.service.in	2008-07-18 20:43:59 UTC (rev 15800)
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.GConf
+Exec=@libexecdir@/gconfd-2
+User=root


Property changes on: projects/haf/trunk/gconf2/gconf/org.gnome.GConf.service.in
___________________________________________________________________
Name: svn:mergeinfo
   +