[maemo-commits] [maemo-commits] r9196 - in projects/haf/trunk/gconf2: . debian debian/patches

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Jan 19 16:30:15 EET 2007 
Author: richard
Date: 2007-01-19 16:30:13 +0200 (Fri, 19 Jan 2007)
New Revision: 9196

Added:
   projects/haf/trunk/gconf2/debian/
   projects/haf/trunk/gconf2/debian/changelog
   projects/haf/trunk/gconf2/debian/compat
   projects/haf/trunk/gconf2/debian/control
   projects/haf/trunk/gconf2/debian/copyright
   projects/haf/trunk/gconf2/debian/gconf-daemon.sh
   projects/haf/trunk/gconf2/debian/gconf2.dirs
   projects/haf/trunk/gconf2/debian/gconf2.install
   projects/haf/trunk/gconf2/debian/gconf2.postinst
   projects/haf/trunk/gconf2/debian/gconf2.postrm
   projects/haf/trunk/gconf2/debian/gconf2.prerm
   projects/haf/trunk/gconf2/debian/gconftool-2.1
   projects/haf/trunk/gconf2/debian/libgconf2-6.install
   projects/haf/trunk/gconf2/debian/libgconf2-dev.install
   projects/haf/trunk/gconf2/debian/patches/
   projects/haf/trunk/gconf2/debian/patches/01-umask.patch
   projects/haf/trunk/gconf2/debian/patches/02-set-database-dir.patch
   projects/haf/trunk/gconf2/debian/patches/03-kill-after-schema-install.patch
   projects/haf/trunk/gconf2/debian/patches/04-hack-config-source.patch
   projects/haf/trunk/gconf2/debian/rules
Log:
Add new debian dir.

