r14933 - in /desktop/unstable/gconf/debian: changelog control control.in patches/01_no_syslog_thanks.patch patches/02_ldap_deprecated.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue Mar 11 05:29:34 2008
New Revision: 14933

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14933
Log:
* New upstream stable release:
  + debian/patches/01_no_syslog_thanks.patch:
    - Updated to apply cleanly again.
  + debian/patches/02_ldap_deprecated.patch:
    - Removed, applied upstream.
* debian/control.in:
  + Update Standards-Version to 3.7.3, no additional changes needed.

Removed:
    desktop/unstable/gconf/debian/patches/02_ldap_deprecated.patch
Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/control
    desktop/unstable/gconf/debian/control.in
    desktop/unstable/gconf/debian/patches/01_no_syslog_thanks.patch

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=14933&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog (original)
+++ desktop/unstable/gconf/debian/changelog Tue Mar 11 05:29:34 2008
@@ -1,3 +1,15 @@
+gconf (2.22.0-1) unstable; urgency=low
+
+  * New upstream stable release:
+    + debian/patches/01_no_syslog_thanks.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/02_ldap_deprecated.patch:
+      - Removed, applied upstream.
+  * debian/control.in:
+    + Update Standards-Version to 3.7.3, no additional changes needed.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 11 Mar 2008 06:18:33 +0100
+
 gconf (2.20.1-3) unstable; urgency=low
 
   [ Michael Banck ]

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=14933&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control (original)
+++ desktop/unstable/gconf/debian/control Tue Mar 11 05:29:34 2008
@@ -21,7 +21,7 @@
                libxml-parser-perl,
                python-support (>= 0.5.3),
                autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: gconf2
 Architecture: any

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=14933&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in (original)
+++ desktop/unstable/gconf/debian/control.in Tue Mar 11 05:29:34 2008
@@ -21,7 +21,7 @@
                libxml-parser-perl,
                python-support (>= 0.5.3),
                autotools-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: gconf2
 Architecture: any

Modified: desktop/unstable/gconf/debian/patches/01_no_syslog_thanks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/01_no_syslog_thanks.patch?rev=14933&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/01_no_syslog_thanks.patch (original)
+++ desktop/unstable/gconf/debian/patches/01_no_syslog_thanks.patch Tue Mar 11 05:29:34 2008
@@ -247,7 +247,7 @@
 diff -PruN GConf-2.18.0.1.orig/gconf/gconf-sources.c GConf-2.18.0.1/gconf/gconf-sources.c
 --- GConf-2.18.0.1.orig/gconf/gconf-sources.c	2007-03-02 23:10:13.000000000 +0100
 +++ GConf-2.18.0.1/gconf/gconf-sources.c	2007-03-30 00:37:09.421300500 +0200
-@@ -407,20 +407,20 @@
+@@ -407,13 +407,13 @@
          if (source->flags & GCONF_SOURCE_ALL_WRITEABLE)
            {
              some_writable = TRUE;
@@ -263,11 +263,3 @@
                         _("Resolved address \"%s\" to a read-only configuration source at position %d"),
                         source->address, i);
            }
-         else
-           {
-             some_writable = TRUE;
--            gconf_log (GCL_INFO,
-+            gconf_log (GCL_DEBUG,
-                        _("Resolved address \"%s\" to a partially writable config source at position %d"),
-                        source->address, i);
-           }