r34746 - in /desktop/unstable/cogl/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat May  5 14:30:08 2012
New Revision: 34746

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34746
Log:
* Make libcogl-pango0 break libcogl5 (<< 1.10.1-1) to avoid partial
  upgrades which can lead to applications like gnome-shell linking against
  both libcogl5 and libcogl9 resulting in a crash. Closes: #668285
* Drop old Conflicts/Replaces: libcogl2.
* Fix the Breaks/Replaces for the libcogl-pango split.

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

Modified: desktop/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/changelog?rev=34746&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog [utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog [utf-8] Sat May  5 14:30:08 2012
@@ -1,3 +1,13 @@
+cogl (1.10.2-3) UNRELEASED; urgency=low
+
+  * Make libcogl-pango0 break libcogl5 (<< 1.10.1-1) to avoid partial
+    upgrades which can lead to applications like gnome-shell linking against
+    both libcogl5 and libcogl9 resulting in a crash. Closes: #668285
+  * Drop old Conflicts/Replaces: libcogl2.
+  * Fix the Breaks/Replaces for the libcogl-pango split.
+
+ -- Michael Biebl <biebl at debian.org>  Sat, 05 May 2012 16:28:47 +0200
+
 cogl (1.10.2-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control?rev=34746&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control [utf-8] (original)
+++ desktop/unstable/cogl/debian/control [utf-8] Sat May  5 14:30:08 2012
@@ -32,8 +32,6 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: libcogl-common
-Conflicts: libcogl2
-Replaces: libcogl2
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer
@@ -134,9 +132,8 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: libcogl-common
-Conflicts: libcogl2
-Replaces: libcogl2, libcogl5 (<< 1.8.0-1)
-Breaks: libcogl5 (<< 1.8.0-1)
+Replaces: libcogl5 (<< 1.8.0-1)
+Breaks: libcogl5 (<< 1.10.0-1)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer

Modified: desktop/unstable/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control.in?rev=34746&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control.in [utf-8] (original)
+++ desktop/unstable/cogl/debian/control.in [utf-8] Sat May  5 14:30:08 2012
@@ -27,8 +27,6 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: libcogl-common
-Conflicts: libcogl2
-Replaces: libcogl2
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer
@@ -129,9 +127,9 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Recommends: libcogl-common
-Conflicts: libcogl2
-Replaces: libcogl2, libcogl5 (<< 1.8.0-1)
-Breaks: libcogl5 (<< 1.8.0-1)
+Replaces: libcogl2 (<< 1.8.0-1)
+Breaks: libcogl2 (<< 1.8.0-1),
+        libcogl5 (<< 1.10.0-1)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer
@@ -176,8 +174,8 @@
 Architecture: any
 Depends: libcogl-pango0 (= ${binary:Version}),
          ${misc:Depends}
-Replaces: libcogl5-dbg (<< 1.8.0-1)
-Breaks: libcogl5-dbg (<< 1.8.0-1)
+Replaces: libcogl2-dbg (<< 1.8.0-1)
+Breaks: libcogl2-dbg (<< 1.8.0-1)
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files)
  Cogl is a small open source library for using 3D graphics hardware to draw