r25771 - in /desktop/experimental/gdk-pixbuf/debian: changelog control.in

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sun Dec  5 18:05:36 2010
New Revision: 25771

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25771
Log:
Use Breaks instead of Conflicts when required

Modified:
    desktop/experimental/gdk-pixbuf/debian/changelog
    desktop/experimental/gdk-pixbuf/debian/control.in

Modified: desktop/experimental/gdk-pixbuf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/changelog?rev=25771&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/changelog [utf-8] Sun Dec  5 18:05:36 2010
@@ -1,9 +1,11 @@
 gdk-pixbuf (2.22.1-3) experimental; urgency=low
 
-  * debian/control.in: Add Replaces: gir-repository-dev for
-    libgdk-pixbuf2.0-dev package (Closes: #605734)
+  * debian/control.in:
+    - Add Replaces: gir-repository-dev for
+      libgdk-pixbuf2.0-dev package (Closes: #605734)
+    - Use Breaks instead of Conflicts when required
 
- -- Laurent Bigonville <bigon at debian.org>  Sun, 05 Dec 2010 18:58:18 +0100
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 05 Dec 2010 19:04:56 +0100
 
 gdk-pixbuf (2.22.1-2) experimental; urgency=low
 

Modified: desktop/experimental/gdk-pixbuf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdk-pixbuf/debian/control.in?rev=25771&op=diff
==============================================================================
--- desktop/experimental/gdk-pixbuf/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdk-pixbuf/debian/control.in [utf-8] Sun Dec  5 18:05:36 2010
@@ -25,9 +25,11 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgtk2.0-0 (<< 2.21.3), libgtk2.0-bin (<< 2.21.3)
+Breaks: libgtk2.0-0 (<< 2.21.3),
+        libgtk2.0-bin (<< 2.21.3),
+        libwmf0.2-7 (<< 0.2.8.4-7),
+        librsvg2-2 (<< 2.26.3-2)
 Replaces: libgtk2.0-0 (<< 2.21.3), libgtk2.0-bin (<< 2.21.3)
-Breaks: libwmf0.2-7 (<< 0.2.8.4-7), librsvg2-2 (<< 2.26.3-2)
 Description: GDK Pixbuf library
  The Gdk Pixbuf library provides:
   - Image loading and saving facilities.
@@ -43,7 +45,7 @@
          libglib2.0-dev,
          libx11-dev,
          libpng12-dev
-Conflicts: libgtk2.0-dev (<< 2.21.3)
+Breaks: libgtk2.0-dev (<< 2.21.3)
 Replaces: libgtk2.0-dev (<< 2.21.3), gir-repository-dev
 Description: GDK Pixbuf library (development files)
  The Gdk Pixbuf library provides:
@@ -57,7 +59,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: libgtk2.0-doc (<< 2.21.3)
+Breaks: libgtk2.0-doc (<< 2.21.3)
 Replaces: libgtk2.0-doc (<< 2.21.3)
 Description: GDK Pixbuf library (documentation)
  The Gdk Pixbuf library provides: