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

[W. van den Akker]

The following commit has been merged in the master branch:
commit 53b655146f3185867d5413d7579a957ff4953681
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Fri May 17 21:46:22 2013 +0200

    Clean up and merge entries in the debian/changelog file. Move closed tages to last entry.

diff --git a/debian/changelog b/debian/changelog
index a17ff04..d8ea8e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,49 +1,46 @@
-jabberd2 (2.2.17-3) UNRELEASED; urgency=low
+jabberd2 (2.2.17-3) unstable; urgency=low
 
+  * New upstream version (Closes: #637112, #547767).
+  * New version patches user security hole (Closes: #685666).
+  * debian/init: added Should-Start/Should-Stop dependency for MySQL
+    (Closes: #673243).
+  * debian/watch: updated URL (Closes: #543415).
+  * debian/dirs, debian/postinst: removed /var/run/jabber2 (Closes: #689538).
+  * debian/component.d: removed 20resolver. Resolver is not included anymore
+    (Closes: #689539).
+  * Added myself to uploaders list (Closes: #589304).
   * debian/init, debian/component.d/*: Make less bashish.
   * debian/control: Remove inactive uploaders from list.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Fri, 17 May 2013 21:17:31 +0200
 
-jabberd2 (2.2.17-2) unstable; urgency=low
+jabberd2 (2.2.17-2) UNRELEASED; urgency=low
 
-  * Corrected typo in changelog.
   * debian/prerm: removed because not needed.
   * debian/control: moved adduser from Depends to Pre-Depends.
   * debian/copyright: new format, updated maintainer information.
-  * debian/control: modified the VCS-Browser field (removed ;a=summary).
   * 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) unstable; urgency=low
+jabberd2 (2.2.17-1) UNRELEASED; urgency=low
 
-  * New upstream version (Closes: #637112, #547767).
-  * New version patches user security hole (Closes: #685666).
   * Removed CVE-2011-1755.dpatch. Is now included in upstream source.
   * Removed implicit-pointer-conversion.dpatch. Is now included in 
     upstream source.
   * debian/control: changed homepage URL.
   * debian/control: changed debhelper dependency to >= 9.0.0.
   * debian/control: added ${misc:Depends} to binairy packages.
-  * debian/control: replaced dpatch with quilt in build dependecies.
   * debian/control: added Vcs-git and Vcs-Browser tags.
   * debian/control: added hardening-includes to dependecies.
   * debian/init: added Description tag.
   * debian/init, debian/component.d/*: added status option.
-  * debian/init: added Should-Start/Should-Stop dependency for MySQL
-    (Closes: #673243).
   * debian/init, debian/default: removed resolver entries.
   * debian/rules: removed unrecognized enable-sasl and disable-rpath 
-    options.
+    options and added --with-sasl=gsasl option to configure.
   * debian/rules: include hardening options.
   * debian/rules: added build-arch, build-indep.
-  * debian/rules: replaced line dpatch.make with quilt.make
-    Now quilt 3.0 compatible. Converted dpatch patches to quilt.
-  * debian/watch: updated URL (Closes: #543415).
-  * debian/dirs, debian/postinst: removed /var/run/jabber2 (Closes: #689538).
-  * debian/component.d: removed 20resolver. Resolver is not included anymore
-    (Closes: #689539).
+  * Now quilt 3.0 compatible. 
   * debian/preinst, debian/postrm: removed resolver entries.
   * debian/lintian-overrides: overrides false positives.
   * Added patches man_hypen.diff, sm_typo.diff and usr_etc.diff.
@@ -51,8 +48,6 @@ jabberd2 (2.2.17-1) unstable; urgency=low
     debian/rules: remove 'rm config.guess and config.sub'.
   * Bumped up Standards Version to 3.9.4.
   * Bumped up debhelper to 9.
-  * Added myself to uploaders list (Closes: #589304).
-  * Changed from UNRELEASED to unstable.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Wed, 16 Jan 2013 10:00:41 +0100
 

-- 
Jabberd2 XMPP server