r40650 - in /desktop/experimental/d-conf/debian: changelog control control.in libdconf1.symbols patches/01_env_path.patch
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Tue Feb 18 22:53:44 UTC 2014
Author: ah
Date: Tue Feb 18 22:53:44 2014
New Revision: 40650
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40650
Log:
* Update Vcs-* URLs for experimental
* New upstream release.
* Bump glib build-dependency to 2.39.1 according to configure.ac
* Update debian/patches/01_env_path.patch to apply again.
* Update debian/libdconf1.symbols with one added symbol.
Modified:
desktop/experimental/d-conf/debian/changelog
desktop/experimental/d-conf/debian/control
desktop/experimental/d-conf/debian/control.in
desktop/experimental/d-conf/debian/libdconf1.symbols
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=40650&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/changelog [utf-8] (original)
+++ desktop/experimental/d-conf/debian/changelog [utf-8] Tue Feb 18 22:53:44 2014
@@ -1,3 +1,16 @@
+d-conf (0.19.90-1) UNRELEASED; urgency=medium
+
+ [ Iain Lane ]
+ * Update Vcs-* URLs for experimental
+
+ [ Andreas Henriksson ]
+ * New upstream release.
+ * Bump glib build-dependency to 2.39.1 according to configure.ac
+ * Update debian/patches/01_env_path.patch to apply again.
+ * Update debian/libdconf1.symbols with one added symbol.
+
+ -- Andreas Henriksson <andreas at fatal.se> Tue, 18 Feb 2014 23:01:17 +0100
+
d-conf (0.18.0-1) unstable; urgency=low
* New upstream release.
Modified: desktop/experimental/d-conf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control?rev=40650&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control [utf-8] Tue Feb 18 22:53:44 2014
@@ -2,6 +2,7 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
+
Source: d-conf
Section: libs
Priority: optional
@@ -15,7 +16,7 @@
intltool (>= 0.50.0),
xsltproc,
valac (>= 0.17.0),
- libglib2.0-dev (>= 2.35.2),
+ libglib2.0-dev (>= 2.39.1),
libdbus-1-dev,
libgtk-3-dev (>= 3.4.0),
libxml2-dev
Modified: desktop/experimental/d-conf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control.in?rev=40650&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control.in [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control.in [utf-8] Tue Feb 18 22:53:44 2014
@@ -11,7 +11,7 @@
intltool (>= 0.50.0),
xsltproc,
valac (>= 0.17.0),
- libglib2.0-dev (>= 2.35.2),
+ libglib2.0-dev (>= 2.39.1),
libdbus-1-dev,
libgtk-3-dev (>= 3.4.0),
libxml2-dev
Modified: desktop/experimental/d-conf/debian/libdconf1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/libdconf1.symbols?rev=40650&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/libdconf1.symbols [utf-8] (original)
+++ desktop/experimental/d-conf/debian/libdconf1.symbols [utf-8] Tue Feb 18 22:53:44 2014
@@ -30,6 +30,7 @@
dconf_client_watch_sync at Base 0.14.0
dconf_client_write_fast at Base 0.14.0
dconf_client_write_sync at Base 0.14.0
+ dconf_error_quark at Base 0.19.90
dconf_is_dir at Base 0.14.0
dconf_is_key at Base 0.14.0
dconf_is_path at Base 0.14.0
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=40650&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 Feb 18 22:53:44 2014
@@ -1,10 +1,11 @@
GNOME #670493
-Index: dconf-0.16.0/bin/dconf-update.vala
-===================================================================
---- dconf-0.16.0.orig/bin/dconf-update.vala 2013-06-04 06:40:08.393538977 +0200
-+++ dconf-0.16.0/bin/dconf-update.vala 2013-06-04 06:40:08.385538844 +0200
-@@ -241,7 +241,16 @@
+This patch was rejected upstream (pending alternative solution).
+Maybe we should drop it?
+
+--- a/bin/dconf-update.vala
++++ b/bin/dconf-update.vala
+@@ -248,7 +248,16 @@
}
void dconf_update (string[] args) throws GLib.Error {
@@ -22,35 +23,31 @@
}
// vim:noet ts=4 sw=4
-Index: dconf-0.16.0/bin/dconf.vala
-===================================================================
---- dconf-0.16.0.orig/bin/dconf.vala 2013-06-04 06:40:08.393538977 +0200
-+++ dconf-0.16.0/bin/dconf.vala 2013-06-04 06:40:08.385538844 +0200
-@@ -56,7 +56,7 @@
+--- a/bin/dconf.vala
++++ b/bin/dconf.vala
+@@ -59,7 +59,7 @@
case "update":
description = "Update the system dconf databases";
- synopsis = "";
-+ synopsis = "[DIR]";
++ synopsis = " [DIR] ";
break;
case "watch":
-@@ -119,7 +119,9 @@
- str.append (" KEY A key path (starting, but not ending with '/')\n");
+@@ -123,7 +123,9 @@
+ str.append (" KEY A key path (starting, but not ending with '/')\n");
}
-- if ("PATH" in synopsis || "DIR" in synopsis) {
-+ if ("[DIR]" in synopsis ) {
-+ str.append (" DIR Directory containing the databases to update\n");
-+ } else if ("PATH" in synopsis || "DIR" in synopsis) {
- str.append (" DIR A directory path (starting and ending with '/')\n");
+- if (" PATH " in synopsis || " DIR " in synopsis) {
++ if (" [DIR] " in synopsis ) {
++ str.append (" DIR Directory containing the databases to update\n");
++ } else if (" PATH " in synopsis || " DIR " in synopsis) {
+ str.append (" DIR A directory path (starting and ending with '/')\n");
}
-Index: dconf-0.16.0/engine/dconf-engine-source-system.c
-===================================================================
---- dconf-0.16.0.orig/engine/dconf-engine-source-system.c 2013-06-04 06:40:08.393538977 +0200
-+++ dconf-0.16.0/engine/dconf-engine-source-system.c 2013-06-04 06:40:08.385538844 +0200
-@@ -48,7 +48,10 @@
+--- a/engine/dconf-engine-source-system.c
++++ b/engine/dconf-engine-source-system.c
+@@ -47,7 +47,10 @@
GvdbTable *table;
gchar *filename;
@@ -62,19 +59,20 @@
table = gvdb_table_new (filename, FALSE, &error);
if (table == NULL)
-Index: dconf-0.16.0/engine/dconf-engine-profile.c
-===================================================================
---- dconf-0.16.0.orig/engine/dconf-engine-profile.c 2013-06-04 06:40:08.393538977 +0200
-+++ dconf-0.16.0/engine/dconf-engine-profile.c 2013-06-04 06:40:08.385538844 +0200
-@@ -198,7 +198,10 @@
- }
- else if (profile[0] != '/')
+--- a/engine/dconf-engine-profile.c
++++ b/engine/dconf-engine-profile.c
+@@ -202,8 +202,13 @@
+ do
{
-- gchar *filename = g_build_filename ("/etc/dconf/profile", profile, NULL);
-+ const gchar *dconf_dir = g_getenv ("DCONF_DIR");
+ gchar *filename;
++ const gchar *dconf_dir;
+
+- filename = g_build_filename (prefix, "dconf/profile", profile, NULL);
++ dconf_dir = g_getenv ("DCONF_DIR");
+ if (dconf_dir == NULL)
-+ dconf_dir = "/etc/dconf";
-+ gchar *filename = g_build_filename (dconf_dir, "profile", profile, NULL);
- file = fopen (filename, "r");
- g_free (filename);
- }
++ filename = g_build_filename (prefix, "dconf/profile", profile, NULL);
++ else
++ filename = g_build_filename (dconf_dir, "profile", profile, NULL);
+ fp = fopen (filename, "r");
+
+ /* If it wasn't ENOENT then we don't want to continue on to check
More information about the pkg-gnome-commits
mailing list