r26969 - in /packages/experimental/libgdata/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Mar 19 19:31:06 2011
New Revision: 26969

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26969
Log:
Add missing conflict with gir1.0-gdata-0.0.

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

Modified: packages/experimental/libgdata/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/changelog?rev=26969&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/changelog [utf-8] (original)
+++ packages/experimental/libgdata/debian/changelog [utf-8] Sat Mar 19 19:31:06 2011
@@ -1,3 +1,9 @@
+libgdata (0.8.0-2) UNRELEASED; urgency=low
+
+  * Add missing conflict with gir1.0-gdata-0.0.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 19 Mar 2011 20:30:35 +0100
+
 libgdata (0.8.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/experimental/libgdata/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/control?rev=26969&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/control [utf-8] (original)
+++ packages/experimental/libgdata/debian/control [utf-8] Sat Mar 19 19:31:06 2011
@@ -89,6 +89,7 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: gir1.0-gdata-0.0
 Description: Description: GObject introspection data for the GData webservices library
  libgdata is a GLib-based library for accessing online service APIs using
  the GData protocol — most notably, Google's services. It provides APIs

Modified: packages/experimental/libgdata/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/libgdata/debian/control.in?rev=26969&op=diff
==============================================================================
--- packages/experimental/libgdata/debian/control.in [utf-8] (original)
+++ packages/experimental/libgdata/debian/control.in [utf-8] Sat Mar 19 19:31:06 2011
@@ -84,6 +84,7 @@
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: gir1.0-gdata-0.0
 Description: Description: GObject introspection data for the GData webservices library
  libgdata is a GLib-based library for accessing online service APIs using
  the GData protocol — most notably, Google's services. It provides APIs