Imported Debian patch 2.0.1-2debian/2.0.1-2

1 files changed, 17 insertions, 5 deletions

diff --git a/debian/control b/debian/control
index 3734cb9..3b0546f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,16 +8,15 @@ Homepage: http://www.rsyslog.com/
 
 Package: rsyslog
 Architecture: any
-Conflicts: linux-kernel-log-daemon, system-log-daemon
-Replaces: linux-kernel-log-daemon, system-log-daemon
-Provides: linux-kernel-log-daemon, system-log-daemon
+Conflicts: system-log-daemon, linux-kernel-log-daemon
+Provides: system-log-daemon, linux-kernel-log-daemon
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
 Recommends: logrotate
-Suggests: rsyslog-mysql | rsyslog-pgsql
+Suggests: rsyslog-mysql | rsyslog-pgsql, rsyslog-doc
 Description: enhanced multi-threaded syslogd
  Rsyslog is an enhanced syslogd supporting, amongst others:
   * reliable syslog over TCP and RFC 3195
-  * writing to MySQL databases (via a separate output plugin)
+  * writing to MySQL or PostgreSQL databases (via separate output plugins)
   * permitted sender lists
   * filtering on any part of the syslog message
   * on-the-wire message compression
@@ -29,6 +28,19 @@ Description: enhanced multi-threaded syslogd
  encryption protected syslog relay chains while at the same time being very
  easy to setup for the novice user.
 
+Package: rsyslog-doc
+Section: doc
+Architecture: all
+Conflicts: rsyslog (<< 2.0.1-2)
+Replaces: rsyslog (<< 2.0.1-2)
+Suggests: doc-base
+Description: documentation for rsyslog
+ This package contains detailed HTML documentation of rsyslog.
+ .
+ It describes the general configuration file syntax, like filters, actions and
+ templates and has detailed information for all available configuration 
+ directives.
+
 Package: rsyslog-mysql
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, rsyslog (= ${binary:Version}), dbconfig-common, ucf