[Pkg-gstreamer-commits] [gst-plugins-good1.0] 02/02: Turn versioned Conflicts into Breaks to simplify lockstep upgrades

[Fabian Greffrath]

This is an automated email from the git hooks/post-receive script.

fabian-guest pushed a commit to branch master
in repository gst-plugins-good1.0.

commit 07669cfdd0bb95a4f889b901c3c4a47647d8187d
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Oct 24 09:57:08 2013 +0200

    Turn versioned Conflicts into Breaks to simplify lockstep upgrades
---
 debian/changelog  |    1 +
 debian/control    |    4 ++--
 debian/control.in |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c49c5c0..f5d92ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gst-plugins-good1.0 (1.2.0-2) UNRELEASED; urgency=low
 
   * Team upload.
   * Add Vcs-* and Homepage fields to debian/control[,.in}.
+  * Turn versioned Conflicts into Breaks to simplify lockstep upgrades.
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 24 Oct 2013 09:55:18 +0200
 
diff --git a/debian/control b/debian/control
index 2d7b7ab..1bc8f3a 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Depends: ${misc:Depends},
          gstreamer1.0-plugins-base,
 Recommends: gstreamer1.0-x
 Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
+Breaks: gstreamer1.0-plugins-bad (<< 1.1.2)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -90,7 +90,7 @@ Depends: gstreamer1.0-plugins-good (= ${binary:Version}),
          gstreamer1.0-pulseaudio (= ${binary:Version}),
          ${misc:Depends}
 Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
+Breaks: gstreamer1.0-plugins-bad (<< 1.1.2)
 Description: GStreamer plugins from the "good" set
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do
diff --git a/debian/control.in b/debian/control.in
index 1a3b101..f45e2da 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -62,7 +62,7 @@ Depends: ${misc:Depends},
          gstreamer at GST_ABI@-plugins-base,
 Recommends: @GST_PKGNAME at -x
 Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
+Breaks: gstreamer1.0-plugins-bad (<< 1.1.2)
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}
@@ -90,7 +90,7 @@ Depends: @GST_PKGNAME at -plugins-good (= ${binary:Version}),
          @GST_PKGNAME at -pulseaudio (= ${binary:Version}),
          ${misc:Depends}
 Replaces: gstreamer1.0-plugins-bad (<< 1.1.2)
-Conflicts: gstreamer1.0-plugins-bad (<< 1.1.2)
+Breaks: gstreamer1.0-plugins-bad (<< 1.1.2)
 Description: GStreamer plugins from the "good" set
  GStreamer is a streaming media framework, based on graphs of filters
  which operate on media data.  Applications using this library can do

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-good1.0.git