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

[jcristau at users.alioth.debian.org]

Author: jcristau
Date: Sat Mar 16 11:35:47 2013
New Revision: 36985

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36985
Log:
Add replaces/conflicts on gir1.0-clutter-1.0 because of a file conflict (closes: #702453).

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=36985&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/changelog [utf-8] (original)
+++ desktop/unstable/cogl/debian/changelog [utf-8] Sat Mar 16 11:35:47 2013
@@ -1,6 +1,11 @@
 cogl (1.10.2-7) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Add missing epoch on libxcomposite-dev build-dependency.
+
+  [ Julien Cristau ]
+  * Add replaces/conflicts on gir1.0-clutter-1.0 because of a file conflict
+    (closes: #702453).
 
  -- Josselin Mouette <joss at debian.org>  Fri, 06 Jul 2012 11:41:34 +0200
 

Modified: desktop/unstable/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control?rev=36985&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control [utf-8] (original)
+++ desktop/unstable/cogl/debian/control [utf-8] Sat Mar 16 11:35:47 2013
@@ -120,8 +120,9 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Replaces: gir1.2-clutter-1.0 (<< 1.7)
+Replaces: gir1.2-clutter-1.0 (<< 1.7), gir1.0-clutter-1.0
 Breaks: gir1.2-clutter-1.0 (<< 1.7)
+Conflicts: gir1.0-clutter-1.0
 Description: GObject introspection data for the Cogl 1.0 library
  This package contains introspection data for the Clutter scene
  graph library.

Modified: desktop/unstable/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/cogl/debian/control.in?rev=36985&op=diff
==============================================================================
--- desktop/unstable/cogl/debian/control.in [utf-8] (original)
+++ desktop/unstable/cogl/debian/control.in [utf-8] Sat Mar 16 11:35:47 2013
@@ -115,8 +115,9 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Replaces: gir1.2-clutter-1.0 (<< 1.7)
+Replaces: gir1.2-clutter-1.0 (<< 1.7), gir1.0-clutter-1.0
 Breaks: gir1.2-clutter-1.0 (<< 1.7)
+Conflicts: gir1.0-clutter-1.0
 Description: GObject introspection data for the Cogl 1.0 library
  This package contains introspection data for the Clutter scene
  graph library.