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

treinen pushed a commit to branch master
in repository dose3.

commit 47e6395055afb9552b9e9374ca1da3b1c62db41c
Author: Ralf Treinen <trei...@free.fr>
Date:   Tue Oct 21 20:20:16 2014 +0200

    d/control: Conflicts -> Breaks
---
 debian/changelog | 1 +
 debian/control   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adca093..0f63ffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dose3 (3.3~beta1-1) UNRELEASED; urgency=low
       buildcheck-manpage-native-arch, multiarch-accept-value-no
   * add rudimentary as-installed package tests for dose-debcheck,
     dose-builddebcheck, dose-outdated
+  * debian/control: replace Conflicts: by Breaks:
 
   [ Johannes Schauer ]
   * avoid lintian warning binary-control-field-duplicates-source field
diff --git a/debian/control b/debian/control
index 4a17403..64eb980 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,7 @@ Package: dose-distcheck
 Section: devel
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: dose3-distcheck (<< 2.9.13)
+Breaks: dose3-distcheck (<< 2.9.13)
 Replaces: dose3-distcheck (<< 2.9.13)
 Description: Checks whether dependencies of packages can be satisfied
  This software checks for every package of a distribution whether it
@@ -77,7 +77,7 @@ Package: dose-builddebcheck
 Section: devel
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: dose3-builddebcheck (<< 2.9.13)
+Breaks: dose3-builddebcheck (<< 2.9.13)
 Replaces: dose3-builddebcheck (<< 2.9.13)
 Description: Checks whether build-dependencies can be satisfied
  This software checks, given a collection of source package stanzas
@@ -89,7 +89,7 @@ Package: dose-extra
 Section: devel
 Architecture: any
 Provides: ceve
-Conflicts: ceve (<< 2.9.10)
+Breaks: ceve (<< 2.9.10)
 Replaces: ceve (<< 2.9.10)
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: Extra QA tools from the Dose3-library

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to