r36943 - in /desktop/unstable/gconf: ./ debian/changelog debian/control debian/control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Mar 13 09:59:38 2013
New Revision: 36943

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

Modified:
    desktop/unstable/gconf/   (props changed)
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/control
    desktop/unstable/gconf/debian/control.in

Propchange: desktop/unstable/gconf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 13 09:59:38 2013
@@ -1,1 +1,2 @@
 /desktop/unstable/gconf:24421,25283-25503
+/desktop/wheezy/gconf:36942

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=36943&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Wed Mar 13 09:59:38 2013
@@ -1,4 +1,4 @@
-gconf (3.2.5-2) UNRELEASED; urgency=low
+gconf (3.2.5-3) UNRELEASED; urgency=low
 
   * Add a simple compile/link/run autopkgtest for libgconf2-dev. Thanks Rafał
     Cieślak! (LP: #1078719)
@@ -7,6 +7,12 @@
     - Don't call deprecated g_type_init() when building with glib >= 2.35.
 
  -- Martin Pitt <mpitt at debian.org>  Thu, 15 Nov 2012 13:29:47 +0100
+
+gconf (3.2.5-2) unstable; urgency=low
+
+  * Break libgconf2.0-cil < 2.24.2-3. Closes: #694340.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 13 Mar 2013 10:56:19 +0100
 
 gconf (3.2.5-1) unstable; urgency=low
 

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=36943&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Wed Mar 13 09:59:38 2013
@@ -115,7 +115,8 @@
          ${misc:Depends},
          gconf2-common (= ${source:Version})
 Breaks: libgconf2-4 (<< 3.2.3-2),
-        gconf2 (<< 3.2.3-2)
+        gconf2 (<< 3.2.3-2),
+        libgconf2.0-cil (<< 2.24.2-3)
 Recommends: gconf-service
 Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=36943&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Wed Mar 13 09:59:38 2013
@@ -110,7 +110,8 @@
          ${misc:Depends},
          gconf2-common (= ${source:Version})
 Breaks: libgconf2-4 (<< 3.2.3-2),
-        gconf2 (<< 3.2.3-2)
+        gconf2 (<< 3.2.3-2),
+        libgconf2.0-cil (<< 2.24.2-3)
 Recommends: gconf-service
 Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)