[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-42-g5085177

[W. van den Akker]

The following commit has been merged in the master branch:
commit 50851773561ed73636c33721714f8574f55af502
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Thu Jul 25 22:55:05 2013 +0200

    Combine changelog entries for release.

diff --git a/debian/changelog b/debian/changelog
index c6dc34f..5d34c49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jabberd2 (2.2.17-3) unstable; urgency=low
+jabberd2 (2.2.17-1) unstable; urgency=low
 
   * New upstream version (Closes: #637112, #547767).
   * New version patches user security hole (Closes: #685666).
@@ -18,20 +18,10 @@ jabberd2 (2.2.17-3) unstable; urgency=low
     + debian/control: remove hardening-includes.
     + debian/lintianoverride: added *-has-useless-call-to-ldconfig.
   * debian/TODO: updated.
-
- -- Willem van den Akker <wvdakker at wilsoft.nl>  Fri, 17 May 2013 21:17:31 +0200
-
-jabberd2 (2.2.17-2) UNRELEASED; urgency=low
-
   * debian/prerm: removed because not needed.
   * debian/control: moved adduser from Depends to Pre-Depends.
   * debian/copyright: new format, updated maintainer information.
   * debian/TODO: added file.
-
- -- Willem van den Akker <wvdakker at wilsoft.nl>  Tue, 07 May 2013 21:34:22 +0200
-
-jabberd2 (2.2.17-1) UNRELEASED; urgency=low
-
   * Removed CVE-2011-1755.dpatch. Is now included in upstream source.
   * Removed implicit-pointer-conversion.dpatch. Is now included in 
     upstream source.

-- 
Jabberd2 XMPP server