r37556 - in /desktop/wheezy/gconf/debian: changelog control control.in

[paulepanter-guest at users.alioth.debian.org]

Author: paulepanter-guest
Date: Tue Apr 16 15:24:10 2013
New Revision: 37556

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37556
Log:
Revert "Break libgconf2.0-cil < 2.24.2-3. Closes: #694340."

This reverts commit 7a4298712767b04a14d4cf29daa9a61150d5120e.

Joss asked me in #debian-gnome to revert this as the release team
did not approve of this change [1] and Chow did not yet reply to
Joss’ message.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694340#79

Conflicts:
	debian/changelog

Modified:
    desktop/wheezy/gconf/debian/changelog
    desktop/wheezy/gconf/debian/control
    desktop/wheezy/gconf/debian/control.in

Modified: desktop/wheezy/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gconf/debian/changelog?rev=37556&op=diff
==============================================================================
--- desktop/wheezy/gconf/debian/changelog [utf-8] (original)
+++ desktop/wheezy/gconf/debian/changelog [utf-8] Tue Apr 16 15:24:10 2013
@@ -4,6 +4,9 @@
   * Break libgconf2.0-cil < 2.24.2-3. Closes: #694340.
 
   [ Paul Menzel ]
+  * Revert »Break libgconf2.0-cil < 2.24.2-3.« for now as the release
+    team does not want to have it for Wheezy until more information by
+    the bug submitter is supplied.
   * 06-gconf-dbus-fix-use-after-free.patch: Add patch to fix use after
     free in `gconf_engine_get_fuller`. Closes: #699424.
 

Modified: desktop/wheezy/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gconf/debian/control?rev=37556&op=diff
==============================================================================
--- desktop/wheezy/gconf/debian/control [utf-8] (original)
+++ desktop/wheezy/gconf/debian/control [utf-8] Tue Apr 16 15:24:10 2013
@@ -114,8 +114,7 @@
          ${misc:Depends},
          gconf2-common (= ${source:Version})
 Breaks: libgconf2-4 (<< 3.2.3-2),
-        gconf2 (<< 3.2.3-2),
-        libgconf2.0-cil (<< 2.24.2-3)
+        gconf2 (<< 3.2.3-2)
 Recommends: gconf-service
 Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)

Modified: desktop/wheezy/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/wheezy/gconf/debian/control.in?rev=37556&op=diff
==============================================================================
--- desktop/wheezy/gconf/debian/control.in [utf-8] (original)
+++ desktop/wheezy/gconf/debian/control.in [utf-8] Tue Apr 16 15:24:10 2013
@@ -109,8 +109,7 @@
          ${misc:Depends},
          gconf2-common (= ${source:Version})
 Breaks: libgconf2-4 (<< 3.2.3-2),
-        gconf2 (<< 3.2.3-2),
-        libgconf2.0-cil (<< 2.24.2-3)
+        gconf2 (<< 3.2.3-2)
 Recommends: gconf-service
 Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)