[Logcheck-commits] Gerfried Fuchs: Remove amavisd-new conflict

[Gerfried Fuchs]

Module: logcheck
Branch: master
Commit: 567b735d5bdf3461adf979e67ce7144946747a3d
URL:    http://git.debian.org/?p=logcheck/logcheck.git;a=commit;h=567b735d5bdf3461adf979e67ce7144946747a3d

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

Remove amavisd-new conflict

---

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

diff --git a/debian/changelog b/debian/changelog
index d02d7f8..8b511f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+logcheck (1.3.2) experimental; urgency=low
+
+  [ Gerfried Fuchs ]
+  * Remove amavisd-new conflict, the file name conflict is long gone.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Tue, 02 Sep 2008 12:19:39 +0200
+
 logcheck (1.3.1) experimental; urgency=low
 
   * Removed ignore.d.server/no-ip, which clashes with the no-ip package, which
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