[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. 80a41f89070c1546065736955b9285e2a0132e8f

[Javier Fernandez-Sanguino]

The following commit has been merged in the debian branch:
commit ba321990e6fc2c36d56c014e18f761347be0e72b
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Fri Jul 29 18:07:08 2011 +0200

    Conflicts: between packages because they cannot be installed in the
    same system

diff --git a/debian/control b/debian/control
index 4aec65e..52c8713 100644
--- a/debian/control
+++ b/debian/control
@@ -17,18 +17,21 @@ Description: documentation for ossec-hids.
 Package: ossec-hids-local
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ossec-hids-server, ossec-hids-agent
 Description: Ossec's local installation binaries. Host-based Intrusion Detection System.
  OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
 
 Package: ossec-hids-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ossec-hids-local, ossec-hids-agent
 Description: Ossec's server installation binaries. Host-based Intrusion Detection System.
  OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
 
-Package: ossec-hids-client
+Package: ossec-hids-agent
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ossec-hids-local, ossec-hids-server
 Description: Ossec's client installation binaries. Host-based Intrusion Detection System.
  OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion  detection), log monitoring and SIM/SIEM together.
 

-- 
Git repository for pkg-ossec