[Pkg-gstreamer-commits] [gst-plugins-base1.0] 03/03: Turn versioned Conflicts into Breaks, remove trailing comma

[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-base1.0.

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

    Turn versioned Conflicts into Breaks, remove trailing comma
---
 debian/changelog  |    1 +
 debian/control    |    2 +-
 debian/control.in |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1660b4..fd64c06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gst-plugins-base1.0 (1.2.0-2) UNRELEASED; urgency=low
   * Team upload.
   * Fix gst_version variable generation.
   * Add Vcs-* fields to debian/control{,.in}, update Homepage field.
+  * Turn versioned Conflicts into Breaks, remove trailing comma.
 
  -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 24 Oct 2013 09:42:01 +0200
 
diff --git a/debian/control b/debian/control
index 449867f..1770254 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iso-codes
-Conflicts: totem-gstreamer (<= 2.17.92-0ubuntu1),
+Breaks: totem-gstreamer (<= 2.17.92-0ubuntu1)
 Suggests: libvisual-0.4-plugins,
           gstreamer-codec-install | gnome-codec-install
 Description: GStreamer libraries from the "base" set
diff --git a/debian/control.in b/debian/control.in
index af29e3b..0a11f01 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -55,7 +55,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          iso-codes
-Conflicts: totem-gstreamer (<= 2.17.92-0ubuntu1),
+Breaks: totem-gstreamer (<= 2.17.92-0ubuntu1)
 Suggests: libvisual-0.4-plugins,
           gstreamer-codec-install | gnome-codec-install
 Description: GStreamer libraries from the "base" set

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