[Logcheck-commits] Gerfried Fuchs: Removed Conflicts with amavisd-new

[Gerfried Fuchs]

Module: logcheck
Branch: etch-backports
Commit: 1db5b8b82ac99f5278086ccb52cd8559f7f388eb
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=1db5b8b82ac99f5278086ccb52cd8559f7f388eb

Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Tue Sep  2 12:12:08 2008 +0200

Removed Conflicts with amavisd-new

---

 debian/changelog |    7 +++++++
 debian/control   |    1 -
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 469421f..be19ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+logcheck (1.2.68~bpo40+2) etch-backports; urgency=low
+
+  * Removed Conflicts with amavisd-new, mentioned by David Schweikert. I'll
+    remove it from the master branch too. Sorry for the inconvenience.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Tue, 02 Sep 2008 12:08:06 +0200
+
 logcheck (1.2.68~bpo40+1) etch-backports; urgency=low
 
   * Rebuild for etch-backports.
diff --git a/debian/control b/debian/control
index f4ddbc2..7876058 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,6 @@ Package: logcheck-database
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: logcheck (<= 1.1.1-9)
-Conflicts: amavisd-new (<< 1:2.5.2-1)
 Description: database of system log rules for the use of log checkers
  This database is part of the Logcheck package, but might be used by others.
  It brings a database of regular expressions for matching system log entries