r28101 - in /desktop/unstable/gnome-python/debian: changelog control control.in

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Sun May 29 15:21:54 2011
New Revision: 28101

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28101
Log:
debian/control.in: Add Conficts/Replaces: python-gnomecanvas. This only
existed in Ubuntu (which now is getting rid of this delta), and is a
no-op for Debian.

Modified:
    desktop/unstable/gnome-python/debian/changelog
    desktop/unstable/gnome-python/debian/control
    desktop/unstable/gnome-python/debian/control.in

Modified: desktop/unstable/gnome-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/changelog?rev=28101&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/changelog [utf-8] Sun May 29 15:21:54 2011
@@ -1,6 +1,12 @@
 gnome-python (2.28.1-3) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Drop incorrect ${python:Provides}.
+
+  [ Martin Pitt ]
+  * debian/control.in: Add Conficts/Replaces: python-gnomecanvas. This only
+    existed in Ubuntu (which now is getting rid of this delta), and is a
+    no-op for Debian.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 25 Apr 2011 17:27:28 +0200
 

Modified: desktop/unstable/gnome-python/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/control?rev=28101&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/control [utf-8] Sun May 29 15:21:54 2011
@@ -39,6 +39,8 @@
          python-gtk2 (>= 2.10.3),
          python-pyorbit (>= 2.0.1-4),
          python-gobject (>= 2.17.0)
+Conflicts: python-gnomecanvas
+Replaces: python-gnomecanvas
 Suggests: python-gnome2-doc
 Description: Python bindings for the GNOME desktop environment
  This archive contains modules that allow you to write Python programs

Modified: desktop/unstable/gnome-python/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/control.in?rev=28101&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-python/debian/control.in [utf-8] Sun May 29 15:21:54 2011
@@ -34,6 +34,8 @@
          python-gtk2 (>= 2.10.3),
          python-pyorbit (>= 2.0.1-4),
          python-gobject (>= 2.17.0)
+Conflicts: python-gnomecanvas
+Replaces: python-gnomecanvas
 Suggests: python-gnome2-doc
 Description: Python bindings for the GNOME desktop environment
  This archive contains modules that allow you to write Python programs