Added: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/changelog	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,107 @@
+gconf2 (2.16.0-1osso1) unstable; urgency=low
+
+  * First release of 2.16.x.
+
+ -- Richard Hult <richard at imendio.com>  Fri, 19 Jan 2007 12:10:37 +0100
+
+gconf2 (2.6.4.15-osso4) unstable; urgency=low
+
+  * Fixed gconf_client_get_default_from_schema(). Fixes: NB#44115
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 24 Oct 2006 15:21:45 +0300
+
+gconf2 (2.6.4.15-osso3) unstable; urgency=low
+
+  * Fixed dependencies in the debug package. Fixes: NB#41286
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 10 Oct 2006 16:39:34 +0300
+
+gconf2 (2.6.4.15-osso2) unstable; urgency=low
+
+  * Fixed the debug package. Fixes: NB#41286
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 27 Sep 2006 16:19:41 +0300
+
+gconf2 (2.6.4.15-osso1) unstable; urgency=low
+
+  * Upstream tarball updated to 2.6.4.15.
+    Fixes a leak in gconf/gconf-client.c (gconf_client_notify).
+  * Fixed a Lintian warning and corrected the maintainer name.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 19 Sep 2006 17:09:27 +0300
+
+gconf2 (2.6.4.14-osso4) unstable; urgency=low
+
+  * Added building of debug package libgconf2-6-dbg. Fixes: NB#40229
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 12 Sep 2006 16:33:17 +0300
+
+gconf2 (2.6.4.14-osso3) unstable; urgency=low
+
+  * Added dependency to dbus because of the messagebus user created by it.
+    Fixes: NB#37497
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 10 Aug 2006 13:55:43 +0300
+
+gconf2 (2.6.4.14-osso2) unstable; urgency=low
+
+  * Added thumb instruction support (N#26462).
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 05 May 2006 12:49:21 +0300
+
+gconf2 (2.6.4.14-osso1) unstable; urgency=low
+
+  * New upstream tarball.
+  * Memory leak fixes (N#25476, N#20476).
+  * Removed static libraries from run-time package (N#25765).
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 11 Apr 2006 18:41:21 +0300
+
+gconf2 (2.6.4.13-osso5) unstable; urgency=low
+
+  * Hard-coded the config source for makefile-install-rule (N#23809).
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 14 Mar 2006 12:41:52 +0200
+
+gconf2 (2.6.4.13-osso4) unstable; urgency=low
+
+  * Upgraded the upstream tar to _real_ 2.6.4.13.
+  * Removed internal patches that are included in the tar.
+  * Upstream fixes the double free bug (N#22428).
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 25 Jan 2006 14:15:18 +0200
+
+gconf2 (2.6.4.13-osso3) unstable; urgency=low
+
+  * Added patch for setting the database directory.
+  * Added patch to fix recursive get problem (N#22411).
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 19 Jan 2006 16:32:59 +0200
+
+gconf2 (2.6.4.13-osso2) unstable; urgency=low
+
+  * Depending to v0.60 dbus.
+  * Added patch for v0.60 dbus version.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 21 Dec 2005 14:37:08 +0200
+
+gconf2 (2.6.4.13-osso1) unstable; urgency=low
+
+  * New upstream package version 2.6.4.13 with couple of bug fixes.
+  * Tidied up startup script and removed the unused one.
+  * Not building or installing po files.
+  * Added the umask patch for Backup application.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 23 Nov 2005 13:28:27 +0200
+
+gconf2 (2.6.4.12-osso1) unstable; urgency=low
+
+  * New upstream package.
+  * Fixed stopping of the daemon in the startup script.
+  * Removed some internal patches that are now in the upstream package.
+    (Some internal patches still need porting for the new upstream package.)
+  * Fixed dbus dependency to depend to version 0.50 and up. 
+  * Put patch to fix default system bus address in gconftool (added running
+    of automake-1.7 because of that).
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 07 Nov 2005 16:58:07 +0200

Added: projects/haf/trunk/gconf2/debian/compat
===================================================================
--- projects/haf/trunk/gconf2/debian/compat	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/compat	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,2 @@
+4
+

Added: projects/haf/trunk/gconf2/debian/control
===================================================================
--- projects/haf/trunk/gconf2/debian/control	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/control	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,54 @@
+Source: gconf2
+Section: libs
+Priority: optional
+Maintainer: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com> 
+Build-Depends: debhelper (>> 4.1.0), cdbs, libglib2.0-dev (>= 2.8), libpopt-dev, libxml2-dev, zlib1g-dev, gettext, gcc (>= 3:3.2.2), gnome-pkg-tools, python (>= 2.3), libxml-parser-perl, gtk-doc-tools, libdbus-glib-1-dev (>= 0.60)
+Standards-Version: 3.6.2
+
+Package: gconf2
+Section: admin
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, dbus
+Conflicts: gconf (<< 1.0.6-4), libgconf11 (<< 1.0.9-2.1)
+Replaces: libgconf2-4 (<< 1.1.10-2)
+Description: GNOME configuration database system. (daemon and tools, for GNOME2)
+ GConf is a configuration database system, functionally similar to the
+ Windows registry but lots better. :-) It's being written for the GNOME
+ desktop but does not require GNOME.
+ .
+ This package contains gconfd daemon and gconf tools binaries for GNOME2
+
+Package: libgconf2-6
+Section: libs
+Priority: optional
+Architecture: any
+Replaces: libgconf2-2 (= 1.1.7-1), libgconf2-4 (<< 1.1.10-2)
+Conflicts: libgconf2-2 (= 1.1.7-1), libgconf2-4 (<< 1.1.10-2)
+Depends: ${shlibs:Depends}, gconf2 (>= ${Source-Version})
+Description: GNOME configuration database system libraries (for GNOME2)
+ GConf is a configuration database system, functionally similar to the
+ Windows registry but lots better. :-) It's being written for the GNOME
+ desktop but does not require GNOME.
+ .
+ This package contains shared libraries for GNOME2
+
+Package: libgconf2-6-dbg
+Section: libs
+Priority: optional
+Architecture: any
+Depends: libgconf2-6 (= ${Source-Version})
+Description: libgconf2-6 with debug symbols.
+ This package contains libgconf2-6 with debug symbols.
+
+Package: libgconf2-dev
+Section: devel
+Priority: optional
+Architecture: any
+Depends: libgconf2-6 (= ${Source-Version}), libglib2.0-dev, libpopt-dev, libdbus-glib-1-dev (>= 0.60), gconf2 (>= ${Source-Version})
+Description: GNOME configuration database system development files. (for GNOME2)
+ GConf is a configuration database system, functionally similar to the
+ Windows registry but lots better. :-) It's being written for the GNOME
+ desktop but does not require GNOME
+ .
+ This package contains development files for GNOME2

Added: projects/haf/trunk/gconf2/debian/copyright
===================================================================
--- projects/haf/trunk/gconf2/debian/copyright	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/copyright	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,23 @@
+This package was debianized by  Vincent Renardias <vincent at debian.org> on
+Fri, 12 May 2000 20:53:21 +0200.
+
+It was downloaded from the ftp.gnome.org.
+
+/* GConf
+ * Copyright (C) 1999, 2000 Red Hat Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * Boston, MA 02110-1301, USA.
+ */

Added: projects/haf/trunk/gconf2/debian/gconf-daemon.sh
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf-daemon.sh	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconf-daemon.sh	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# GConf daemon startup/shutdown script
+
+PROG=/usr/lib/gconf2/gconfd-2
+SVC="GConf daemon"
+
+case "$1" in
+start)  START=TRUE
+        ;;
+stop)   START=FALSE
+        ;;
+*)      echo "Usage: $0 {start|stop}"
+	exit 1
+        ;;
+esac
+
+if [ $START = TRUE ]; then
+  echo "Not starting $SVC, D-BUS starts it"
+else
+  PID=`pidof $PROG`
+  if [ "x$PID" != "x" ]; then
+    echo "Stopping $SVC"
+    kill $PID
+  fi
+fi


