Merge branch 'master' into experimental

Conflicts:
	debian/changelog

2 files changed, 10 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 1282f17..2819111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,13 @@ rsyslog (8.2.2-1) experimental; urgency=medium
 
  -- 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)
+  * Use canonical URIs for Vcs-* fields.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 23 Jun 2014 13:44:55 +0200
+
 rsyslog (7.6.3-2) unstable; urgency=medium
 
   * Update Build-Depends:
diff --git a/debian/control b/debian/control
index d680bad..1eb7f6c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 8),
                libmongo-client-dev (>= 0.1.4),
                libcurl4-gnutls-dev,
                libkrb5-dev,
-               libgnutls-dev,
+               libgnutls28-dev,
                librelp-dev (>= 1.2.5),
                libestr-dev (>= 0.1.9),
                liblognorm-dev (>= 1.0.0),
@@ -22,8 +22,8 @@ Build-Depends: debhelper (>= 8),
                pkg-config,
                bison
 Standards-Version: 3.9.5
-Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/rsyslog.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/rsyslog.git;a=summary
 Homepage: http://www.rsyslog.com/
 
 Package: rsyslog