r35288 - in /desktop/unstable/d-conf/debian: changelog patches/01_env_path.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Jun 9 16:07:25 UTC 2012
Author: joss
Date: Sat Jun 9 16:07:24 2012
New Revision: 35288
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35288
Log:
01_env_path.patch: support the DCONF_PATH environment variable. This
is necessary for the gdm3 packaging.
Added:
desktop/unstable/d-conf/debian/patches/01_env_path.patch
- copied, changed from r33295, desktop/unstable/d-conf/debian/patches/01_env_path.patch
Modified:
desktop/unstable/d-conf/debian/changelog
desktop/unstable/d-conf/debian/patches/series
Modified: desktop/unstable/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/changelog?rev=35288&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/changelog [utf-8] (original)
+++ desktop/unstable/d-conf/debian/changelog [utf-8] Sat Jun 9 16:07:24 2012
@@ -1,3 +1,10 @@
+d-conf (0.12.1-2) unstable; urgency=low
+
+ * 01_env_path.patch: support the DCONF_PATH environment variable. This
+ is necessary for the gdm3 packaging.
+
+ -- Josselin Mouette <joss at debian.org> Sat, 09 Jun 2012 18:05:54 +0200
+
d-conf (0.12.1-1) unstable; urgency=low
* New upstream release. Closes: #664038
Copied: desktop/unstable/d-conf/debian/patches/01_env_path.patch (from r33295, desktop/unstable/d-conf/debian/patches/01_env_path.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/patches/01_env_path.patch?rev=35288&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/patches/01_env_path.patch [utf-8] (original)
+++ desktop/unstable/d-conf/debian/patches/01_env_path.patch [utf-8] Sat Jun 9 16:07:24 2012
@@ -1,28 +1,31 @@
-Index: dconf-0.10.0/bin/dconf-update.vala
+GNOME #670493
+
+Index: dconf-0.12.1/bin/dconf-update.vala
===================================================================
---- dconf-0.10.0.orig/bin/dconf-update.vala 2011-08-04 00:07:20.000000000 +0200
-+++ dconf-0.10.0/bin/dconf-update.vala 2012-01-28 11:25:49.279081784 +0100
-@@ -211,7 +211,15 @@ void update_all (string dirname) throws
+--- 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) {
+ }
void dconf_update (string[] args) {
- try {
-- update_all ("/etc/dconf/db");
-+ if (args[2] != null) {
-+ update_all (args[2]);
-+ } else {
-+ var dirname = GLib.Environment.get_variable ("DCONF_DIR");
-+ if (dirname == null) {
-+ dirname = "/etc/dconf";
-+ }
-+ update_all (Path.build_filename (dirname, "db"));
+- update_all ("/etc/dconf/db");
++ if (args[2] != null) {
++ update_all (args[2]);
++ } else {
++ var dirname = GLib.Environment.get_variable ("DCONF_DIR"
++);
++ if (dirname == null) {
++ dirname = "/etc/dconf";
+ }
- } catch (GLib.Error e) {
- stderr.printf ("fatal: %s\n", e.message);
- }
-Index: dconf-0.10.0/bin/dconf.vala
++ update_all (Path.build_filename (dirname, "db"));
++ }
+ }
+
+ // vim:noet ts=4 sw=4
+Index: dconf-0.12.1/bin/dconf.vala
===================================================================
---- dconf-0.10.0.orig/bin/dconf.vala 2011-09-11 18:44:19.000000000 +0200
-+++ dconf-0.10.0/bin/dconf.vala 2012-01-28 11:32:10.180943921 +0100
+--- 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?
case "update":
@@ -32,7 +35,7 @@
break;
case "watch":
-@@ -117,7 +117,9 @@ Use 'dconf help COMMAND' to get detailed
+@@ -119,7 +119,9 @@ Use 'dconf help COMMAND' to get detailed
str.append (" KEY A key path (starting, but not ending with '/')\n");
}
@@ -43,31 +46,33 @@
str.append (" DIR A directory path (starting and ending with '/')\n");
}
-Index: dconf-0.10.0/engine/dconf-engine.c
+Index: dconf-0.12.1/engine/dconf-engine.c
===================================================================
---- dconf-0.10.0.orig/engine/dconf-engine.c 2011-09-11 21:07:26.000000000 +0200
-+++ dconf-0.10.0/engine/dconf-engine.c 2012-01-28 11:44:48.492651117 +0100
-@@ -176,7 +176,10 @@ dconf_engine_refresh_system (DConfEngine
+--- 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
+ if (engine->gvdbs[i] == NULL)
+ {
+- gchar *filename = g_build_filename ("/etc/dconf/db",
++ 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)
- {
-- gchar *filename = g_build_filename ("/etc/dconf/db",
-+ 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)
-@@ -223,7 +226,10 @@ dconf_engine_load_profile (const gchar
- char line[80];
- FILE *f;
+@@ -247,7 +250,12 @@ dconf_engine_load_profile (const 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";
-+ filename = g_build_filename (dconf_dir, "profile", profile, NULL);
- f = fopen (filename, "r");
+ /* 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);
- if (f == NULL)
Modified: desktop/unstable/d-conf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/d-conf/debian/patches/series?rev=35288&op=diff
==============================================================================
--- desktop/unstable/d-conf/debian/patches/series [utf-8] (original)
+++ desktop/unstable/d-conf/debian/patches/series [utf-8] Sat Jun 9 16:07:24 2012
@@ -1,0 +1,1 @@
+01_env_path.patch
More information about the pkg-gnome-commits
mailing list