Property changes on: projects/haf/trunk/gconf2/debian/gconf-daemon.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: projects/haf/trunk/gconf2/debian/gconf2.dirs
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf2.dirs	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconf2.dirs	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,4 @@
+/etc/gconf/2
+/etc/gconf/gconf.xml.mandatory
+/etc/gconf/gconf.xml.defaults
+/usr/share/gconf/defaults

Added: projects/haf/trunk/gconf2/debian/gconf2.install
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf2.install	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconf2.install	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,7 @@
+debian/tmp/usr/bin
+debian/tmp/usr/lib/gconf2/gconfd-2
+debian/tmp/usr/share/man
+debian/tmp/usr/share/sgml
+debian/tmp/usr/share/dbus-1/services/gconf.service
+debian/tmp/etc/dbus-1/system.d/gconfd.conf
+debian/gconf-daemon.sh /etc/osso-af-init

Added: projects/haf/trunk/gconf2/debian/gconf2.postinst
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf2.postinst	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconf2.postinst	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+#find /etc/gconf/gconf.xml.defaults -type d -exec chmod go=rX {} \;
+find /etc/gconf/gconf.xml.defaults -type d | xargs chmod go=rX
+
+update-alternatives --install \
+        /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25
+
+# KH: create directory for the database
+mkdir -p /var/lib/gconf
+chown messagebus:messagebus /var/lib/gconf
+chmod -R go+rwx /var/lib/gconf
+
+#DEBHELPER#

Added: projects/haf/trunk/gconf2/debian/gconf2.postrm
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf2.postrm	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconf2.postrm	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "purge" -a -d /etc/gconf/2 ];then
+    rmdir -p --ignore-fail-on-non-empty /etc/gconf/2
+fi
+
+#DEBHELPER#

Added: projects/haf/trunk/gconf2/debian/gconf2.prerm
===================================================================
--- projects/haf/trunk/gconf2/debian/gconf2.prerm	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconf2.prerm	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --remove gconftool /usr/bin/gconftool-2
+
+#DEBHELPER#

