Imported Debian patch 2.0.1-2debian/2.0.1-2

5 files changed, 41 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f77b1c..fd0741c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+rsyslog (2.0.1-2) unstable; urgency=low
+
+  * debian/control
+    - Drop Replaces: system-log-daemon, linux-kernel-log-daemon. There are no
+      conflicting files with other syslog packages so this line is not needed.
+    - Add new package rsyslog-doc.
+    - Add Suggests: rsyslog-doc to rsyslog.
+  * debian/rsyslog.install, debian/rsyslog-doc.install
+    - Move the html files from rsyslog to rsyslog-doc.
+  * debian/rsyslog-doc.doc-base
+    - Integrate the documentation with doc-base.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 02 Feb 2008 17:00:49 +0100
+
 rsyslog (2.0.1-1) unstable; urgency=low
 
   * New upstream bug fix release.
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
diff --git a/debian/rsyslog-doc.doc-base b/debian/rsyslog-doc.doc-base
new file mode 100644
index 0000000..e074000
--- /dev/null
+++ b/debian/rsyslog-doc.doc-base
@@ -0,0 +1,9 @@
+Document: rsyslog-doc
+Title: Rsyslog Documentation
+Author: Rainer Gerhards
+Abstract: This documentation covers the configuration of rsyslog.
+Section: Applications/System/Administration
+
+Format: HTML
+Index: /usr/share/doc/rsyslog-doc/html/manual.html
+Files: /usr/share/doc/rsyslog-doc/html/*.html
diff --git a/debian/rsyslog-doc.install b/debian/rsyslog-doc.install
new file mode 100644
index 0000000..c031ce6
--- /dev/null
+++ b/debian/rsyslog-doc.install
@@ -0,0 +1 @@
+doc/*.html usr/share/doc/rsyslog-doc/html/
diff --git a/debian/rsyslog.install b/debian/rsyslog.install
index 14ff5e3..d4ce64a 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -1,4 +1,3 @@
-doc/*.html /usr/share/doc/rsyslog/html/
 debian/rsyslog.conf /etc/
 debian/tmp/usr/sbin/
 debian/tmp/usr/share/man/