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

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Feb 20 10:48:29 2009
New Revision: 18484

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18484
Log:
Turn the Breaks into a Conflicts, otherwise it breaks the buildds.

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

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=18484&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog (original)
+++ desktop/unstable/gconf/debian/changelog Fri Feb 20 10:48:29 2009
@@ -1,3 +1,9 @@
+gconf (2.24.0-7) unstable; urgency=low
+
+  * Turn the Breaks into a Conflicts, otherwise it breaks the buildds.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 20 Feb 2009 11:48:19 +0100
+
 gconf (2.24.0-6) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=18484&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control (original)
+++ desktop/unstable/gconf/debian/control Fri Feb 20 10:48:29 2009
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
@@ -85,7 +85,7 @@
 Depends: ${shlibs:Depends},
          gconf2-common (>= ${gnome:Version}),
          gconf2-common (<< ${gnome:NextVersion})
-Breaks: libbonobo2-0 (<< 2.24)
+Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=18484&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in (original)
+++ desktop/unstable/gconf/debian/control.in Fri Feb 20 10:48:29 2009
@@ -85,7 +85,7 @@
 Depends: ${shlibs:Depends},
          gconf2-common (>= ${gnome:Version}),
          gconf2-common (<< ${gnome:NextVersion})
-Breaks: libbonobo2-0 (<< 2.24)
+Conflicts: libbonobo2-0 (<< 2.24)
 Description: GNOME configuration database system (shared libraries)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the