Added: projects/haf/trunk/gconf2/debian/gconftool-2.1
===================================================================
--- projects/haf/trunk/gconf2/debian/gconftool-2.1	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/gconftool-2.1	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,124 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
+.TH GCONFTOOL-2 "1" "October 2003" "gconftool-2 2.2.1" "User Commands"
+.SH NAME
+gconftool-2 \- manual page for gconftool-2
+.SH SYNOPSIS
+.B gconftool-2
+[\fIOPTION\fR...]
+.SH DESCRIPTION
+.TP
+\fB\-s\fR, \fB\-\-set\fR
+Set a key to a value and sync. Use with \fB\-\-type\fR.
+.TP
+\fB\-g\fR, \fB\-\-get\fR
+Print the value of a key to standard output.
+.TP
+\fB\-u\fR, \fB\-\-unset\fR
+Unset the keys on the command line.
+.TP
+\fB\-\-recursive\-unset\fR
+Recursively unset all keys at or below the key/directory names on the command line.
+.TP
+\fB\-a\fR, \fB\-\-all\-entries\fR
+Print all key/value pairs in a directory.
+.TP
+\fB\-\-all\-dirs\fR
+Print all subdirectories in a directory.
+.TP
+\fB\-R\fR, \fB\-\-recursive\-list\fR
+Print all subdirectories and entries under a dir, recursively.
+.TP
+\fB\-\-dir\-exists\fR=\fISTRING\fR
+Return 0 if the directory exists, 2 if it does not.
+\fB\-t\fR, \fB\-\-type\fR=\fIint\fR|bool|float|string|list|pair
+Specify the type of the value being set, or the type of the value a schema describes. Unique abbreviations are allowed.
+.TP
+\fB\-\-list\-type\fR=\fIint\fR|bool|float|string
+Specify the type of the list value being set, or the type of the value a schema describes. Unique abbreviations are allowed.
+.TP
+\fB\-\-car\-type\fR=\fIint\fR|bool|float|string
+Specify the type of the car pair value being set, or the type of the value a schema describes. Unique abbreviations are allowed.
+.TP
+\fB\-\-cdr\-type\fR=\fIint\fR|bool|float|string
+Specify the type of the cdr pair value being set, or the type of the value a schema describes. Unique abbreviations are allowed.
+.TP
+\fB\-\-short\-desc\fR=\fIDESCRIPTION\fR
+Specify a short half-line description to go in a schema.
+.TP
+\fB\-\-long\-desc\fR=\fIDESCRIPTION\fR
+Specify a several-line description to go in a schema.
+.TP
+\fB\-\-owner\fR=\fIOWNER\fR
+Specify the owner of a schema.
+.TP
+\fB\-\-install\-schema\-file\fR=\fIFILENAME\fR
+Specify a schema file to be installed
+.TP
+\fB\-\-config\-source\fR=\fISOURCE\fR
+Specify a configuration source to use rather than the default path
+.TP
+\fB\-\-direct\fR
+Access the config database directly, bypassing server. Requires that gconfd is not running.
+.TP
+\fB\-\-set\-schema\fR
+Set a schema and sync. Use with \fB\-\-short\-desc\fR, \fB\-\-long\-desc\fR, \fB\-\-owner\fR, and \fB\-\-type\fR.
+.TP
+\fB\-\-makefile\-install\-rule\fR
+Properly installs schema files on the command line into the database. GCONF_CONFIG_SOURCE environment variable should be set to a non-default config source or set to the empty string to use the default.
+.TP
+\fB\-\-break\-key\fR
+Torture-test an application by setting and unsetting a bunch of values of different types for keys on the command line.
+.TP
+\fB\-\-break\-directory\fR
+Torture-test an application by setting and unsetting a bunch of keys inside the directories on the command line.
+.TP
+\fB\-\-short\-docs\fR
+Get the short doc string for a key
+.TP
+\fB\-\-long\-docs\fR
+Get the long doc string for a key
+.TP
+\fB\-\-get\-schema\-name\fR
+Get the name of the schema applied to this key
+.TP
+\fB\-\-apply\-schema\fR
+Specify the schema name followed by the key to apply the schema name to
+.TP
+\fB\-\-unapply\-schema\fR
+Remove any schema name applied to the given keys
+.TP
+\fB\-\-get\-default\-source\fR
+Get the name of the default source.
+.TP
+\fB\-\-shutdown\fR
+Shut down gconfd. \fBDon't use this option without good reason.\fP
+.TP
+\fB\-p\fR, \fB\-\-ping\fR
+Return 0 if gconfd is running, 2 if not.
+.TP
+\fB\-\-spawn\fR
+Launch the config server (gconfd). (Normally happens automatically when needed.)
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version
+.PP
+Help options
+.TP
+-?, \fB\-\-help\fR
+Show the help message.
+.TP
+\fB\-\-usage\fR
+Display brief usage message.
+.SH EXAMPLES
+Display the path to the current desktop wallpaper.
+.IP
+gconftool-2 \-\-get /desktop/gnome/background/picture_filename
+.PP
+Change the widget font to "Serif 12"
+.IP
+gconftool-2 \-\-type string \-\-set /desktop/gnome/interface/font_name "Serif 12"
+.PP
+.SH AUTHOR
+\fBGConf\fP was written by Havoc Pennington <hp at redhat.com>.
+.SH "SEE ALSO"
+The GConf web site, \fIhttp://www.gnome.org/projects/gconf/\fI.

