[med-svn] [ball] 07/13: Use Breaks where Conflicts is to strong

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ball.

commit cb0162ddb7c66ed961a47d3b0f04a3f16f162775
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 18 12:15:34 2016 +0200

    Use Breaks where Conflicts is to strong
---
 debian/changelog | 1 +
 debian/control   | 4 ++--
 debian/rules     | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea42095..abdd19c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ ball (1.4.3~beta1-1) UNRELEASED; urgency=medium
   * DEP5 fixes
   * Use python-helper properly
   * Enhance long description of dev package
+  * Use Breaks where Conflicts is to strong
 
   [ Danny Edel ]
   * d/rules: Enable building and execution of unittests
diff --git a/debian/control b/debian/control
index 87980a7..7e3ac6e 100644
--- a/debian/control
+++ b/debian/control
@@ -150,7 +150,7 @@ Depends: ${shlibs:Depends},
          ${sip:Depends},
          libball1.4,
          ${misc:Depends}
-Conflicts: python-ball (<< ${binary:Version})
+Breaks: python-ball (<< ${binary:Version})
 Description: Python bindings for the Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework 
  in C++ that has been specifically designed for rapid software 
@@ -168,7 +168,7 @@ Depends: ${shlibs:Depends},
          libballview1.4,
          python-ball (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: python-ballview (<< ${binary:Version})
+Breaks: python-ballview (<< ${binary:Version})
 Description: Python bindings for VIEW-parts of the Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework 
  in C++ that has been specifically designed for rapid software 
diff --git a/debian/rules b/debian/rules
index 5262420..74acaab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,5 +137,8 @@ override_dh_auto_install-indep:
 	cp -r $(BALL_INSTALL_PATH)/usr/share/BALL/doc/BALL     debian/libball$(SOVERSION)-doc/usr/share/doc/libball$(SOVERSION)/html
 
 	cp -r $(BALL_INSTALL_PATH)/usr/share/BALL/data    debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION) 
+
+override_dh_installdocs:
+	dh_installdocs
 	find $(BALL_INSTALL_PATH)/usr/share -type d -empty -delete
 	find $(BALL_INSTALL_PATH)/usr/share -name jquery.js -delete

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git