[libfann] 26/133: Updated Conflicts:

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 8a8d857612f0c1a1e729ac9796f07b0ad97f2c34
Author: Christian Kastner <debian at kvr.at>
Date:   Mon Jun 7 15:31:25 2010 +0200

    Updated Conflicts:
---
 debian/changelog | 1 +
 debian/control   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c420189..207e278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ libfann2 (2.1.0~beta~dfsg-1) UNRELEASED; urgency=low
     - Added Build-Depends on naturaldocs for API HTML documentation
     - Removed Build-Depends on docbook-utils (no longer supported by upstream)
     - Added Build-Depends on autotools-dev to update config.{sub,guess}
+    - Added proper Conflicts for older versions
   * debian/source/format:
     - Convert to format 3.0 (quilt)
   * debian/rules:
diff --git a/debian/control b/debian/control
index 749a005..6768abd 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,8 @@ Depends:
 Suggests:
     libfann2-dev (= ${binary:Version}),
     libfann2-doc (= ${binary:Version})
+Conflicts:
+    libfann1
 Description: Fast Artificial Neural Network Library 
  Fast Artificial Neural Network Library is a free open
  source neural network library, which implements multilayer artificial
@@ -41,7 +43,10 @@ Depends:
     libfann2 (= ${binary:Version})
 Recommends:
     libfann2-doc (= ${binary:Version})
-Conflicts: libfann1-dev
+Provides: libfann-dev
+Conflicts:
+    libfann-dev,
+    libfann1-dev
 Description: Development libraries and header files for FANN
  Fast Artificial Neural Network Library is a free open
  source neural network library, which implements multilayer artificial

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