r36144 - in /desktop/experimental/d-conf/debian: changelog patches/01_env_path.patch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Oct 23 15:20:16 UTC 2012
Author: pochu
Date: Tue Oct 23 15:20:16 2012
New Revision: 36144
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36144
Log:
+ debian/patches/01_env_path.patch:
- Updated patch from Robert Ancell.
Modified:
desktop/experimental/d-conf/debian/changelog
desktop/experimental/d-conf/debian/patches/01_env_path.patch
Modified: desktop/experimental/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/changelog?rev=36144&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/changelog [utf-8] (original)
+++ desktop/experimental/d-conf/debian/changelog [utf-8] Tue Oct 23 15:20:16 2012
@@ -3,6 +3,8 @@
* New upstream release.
+ debian/control.in:
- Update build dependencies.
+ + debian/patches/01_env_path.patch:
+ - Updated patch from Robert Ancell.
-- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 23 Oct 2012 13:58:37 +0200
Modified: desktop/experimental/d-conf/debian/patches/01_env_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/patches/01_env_path.patch?rev=36144&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/patches/01_env_path.patch [utf-8] (original)
+++ desktop/experimental/d-conf/debian/patches/01_env_path.patch [utf-8] Tue Oct 23 15:20:16 2012
@@ -1,13 +1,13 @@
GNOME #670493
-Index: dconf-0.12.1/bin/dconf-update.vala
+Index: dconf-0.13.4/bin/dconf-update.vala
===================================================================
---- dconf-0.12.1.orig/bin/dconf-update.vala 2012-03-19 16:36:21.000000000 +0100
-+++ dconf-0.12.1/bin/dconf-update.vala 2012-06-09 17:55:44.499132517 +0200
-@@ -241,7 +241,16 @@ void update_all (string dirname) {
+--- dconf-0.13.4.orig/bin/dconf-update.vala 2012-07-14 06:07:48.000000000 +1200
++++ dconf-0.13.4/bin/dconf-update.vala 2012-07-19 10:56:15.033408852 +1200
+@@ -241,7 +241,16 @@
}
- void dconf_update (string[] args) {
+ void dconf_update (string[] args) throws GLib.Error {
- update_all ("/etc/dconf/db");
+ if (args[2] != null) {
+ update_all (args[2]);
@@ -22,11 +22,11 @@
}
// vim:noet ts=4 sw=4
-Index: dconf-0.12.1/bin/dconf.vala
+Index: dconf-0.13.4/bin/dconf.vala
===================================================================
---- dconf-0.12.1.orig/bin/dconf.vala 2012-04-10 14:36:04.000000000 +0200
-+++ dconf-0.12.1/bin/dconf.vala 2012-06-09 17:48:31.661016471 +0200
-@@ -56,7 +56,7 @@ void show_help (bool requested, string?
+--- dconf-0.13.4.orig/bin/dconf.vala 2012-07-14 06:07:48.000000000 +1200
++++ dconf-0.13.4/bin/dconf.vala 2012-07-19 10:56:15.033408852 +1200
+@@ -56,7 +56,7 @@
case "update":
description = "Update the system dconf databases";
@@ -35,7 +35,7 @@
break;
case "watch":
-@@ -119,7 +119,9 @@ Use 'dconf help COMMAND' to get detailed
+@@ -119,7 +119,9 @@
str.append (" KEY A key path (starting, but not ending with '/')\n");
}
@@ -46,33 +46,35 @@
str.append (" DIR A directory path (starting and ending with '/')\n");
}
-Index: dconf-0.12.1/engine/dconf-engine.c
+Index: dconf-0.13.4/engine/dconf-engine-source-system.c
===================================================================
---- dconf-0.12.1.orig/engine/dconf-engine.c 2012-04-12 17:24:29.000000000 +0200
-+++ dconf-0.12.1/engine/dconf-engine.c 2012-06-09 18:01:24.848796399 +0200
-@@ -181,7 +181,10 @@ dconf_engine_refresh_system (DConfEngine
+--- dconf-0.13.4.orig/engine/dconf-engine-source-system.c 2012-07-19 10:54:26.000000000 +1200
++++ dconf-0.13.4/engine/dconf-engine-source-system.c 2012-07-19 10:56:15.037408851 +1200
+@@ -48,7 +48,10 @@
+ GvdbTable *table;
+ gchar *filename;
- if (engine->gvdbs[i] == NULL)
+- filename = g_build_filename ("/etc/dconf/db", source->name, NULL);
++ const gchar *dconf_dir = g_getenv ("DCONF_DIR");
++ if (dconf_dir == NULL)
++ dconf_dir = "/etc/dconf";
++ filename = g_build_filename (dconf_dir, "db", source->name, NULL);
+ table = gvdb_table_new (filename, FALSE, &error);
+
+ if (table == NULL)
+Index: dconf-0.13.4/engine/dconf-engine-profile.c
+===================================================================
+--- dconf-0.13.4.orig/engine/dconf-engine-profile.c 2012-07-14 06:07:48.000000000 +1200
++++ dconf-0.13.4/engine/dconf-engine-profile.c 2012-07-19 10:57:03.645407172 +1200
+@@ -192,7 +192,10 @@
+ }
+ else if (profile[0] != '/')
{
-- gchar *filename = g_build_filename ("/etc/dconf/db",
+- gchar *filename = g_build_filename ("/etc/dconf/profile", profile, NULL);
+ const gchar *dconf_dir = g_getenv ("DCONF_DIR");
+ if (dconf_dir == NULL)
+ dconf_dir = "/etc/dconf";
-+ gchar *filename = g_build_filename (dconf_dir, "db",
- engine->names[i], NULL);
- engine->gvdbs[i] = gvdb_table_new (filename, TRUE, NULL);
- if (engine->gvdbs[i] == NULL)
-@@ -247,7 +250,12 @@ dconf_engine_load_profile (const gchar
-
- /* DCONF_PROFILE starting with '/' gives an absolute path to a profile */
- if (profile[0] != '/')
-- filename = g_build_filename ("/etc/dconf/profile", profile, NULL);
-+ {
-+ const gchar *dconf_dir = g_getenv ("DCONF_DIR");
-+ if (dconf_dir == NULL)
-+ dconf_dir = "/etc/dconf";
-+ filename = g_build_filename (dconf_dir, "profile", profile, NULL);
-+ }
- else
- filename = g_strdup (profile);
-
++ gchar *filename = g_build_filename (dconf_dir, "profile", profile, NULL);
+ file = fopen (filename, "r");
+ g_free (filename);
+ }
More information about the pkg-gnome-commits
mailing list