[Pkg-xmpp-commits] [jabberd2] 01/01: Merge changelog.

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas pushed a commit to branch jessie-backports
in repository jabberd2.

commit f9e839d299260b2ca2a3fd725462a685ea4e85fa
Merge: 6126fe1 c89fda3
Author: Simon Josefsson <simon at josefsson.org>
Date:   Mon May 11 12:24:38 2015 +0200

    Merge changelog.

 debian/changelog                             | 20 +++++++++++++
 debian/control                               |  4 +--
 debian/patches/clang_FTBFS_Wreturn-type.diff | 42 ----------------------------
 debian/patches/series                        |  1 -
 debian/rules                                 |  1 -
 debian/watch                                 |  2 +-
 6 files changed, 23 insertions(+), 47 deletions(-)

diff --cc debian/changelog
index 804285d,2e49c81..e2bc29e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,29 @@@
++jabberd2 (2.3.3-2~bpo8+1) jessie-backports; urgency=medium
++
++  * Rebuild for jessie-backports.
++
++ -- Simon Josefsson <simon at josefsson.org>  Mon, 11 May 2015 12:23:46 +0200
++
+ jabberd2 (2.3.3-2) unstable; urgency=low
+ 
+   [ Simon Josefsson ]
+   * Drop obsolete --with-sasl from debian/rules.
+   * Bump dependency on gsasl to 1.4.0, needed by configure.ac.
+   * Build-depend on check to get self-tests.
+   * Fix watch file.
+ 
+   [ Willem van den Akker ]
+   * debian/patches/clang_FTBFS_Wreturn-type.diff: Drop patch (Thanks
+     to Nicolas Sévelin-Radiguet).  Closes: #742748.
+ 
+  -- Simon Josefsson <simon at josefsson.org>  Wed, 29 Apr 2015 16:41:27 +0200
+ 
 +jabberd2 (2.3.3-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Simon Josefsson <simon at josefsson.org>  Wed, 29 Apr 2015 17:31:59 +0200
 +
  jabberd2 (2.3.3-1) unstable; urgency=low
  
    [ Simon Josefsson ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xmpp/jabberd2.git