[lucene2] 63/104: Changed Breaks to Conflicts to prevent trouble with buildds still running Etch

[Kai-Chung Yan]

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

seamlik-guest pushed a commit to branch master
in repository lucene2.

commit 1672050a2046f69dcce7df86f93908fda260b60c
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date:   Tue Mar 17 15:00:50 2009 +0000

    Changed Breaks to Conflicts to prevent trouble with buildds still running Etch
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 867d21e..96f992d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene2 (2.4.0+ds1-5) unstable; urgency=low
+
+  * Changed Breaks to Conflicts to prevent trouble with buildds still
+    running Etch.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Sun, 01 Mar 2009 07:31:37 +0100
+
 lucene2 (2.4.0+ds1-4) unstable; urgency=low
 
   * Added a Breaks: control field to indicate incompatibility with versions
diff --git a/debian/control b/debian/control
index 7bf0610..6521693 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Depends: ${misc:Depends},
  libcommons-collections3-java (>= 3.1), 
  libcommons-logging-java (>= 1.0.4), 
  libcommons-beanutils-java (>= 1.7.0)
-Breaks: solr-common (< 1.2.0+ds2-3)
+Conflicts: solr-common (< 1.2.0+ds2-3)
 Description: Full-text search engine library for Java(TM)
  Lucene is a full-text search engine for the Java(TM) programming language.
  Lucene is not a complete application, but rather a code library and API

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git