r29691 - in /packages/experimental/cogl/debian: changelog control control.in

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

Author: ricotz-guest
Date: Mon Sep 19 20:21:12 2011
New Revision: 29691

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29691
Log:
conflicts/replaces old library package

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

Modified: packages/experimental/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/changelog?rev=29691&op=diff
==============================================================================
--- packages/experimental/cogl/debian/changelog [utf-8] (original)
+++ packages/experimental/cogl/debian/changelog [utf-8] Mon Sep 19 20:21:12 2011
@@ -5,8 +5,9 @@
     - build with EGL/GLES2 on armhf
   * debian/{rules,control*, libcogl2* > libcogl5*}:
     - updated for soname bump
+    - conflicts/replaces with libcogl2
 
- -- Rico Tzschichholz <ricotz at ubuntu.com>  Mon, 19 Sep 2011 21:49:47 +0200
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Mon, 19 Sep 2011 22:12:09 +0200
 
 cogl (1.7.8-1) experimental; urgency=low
 

Modified: packages/experimental/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/control?rev=29691&op=diff
==============================================================================
--- packages/experimental/cogl/debian/control [utf-8] (original)
+++ packages/experimental/cogl/debian/control [utf-8] Mon Sep 19 20:21:12 2011
@@ -32,6 +32,8 @@
 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
@@ -85,7 +87,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libcogl2 (= ${binary:Version}),
+Depends: libcogl5 (= ${binary:Version}),
          ${misc:Depends}
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files)

Modified: packages/experimental/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/cogl/debian/control.in?rev=29691&op=diff
==============================================================================
--- packages/experimental/cogl/debian/control.in [utf-8] (original)
+++ packages/experimental/cogl/debian/control.in [utf-8] Mon Sep 19 20:21:12 2011
@@ -27,6 +27,8 @@
 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
@@ -80,7 +82,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libcogl2 (= ${binary:Version}),
+Depends: libcogl5 (= ${binary:Version}),
          ${misc:Depends}
 Multi-Arch: same
 Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files)