Merge branch 'master' into experimental

Conflicts:
	debian/changelog

4 files changed, 27 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index e2723f2..2f36340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,16 @@ rsyslog (8.2.1-1) UNRELEASED; urgency=medium
 
  -- Michael Biebl <biebl@debian.org>  Thu, 03 Apr 2014 03:08:04 +0200
 
+rsyslog (7.6.3-2) unstable; urgency=medium
+
+  * Update Build-Depends:
+    - Bump librelp-dev to (>= 1.2.5).
+  * Build omelasticsearch module which provides support for logging to an
+    Elasticsearch server. Split that module into a separate package called
+    rsyslog-elasticsearch. (Closes: #744951)
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 16 May 2014 22:37:05 +0200
+
 rsyslog (7.6.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 6118789..32a257b 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 8),
                libmysqlclient-dev,
                libpq-dev,
                libmongo-client-dev (>= 0.1.4),
+               libcurl4-gnutls-dev,
                libkrb5-dev,
                libgnutls-dev,
                librelp-dev (>= 1.2.5),
@@ -86,7 +87,7 @@ Depends: ${shlibs:Depends},
 Recommends: mysql-client
 Suggests: mysql-server
 Description: MySQL output plugin for rsyslog
- This plugin allows rsyslog to write the syslog messages into a MySQL database.
+ This plugin allows rsyslog to write syslog messages into a MySQL database.
 
 Package: rsyslog-pgsql
 Architecture: any
@@ -99,7 +100,7 @@ Depends: ${shlibs:Depends},
 Recommends: postgresql-client
 Suggests: postgresql
 Description: PostgreSQL output plugin for rsyslog
- This plugin allows rsyslog to write the syslog messages into a PostgreSQL
+ This plugin allows rsyslog to write syslog messages into a PostgreSQL
  database.
 
 Package: rsyslog-mongodb
@@ -110,9 +111,20 @@ Depends: ${shlibs:Depends},
          rsyslog (= ${binary:Version}),
 Recommends: mongodb-server
 Description: MongoDB output plugin for rsyslog
- This plugin allows rsyslog to write the syslog messages to MongoDB, a
+ This plugin allows rsyslog to write syslog messages to MongoDB, a
  scalable, high-performance, open source NoSQL database.
 
+Package: rsyslog-elasticsearch
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         rsyslog (= ${binary:Version}),
+Description: Elasticsearch output plugin for rsyslog
+ This plugin allows rsyslog to write syslog messages to Elasticsearch, a
+ distributed, multitenant-capable full-text search engine with a RESTful web
+ interface and schema-free JSON documents.
+
 Package: rsyslog-gssapi
 Architecture: any
 Priority: extra
diff --git a/debian/rsyslog-elasticsearch.install b/debian/rsyslog-elasticsearch.install
new file mode 100644
index 0000000..5173ef9
--- /dev/null
+++ b/debian/rsyslog-elasticsearch.install
@@ -0,0 +1 @@
+usr/lib/rsyslog/omelasticsearch.so
diff --git a/debian/rules b/debian/rules
index fae9033..3c94bd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ override_dh_auto_configure:
 		--enable-mysql \
 		--enable-pgsql \
 		--enable-ommongodb \
+		--enable-elasticsearch \
 		--enable-mail \
 		--enable-imfile \
 		--enable-impstats \