r29582 - in /desktop/unstable/pygobject-2/debian: changelog control control.in

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Mon Sep  5 05:49:21 2011
New Revision: 29582

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29582
Log:
debian/control.in: Fix "Conflicts/Breaks" pairs to actually be what I
mean: "Breaks/Replaces".

Modified:
    desktop/unstable/pygobject-2/debian/changelog
    desktop/unstable/pygobject-2/debian/control
    desktop/unstable/pygobject-2/debian/control.in

Modified: desktop/unstable/pygobject-2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/changelog?rev=29582&op=diff
==============================================================================
--- desktop/unstable/pygobject-2/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/changelog [utf-8] Mon Sep  5 05:49:21 2011
@@ -3,6 +3,8 @@
   * debian/control.in, debian/rules: Rename python-gobject-dev to
     python-gobject-2-dev. pygobject 2.90 now also builds a python-gobject-dev
     which depends on python-gobject-2-dev.
+  * debian/control.in: Fix "Conflicts/Breaks" pairs to actually be what I
+    mean: "Breaks/Replaces".
 
  -- Martin Pitt <mpitt at debian.org>  Mon, 05 Sep 2011 07:23:46 +0200
 

Modified: desktop/unstable/pygobject-2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/control?rev=29582&op=diff
==============================================================================
--- desktop/unstable/pygobject-2/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/control [utf-8] Mon Sep  5 05:49:21 2011
@@ -38,8 +38,8 @@
          ${shlibs:Depends},
          ${misc:Depends}
 Provides: ${python:Provides}
-Conflicts: python-gobject (<< 2.90)
 Breaks: python-gobject (<< 2.90)
+Replaces: python-gobject (<< 2.90)
 Suggests: python-gobject-2-dbg
 Description: deprecated static Python bindings for the GObject library
  GObject is an abstraction layer that allows programming with an object
@@ -61,6 +61,8 @@
          libglib2.0-dev (>= 2.24.0),
          libffi-dev (>= 3.0.5)
 Recommends: docbook-xsl
+Breaks: python-gobject-dev (<< 2.90)
+Replaces: python-gobject-dev (<< 2.90)
 Description: development headers for the static GObject Python bindings
  GObject is an abstraction layer that allows programming with an object
  paradigm that is compatible with many languages. It is a part of Glib,
@@ -76,8 +78,8 @@
 Priority: extra
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gobject-2 (= ${binary:Version})
-Conflicts: python-gobject-dbg (<< 2.90)
 Breaks: python-gobject-dbg (<< 2.90)
+Replaces: python-gobject-dbg (<< 2.90)
 Description: deprecated static Python bindings for the GObject library (debug extension)
  GObject is an abstraction layer that allows programming with an object
  paradigm that is compatible with many languages. It is a part of Glib,

Modified: desktop/unstable/pygobject-2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject-2/debian/control.in?rev=29582&op=diff
==============================================================================
--- desktop/unstable/pygobject-2/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject-2/debian/control.in [utf-8] Mon Sep  5 05:49:21 2011
@@ -33,8 +33,8 @@
          ${shlibs:Depends},
          ${misc:Depends}
 Provides: ${python:Provides}
-Conflicts: python-gobject (<< 2.90)
 Breaks: python-gobject (<< 2.90)
+Replaces: python-gobject (<< 2.90)
 Suggests: python-gobject-2-dbg
 Description: deprecated static Python bindings for the GObject library
  GObject is an abstraction layer that allows programming with an object
@@ -73,8 +73,8 @@
 Priority: extra
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gobject-2 (= ${binary:Version})
-Conflicts: python-gobject-dbg (<< 2.90)
 Breaks: python-gobject-dbg (<< 2.90)
+Replaces: python-gobject-dbg (<< 2.90)
 Description: deprecated static Python bindings for the GObject library (debug extension)
  GObject is an abstraction layer that allows programming with an object
  paradigm that is compatible with many languages. It is a part of Glib,