Remove the rsyslog-doc package which is now built from a separate source package.

5 files changed, 2 insertions, 32 deletions

diff --git a/debian/changelog b/debian/changelog
index 0817c22..5553206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ rsyslog (8.2.2-1) UNRELEASED; urgency=medium
     - Drop libee-dev.
   * Drop the omruleset module which has been deprecated and replaced by the
     much more efficient RainerScript "call" statement.
+  * Remove the rsyslog-doc package which is now built from a separate source
+    package.
 
  -- Michael Biebl <biebl@debian.org>  Thu, 03 Apr 2014 03:08:04 +0200
 
diff --git a/debian/control b/debian/control
index 32a257b..d680bad 100644
--- a/debian/control
+++ b/debian/control
@@ -60,22 +60,6 @@ Description: reliable system and kernel logging daemon
  .
  It is the default syslogd on Debian systems.
 
-Package: rsyslog-doc
-Section: doc
-Priority: extra
-Architecture: all
-Breaks: rsyslog (<< 2.0.1-2)
-Replaces: rsyslog (<< 2.0.1-2)
-Depends: ${misc:Depends}
-Suggests: doc-base,
-          www-browser
-Description: documentation for rsyslog
- This package contains detailed HTML documentation for rsyslog.
- .
- It describes the general configuration file syntax for filters, actions,
- templates, etc, and has detailed information for all available configuration
- directives.
-
 Package: rsyslog-mysql
 Architecture: any
 Priority: extra
diff --git a/debian/rsyslog-doc.doc-base b/debian/rsyslog-doc.doc-base
deleted file mode 100644
index 390179b..0000000
--- a/debian/rsyslog-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: rsyslog-doc
-Title: Rsyslog Documentation
-Author: Rainer Gerhards
-Abstract: This documentation covers the configuration of rsyslog.
-Section: 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
deleted file mode 100644
index 57a07f8..0000000
--- a/debian/rsyslog-doc.install
+++ /dev/null
@@ -1,4 +0,0 @@
-doc/*.html usr/share/doc/rsyslog-doc/html/
-doc/*.jpg  usr/share/doc/rsyslog-doc/html/
-doc/*.png  usr/share/doc/rsyslog-doc/html/
-doc/*.conf usr/share/doc/rsyslog-doc/html/
diff --git a/debian/rules b/debian/rules
index 3c94bd3..c5bd2bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,8 +60,5 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
 		debian/rsyslog/usr/lib/rsyslog/
 endif
 
-override_dh_compress:
-	dh_compress -X rsyslog-example.conf
-
 override_dh_installinit:
 	dh_installinit -R