r29467 - in /packages/experimental/cogl/debian: control control.in

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

Author: ricotz-guest
Date: Sat Aug 20 19:03:48 2011
New Revision: 29467

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29467
Log:
use Replaces/Breaks instead of Conflicts/Breaks

Modified:
    packages/experimental/cogl/debian/control
    packages/experimental/cogl/debian/control.in

Modified: packages/experimental/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/control?rev=29467&op=diff
==============================================================================
--- packages/experimental/cogl/debian/control [utf-8] (original)
+++ packages/experimental/cogl/debian/control [utf-8] Sat Aug 20 19:03:48 2011
@@ -71,7 +71,7 @@
          ${shlibs:Depends}
 Recommends: pkg-config
 Suggests: libcogl-doc
-Conflicts: libclutter-1.0-dev (<< 1.7)
+Replaces: libclutter-1.0-dev (<< 1.7)
 Breaks: libclutter-1.0-dev (<< 1.7)
 Description: An object oriented GL/GLES Abstraction/Utility Layer (development files)
  Cogl is a small open source library for using 3D graphics hardware to draw
@@ -101,7 +101,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: devhelp
-Conflicts: libclutter-1.0-doc (<< 1.7)
+Replaces: libclutter-1.0-doc (<< 1.7)
 Breaks: libclutter-1.0-doc (<< 1.7)
 Description: An object oriented GL/GLES Abstraction/Utility Layer (documentation)
  Cogl is a small open source library for using 3D graphics hardware to draw
@@ -116,7 +116,7 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: gir1.2-clutter-1.0 (<< 1.7)
+Replaces: gir1.2-clutter-1.0 (<< 1.7)
 Breaks: gir1.2-clutter-1.0 (<< 1.7)
 Description: GObject introspection data for the Cogl 1.0 library
  This package contains introspection data for the Clutter scene

Modified: packages/experimental/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/control.in?rev=29467&op=diff
==============================================================================
--- packages/experimental/cogl/debian/control.in [utf-8] (original)
+++ packages/experimental/cogl/debian/control.in [utf-8] Sat Aug 20 19:03:48 2011
@@ -66,7 +66,7 @@
          ${shlibs:Depends}
 Recommends: pkg-config
 Suggests: libcogl-doc
-Conflicts: libclutter-1.0-dev (<< 1.7)
+Replaces: libclutter-1.0-dev (<< 1.7)
 Breaks: libclutter-1.0-dev (<< 1.7)
 Description: An object oriented GL/GLES Abstraction/Utility Layer (development files)
  Cogl is a small open source library for using 3D graphics hardware to draw
@@ -96,7 +96,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: devhelp
-Conflicts: libclutter-1.0-doc (<< 1.7)
+Replaces: libclutter-1.0-doc (<< 1.7)
 Breaks: libclutter-1.0-doc (<< 1.7)
 Description: An object oriented GL/GLES Abstraction/Utility Layer (documentation)
  Cogl is a small open source library for using 3D graphics hardware to draw
@@ -111,7 +111,7 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: gir1.2-clutter-1.0 (<< 1.7)
+Replaces: gir1.2-clutter-1.0 (<< 1.7)
 Breaks: gir1.2-clutter-1.0 (<< 1.7)
 Description: GObject introspection data for the Cogl 1.0 library
  This package contains introspection data for the Clutter scene