[pkg-fso-commits] [fso-frameworkd] 15/20: Conflicts -> Breaks

[Sebastian Reichel]

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

sre pushed a commit to branch debian
in repository fso-frameworkd.

commit 8e692c81711fe7dd26ac1c4cfe7049395d53cc86
Author: Sebastian Reichel <sre at ring0.de>
Date:   Sun Nov 8 11:15:28 2015 +0100

    Conflicts -> Breaks
---
 debian/changelog | 1 +
 debian/control   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18fea71..a465e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ fso-frameworkd (0.10.1-1) UNRELEASED; urgency=low
   * Update DBus permission patch to be more restrictive
   * Add a sentence in each package's long description to describe, what
     is contained in the the specific package
+  * Use Breaks instead of Conflicts
 
  -- Rico Rommel <rico at bierrommel.de>  Sun, 13 May 2012 17:26:15 +0200
 
diff --git a/debian/control b/debian/control
index f065610..0ca9eea 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Recommends: fso-sounds,
             fso-usaged,
             python-alsaaudio,
             python-rtc
-Conflicts: frameworkd, python2.5 (<< 2.5.2-13), fso-frameworkd-wireless-glue, openmoko-panel-plugin (<= 0.8-1), zhone (<< 0-git20090202), fso-config-gta01, fso-config-gta02
+Conflicts: fso-config-gta01, fso-config-gta02
+Breaks: frameworkd, python2.5 (<< 2.5.2-13), fso-frameworkd-wireless-glue, openmoko-panel-plugin (<= 0.8-1), zhone (<< 0-git20090202)
 Replaces: frameworkd, fso-frameworkd-wireless-glue
 Provides: frameworkd
 Description: freesmartphone.org Framework Daemon
@@ -47,7 +48,8 @@ Description: freesmartphone.org Framework Daemon
 Package: fso-frameworkd-gta02
 Architecture: armel
 Depends: ${misc:Depends}, fso-usaged-openmoko, fso-deviced-openmoko, fso-gsmd-openmoko, fso-frameworkd
-Conflicts: fso-config-gta02, fso-frameworkd-gta01
+Breaks: fso-config-gta02
+Replaces: fso-config-gta02
 Description: configuration files for freesmartphone.org Framework Daemon for GTA02
  This package provides the backend daemon of the freesmartphone.org software
  stack. It provides all telephone related features, such as accepting and making
@@ -61,7 +63,8 @@ Description: configuration files for freesmartphone.org Framework Daemon for GTA
 Package: fso-frameworkd-gta01
 Architecture: armel
 Depends: ${misc:Depends}, fso-usaged-openmoko, fso-deviced-openmoko, fso-gsmd-openmoko, fso-frameworkd
-Conflicts: fso-config-gta01, fso-frameworkd-gta02
+Breaks: fso-config-gta01
+Replaces: fso-frameworkd-gta01
 Description: configuration files for freesmartphone.org Framework Daemon for GTA01
  This package provides the backend daemon of the freesmartphone.org software
  stack. It provides all telephone related features, such as accepting and making

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/fso-frameworkd.git