Added: projects/haf/trunk/gconf2/debian/libgconf2-6.install
===================================================================
--- projects/haf/trunk/gconf2/debian/libgconf2-6.install	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/libgconf2-6.install	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/libgconf2/gconf*
+debian/tmp/usr/lib/libgconf2/2/*.so

Added: projects/haf/trunk/gconf2/debian/libgconf2-dev.install
===================================================================
--- projects/haf/trunk/gconf2/debian/libgconf2-dev.install	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/libgconf2-dev.install	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,7 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*.la
+debian/tmp/usr/share/aclocal
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc/html/gconf/* usr/share/doc/gconf2/html/

Added: projects/haf/trunk/gconf2/debian/patches/01-umask.patch
===================================================================
--- projects/haf/trunk/gconf2/debian/patches/01-umask.patch	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/patches/01-umask.patch	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,21 @@
+--- gconf/gconfd.c-unmod	2007-01-18 14:33:01.000000000 +0100
++++ gconf/gconfd.c	2007-01-19 13:18:51.000000000 +0100
+@@ -676,7 +676,7 @@ main(int argc, char** argv)
+       gconf_log_debug_messages = TRUE;
+     }
+   
+-  umask (022);
++  umask (0);
+ 
+ #ifndef DAEMON_DEBUG
+   gconf_set_daemon_mode(TRUE);
+--- gconf/gconftool.c-unmod	2007-01-18 14:33:01.000000000 +0100
++++ gconf/gconftool.c	2007-01-19 13:18:31.000000000 +0100
+@@ -544,6 +544,7 @@ main (int argc, char** argv)
+   bindtextdomain (GETTEXT_PACKAGE,GCONF_LOCALE_DIR);
+   textdomain (GETTEXT_PACKAGE);
+   _gconf_init_i18n ();
++  umask(0);
+   
+   context = g_option_context_new (_("- Tool to manipulate a GConf configuration"));
+ 

Added: projects/haf/trunk/gconf2/debian/patches/02-set-database-dir.patch
===================================================================
--- projects/haf/trunk/gconf2/debian/patches/02-set-database-dir.patch	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/patches/02-set-database-dir.patch	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,11 @@
+--- gconf/default.path.in-unmod	2007-01-19 13:40:24.000000000 +0100
++++ gconf/default.path.in	2007-01-19 13:40:26.000000000 +0100
+@@ -18,7 +18,7 @@ include @sysgconfdir@/2/local-mandatory.
+ include "$(HOME)/.gconf.path"
+ 
+ # Give users a default storage location, ~/.gconf
+-xml:readwrite:$(HOME)/.gconf
++xml:readwrite:/etc/osso-af-init/gconf-dir
+ 
+ # To read in any defaults settings that the Sys Admin may have created
+ # prior to a desktop system upgrade. The SysAdmin can stick default values

Added: projects/haf/trunk/gconf2/debian/patches/03-kill-after-schema-install.patch
===================================================================
--- projects/haf/trunk/gconf2/debian/patches/03-kill-after-schema-install.patch	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/patches/03-kill-after-schema-install.patch	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,20 @@
+--- gconf/gconftool.c-unmod	2007-01-19 13:45:37.000000000 +0100
++++ gconf/gconftool.c	2007-01-19 13:51:27.000000000 +0100
+@@ -963,6 +963,8 @@ main (int argc, char** argv)
+       
+       gconf_engine_unref (conf);
+ 
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONFD, NULL, NULL, NULL, NULL);
++
+       return retval;
+     }
+ 
+@@ -975,6 +977,8 @@ main (int argc, char** argv)
+       
+       gconf_engine_unref (conf);
+ 
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONFD, NULL, NULL, NULL, NULL);
++
+       return retval;
+     }
+ 

Added: projects/haf/trunk/gconf2/debian/patches/04-hack-config-source.patch
===================================================================
--- projects/haf/trunk/gconf2/debian/patches/04-hack-config-source.patch	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/patches/04-hack-config-source.patch	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,29 @@
+--- gconf/gconftool.c-unmod	2007-01-19 13:52:32.000000000 +0100
++++ gconf/gconftool.c	2007-01-19 13:53:13.000000000 +0100
+@@ -840,22 +840,10 @@ main (int argc, char** argv)
+ 
+   if (makefile_install_mode || makefile_uninstall_mode)
+     {
+-      g_assert (config_source == NULL);
+-
+-      /* Try the environment variable */
+-      config_source = g_getenv ("GCONF_CONFIG_SOURCE");
+-
+-      if (config_source == NULL)
+-        {
+-          g_printerr (_("Must set the GCONF_CONFIG_SOURCE environment variable\n"));
+-          return 1;
+-        }
+-
+-      if (*config_source == '\0')
+-        {
+-          /* Properly set, but set to nothing (use default source) */
+-          config_source = NULL;
+-        }
++      config_source = "xml::/etc/gconf/gconf.xml.defaults";
++      g_print ("gconftool-2: I've been haxored to use %s as the config"
++               " source.\n",
++               config_source);
+ 
+       use_local_source = TRUE;
+ 

