10 files changed, 58 insertions, 39 deletions
diff --git a/debian/changelog b/debian/changelog
index 795e477..2819111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+rsyslog (8.2.2-1) experimental; urgency=medium
+
+  * New major upstream release.
+    - Rewritten core engine providing higher performance and better
+      scalability with complex configurations.
+    - Simplified script execution.
+    - Global variable support.
+    - Output part was revamped completely and required changes to all output
+      modules.
+    - Support for external plugins which can be written in any language.
+  * Switch watch file to track v8 stable branch.
+  * Update Build-Depends:
+    - Bump librelp-dev to (>= 1.2.5).
+    - Bump liblogging-stdlog-dev to (>= 1.0.3).
+    - Bump liblognorm-dev to (>= 1.0.0).
+    - 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.
+  * Fix pidfile location. The pidfile should be stored in /var/run, not /etc.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 09 Jun 2014 21:16:19 +0200
+
 rsyslog (7.6.3-3) unstable; urgency=medium
 
   * Build against libgnutls28-dev. (Closes: #752304)
diff --git a/debian/control b/debian/control
index f3dade7..1eb7f6c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,8 @@ Build-Depends: debhelper (>= 8),
                libgnutls28-dev,
                librelp-dev (>= 1.2.5),
                libestr-dev (>= 0.1.9),
-               libee-dev (>= 0.4.0),
-               liblognorm-dev (>= 0.3.1),
-               liblognorm-dev (<< 1.0.0),
-               liblogging-stdlog-dev (>= 1.0.1),
+               liblognorm-dev (>= 1.0.0),
+               liblogging-stdlog-dev (>= 1.0.3),
                libjson-c-dev,
                uuid-dev,
                pkg-config,
@@ -62,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/gbp.conf b/debian/gbp.conf
index c31be83..32f2a1f 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = master
+debian-branch = experimental
diff --git a/debian/patches/0002-Fix-pidfile-location.patch b/debian/patches/0002-Fix-pidfile-location.patch
new file mode 100644
index 0000000..d7c4a0b
--- /dev/null
+++ b/debian/patches/0002-Fix-pidfile-location.patch
@@ -0,0 +1,29 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Mon, 9 Jun 2014 19:11:33 +0200
+Subject: Fix pidfile location
+
+https://github.com/rsyslog/rsyslog/issues/86
+---
+ tools/syslogd.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/tools/syslogd.c b/tools/syslogd.c
+index ec0beb7..857512b 100644
+--- a/tools/syslogd.c
++++ b/tools/syslogd.c
+@@ -134,13 +134,8 @@ void rsyslogdDebugSwitch();
+ void rsyslogdDoDie(int sig);
+ 
+ 
+-#if defined(SYSLOGD_PIDNAME)
+-#	undef _PATH_LOGPID
+-#	define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME
+-#else
+-#	ifndef _PATH_LOGPID
+-#		define _PATH_LOGPID "/etc/rsyslogd.pid"
+-#	endif
++#ifndef _PATH_LOGPID
++#	define _PATH_LOGPID "/var/run/rsyslogd.pid"
+ #endif
+ 
+ #ifndef _PATH_TTY
diff --git a/debian/patches/series b/debian/patches/series
index a8e093a..d09b668 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Don-t-create-a-database.patch
+0002-Fix-pidfile-location.patch
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/rsyslog.install b/debian/rsyslog.install
index e19143c..b07655d 100644
--- a/debian/rsyslog.install
+++ b/debian/rsyslog.install
@@ -26,6 +26,5 @@ usr/lib/rsyslog/mmsequence.so
 usr/lib/rsyslog/ommail.so
 usr/lib/rsyslog/omprog.so
 usr/lib/rsyslog/omuxsock.so
-usr/lib/rsyslog/omruleset.so
 usr/lib/rsyslog/pm*.so
 lib/systemd/system/rsyslog.service
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
diff --git a/debian/watch b/debian/watch
index 362d6f4..dd306eb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://rsyslog.com/downloads/download-v7-stable/ .*/rsyslog-(.*)\.tar\.gz
+http://rsyslog.com/downloads/download-v8-stable/ .*/rsyslog-([\d\.]*)\.tar\.gz