[SCM] frei0r/master: Use Breaks:frei0r rather than Conflicts:frei0r

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5b6fd09bb37f1228e5a5ba58d793aaa118f515e3
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed May 21 10:09:57 2014 +0200

    Use Breaks:frei0r rather than Conflicts:frei0r
    
    using Breaks/Replaces is the recommended way

diff --git a/debian/control.in b/debian/control.in
index 75d1189..a5aebf4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -19,7 +19,7 @@ Package: frei0r-plugins
 Architecture: any
 Depends: ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: frei0r (<= 1.1.22)
+Breaks: frei0r (<= 1.1.22)
 Replaces: frei0r
 Description: minimalistic plugin API for video effects, plugins collection
  frei0r is a minimalistic plugin API for video sources and filters. The
@@ -37,7 +37,7 @@ Package: frei0r-plugins-dev
 Section: devel
 Architecture: any
 Depends: ${misc:Depends}
-Conflicts: frei0r-dev (<= 1.1.22)
+Breaks: frei0r-dev (<= 1.1.22)
 Replaces: frei0r-dev
 Description: minimalistic plugin API for video effects, header files
  frei0r is a minimalistic plugin API for video sources and filters. The
@@ -56,7 +56,7 @@ Package: frei0r-plugins-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: frei0r-doc (<= 1.1.22)
+Breaks: frei0r-doc (<= 1.1.22)
 Replaces: frei0r-doc
 Description: minimalistic plugin API for video effects, API documentation
  frei0r is a minimalistic plugin API for video sources and filters. The

-- 
frei0r packaging