r23445 - in /desktop/unstable/gconf/debian: changelog control control.in patches/01_defaults_path.patch patches/02_fix_wrong_return_value.patch patches/25_gconf-path-max-hurd.patch

tao at users.alioth.debian.org tao at users.alioth.debian.org
Tue Mar 30 16:28:48 UTC 2010 

Author: tao
Date: Tue Mar 30 16:28:47 2010
New Revision: 23445

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23445
Log:
* New upstream release.
  + debian/patches/01_defaults_path.patch,
    02_fix_wrong_return_value.patch,
    25_gconf-path-max-hurd.patch:
    - Refreshed.
* debian/control.in:
  - Bump Standards version to 3.8.4 (No changes needed).

Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/control
    desktop/unstable/gconf/debian/control.in
    desktop/unstable/gconf/debian/patches/01_defaults_path.patch
    desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch
    desktop/unstable/gconf/debian/patches/25_gconf-path-max-hurd.patch

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=23445&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Tue Mar 30 16:28:47 2010
@@ -1,9 +1,19 @@
-gconf (2.28.0-2) UNRELEASED; urgency=low
-
+gconf (2.28.1-1) unstable; urgency=low
+
+  [ David Weinehall ]
+  * New upstream release.
+    + debian/patches/01_defaults_path.patch,
+      02_fix_wrong_return_value.patch,
+      25_gconf-path-max-hurd.patch:
+      - Refreshed.
+  * debian/control.in:
+    - Bump Standards version to 3.8.4 (No changes needed).
+
+  [ Loïc Minier ]
   * debian/gconf2-common.install: install evoldap.schema directly in
     /usr/share/doc; this makes it easier to build a non-LDAP version of GConf.
 
- -- Loïc Minier <lool at dooz.org>  Thu, 05 Nov 2009 12:16:52 -0800
+ -- David Weinehall <tao at debian.org>  Tue, 30 Mar 2010 18:55:51 +0300
 
 gconf (2.28.0-1) unstable; urgency=low
 

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=23445&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Tue Mar 30 16:28:47 2010
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: gconf
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: David Weinehall <tao at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
                quilt,
@@ -24,7 +29,7 @@
                python-support (>= 0.5.3),
                autotools-dev,
                libglib2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage:  http://projects.gnome.org/gconf/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gconf
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gconf

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=23445&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Tue Mar 30 16:28:47 2010
@@ -24,7 +24,7 @@
                python-support (>= 0.5.3),
                autotools-dev,
                libglib2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage:  http://projects.gnome.org/gconf/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gconf
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/gconf

Modified: desktop/unstable/gconf/debian/patches/01_defaults_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/01_defaults_path.patch?rev=23445&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/01_defaults_path.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/01_defaults_path.patch [utf-8] Tue Mar 30 16:28:47 2010
@@ -1,7 +1,7 @@
 diff -urN GConf-2.28.0.orig/defaults/gconf-defaults.c GConf-2.28.0/defaults/gconf-defaults.c
 --- GConf-2.28.0.orig/defaults/gconf-defaults.c	2009-08-19 17:35:32.000000000 +0200
 +++ GConf-2.28.0/defaults/gconf-defaults.c	2009-10-04 12:17:01.000000000 +0200
-@@ -810,7 +810,7 @@
+@@ -811,7 +811,7 @@
  	else {
  		adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
  		adata->default_action = "org.gnome.gconf.defaults.set-system";
@@ -13,7 +13,7 @@
 diff -urN GConf-2.28.0.orig/gconf/gconfd.c GConf-2.28.0/gconf/gconfd.c
 --- GConf-2.28.0.orig/gconf/gconfd.c	2009-08-19 17:35:32.000000000 +0200
 +++ GConf-2.28.0/gconf/gconfd.c	2009-10-04 12:16:44.000000000 +0200
-@@ -655,7 +655,7 @@
+@@ -637,7 +637,7 @@
  
  	  gconf_log (GCL_DEBUG, "System defaults changed.  Notifying.");
  

Modified: desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch?rev=23445&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch [utf-8] Tue Mar 30 16:28:47 2010
@@ -4,7 +4,7 @@
 
 --- a/gconf/gconf-client.c
 +++ b/gconf/gconf-client.c
-@@ -2024,7 +2024,7 @@
+@@ -2025,7 +2025,7 @@
      {
        g_free (dir);
        trace ("Negative cache hit on %s", key);

Modified: desktop/unstable/gconf/debian/patches/25_gconf-path-max-hurd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/25_gconf-path-max-hurd.patch?rev=23445&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/25_gconf-path-max-hurd.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/25_gconf-path-max-hurd.patch [utf-8] Tue Mar 30 16:28:47 2010
@@ -1,7 +1,7 @@
 diff -Naur GConf-2.6.4.orig/backends/markup-tree.c GConf-2.6.4/backends/markup-tree.c
 --- GConf-2.8.1.orig/backends/markup-tree.c	2004-09-29 14:09:44.000000000 +0200
 +++ GConf-2.8.1/backends/markup-tree.c	2004-09-29 14:14:01.000000000 +0200
-@@ -33,6 +33,11 @@
+@@ -34,6 +34,11 @@
  #include <stdio.h>
  #include <time.h>
  
@@ -16,9 +16,9 @@
 diff -Naur GConf-2.6.4.orig/backends/xml-dir.c GConf-2.6.4/backends/xml-dir.c
 --- GConf-2.8.1.orig/backends/xml-dir.c	2004-09-29 14:09:44.000000000 +0200
 +++ GConf-2.8.1/backends/xml-dir.c	2004-09-29 14:11:59.000000000 +0200
-@@ -37,6 +37,11 @@
- #include <gconf/gconf-internals.h>
- #include "xml-entry.h"
+@@ -36,6 +36,11 @@
+
+ #include "gconf/gconf-internals.h"
  
 +/* PATH_MAX is not defined in limits.h on some platforms */
 +#ifndef PATH_MAX

More information about the pkg-gnome-commits mailing list