[pybtex] 16/108: Replace Breaks with Conflicts.

[Daniel Stender]

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

stender pushed a commit to branch master
in repository pybtex.

commit 65479cb0d98495160087737a8062d8e46f6c67a2
Author: Jakub Wilk <jwilk at debian.org>
Date:   Tue Dec 29 13:07:28 2009 +0000

    Replace Breaks with Conflicts.
---
 debian/changelog | 5 +++--
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2d2011..3d8a51d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
 pybtex (0.12-2) UNRELEASED; urgency=low
 
   * Don't remove alternatives in prerm/upgrade.
+  * Replace Breaks with Conflicts.
   * Install alternative for /usr/bin/bibtex.
-    Break TeX Live packages that installed this file.
+    Conflict with TeX Live packages, which installed this file.
   * Update debian/copyright in accordance to the latest DEP-5 version.
   * Switch to source format 3.0 (quilt).
   * Make tests/run_bibtex.py compatible with Python 2.5.
   * Run unit-tests at build time.
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 29 Dec 2009 13:30:54 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 29 Dec 2009 14:07:07 +0100
 
 pybtex (0.12-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bb364df..272934e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pybtex/trunk/
 Package: pybtex
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-pyparsing
-Breaks: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~), texlive-base-bin (<< 2009-5~)
+Conflicts: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~), texlive-base-bin (<< 2009-5~)
 Recommends: python-yaml
 Description: BibTeX-compatible bibliography processor
  Pybtex reads citation information from a file and produces a formatted

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybtex.git