Added: projects/haf/trunk/gconf2/debian/rules
===================================================================
--- projects/haf/trunk/gconf2/debian/rules	2007-01-19 14:19:35 UTC (rev 9195)
+++ projects/haf/trunk/gconf2/debian/rules	2007-01-19 14:30:13 UTC (rev 9196)
@@ -0,0 +1,59 @@
+#! /usr/bin/make -f
+
+export DH_VERBOSE=1
+DH_ALWAYS_EXCLUDE := .svn
+
+#include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/gnome.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+# rh
+DEB_DH_STRIP_ARGS := --dbg-package=gconf2 --dbg-package=libgconf2-6
+
+DEB_INSTALL_DOCS_gconf2 := NEWS README
+
+DEB_CONFIGURE_EXTRA_FLAGS := \
+	--prefix=/usr 				\
+	--mandir=\$${prefix}/share/man 		\
+        --infodir=\$${prefix}/share/info 	\
+	--libexecdir=\$${prefix}/lib/gconf2 	\
+        --sysconfdir=/etc 			\
+	--disable-debug 			\
+	--disable-gtk	 			\
+	--disable-gtk-doc 			\
+	--with-ipc=dbus 			\
+	--enable-system-bus
+
+# rh DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+
+DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2
+
+DEB_DH_MAKESHLIBS_ARGS_libgconf2-6 := -Xbackend -V"libgconf2-6 (>= 2.13.5)"
+# rh DEB_DH_SHLIBDEPS_ARGS := -Xgconf-sanity-check
+
+DEB_COMPRESS_EXCLUDE := usr/share/doc/gconf2/html
+
+CFLAGS ?= -O2 -g
+
+# Use soft-float and thumb mode if it is enabled.
+ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -mthumb
+endif
+
+post-patches:: debian/stamp-autothings-update
+debian/stamp-autothings-update:
+	NOCONFIGURE=1 ./autogen.sh
+	# Can add things here that need to be ran after autogen.sh
+	touch $@
+
+clean::
+	rm -f debian/stamp-autothings-update
+	rm -f debian/stamp-libtool-patch
+	-rm -rf doc/gconf/.libs


Property changes on: projects/haf/trunk/gconf2/debian/rules
___________________________________________________________________
Name: svn:executable
   + *
More information about the maemo-commits mailing list