[SCM] icecast2/master: Update changelog, adapting to 2.3.3-1 release from wheezy branch.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bda92cdee4b4c7df4741e782df347e697ee675b2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jul 23 10:58:51 2012 +0200

    Update changelog, adapting to 2.3.3-1 release from wheezy branch.

diff --git a/debian/changelog b/debian/changelog
index f9b1e56..cb83baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,56 @@
-icecast2 (2.3.3-1) UNRELEASED; urgency=low
+icecast2 (2.3.3-2) UNRELEASED; urgency=low
 
   * New upstream source.
 
-  * Setup git-import-orig to filter out debian subdir.
-  * Drop patches 1002 and 1003, applied upstream.
-  * Unfuzz patch 1001, and add DEP3 header.
+  * Add DEP3 header to patch 1001.
   * Remove debian/source/local-options: abort-on-upstream-changes and
     unapply-patches are default in dpkg-source since 1.16.1.
   * Drop obsolete NEWS file: Latest news more than 8 years ago.
-  * Modernize CDBS usage: Drop locally shipped snippets. Reorganize CDBS
-    usage in rules file. Drop obsolete README.cdbs-tweaks.
-  * Extend copyright years for packaging, and add proper licensing header
-    to rules file.
+  * Modernize CDBS usage:
+    + Re-enable upstream tarball handling and copyright-check.
+    + Drop unused local snippets.
+    + Reorganize CDBS usage in rules file.
+    + Drop obsolete README.cdbs-tweaks.
+  * Extend copyright years for packaging, and add proper licensing
+    header to rules file.
   * Rewrite copyright file, using DEP5 format.
   * Bump standards-version to 3.9.3.
   * Bump autotools to match versions used upstream.
   * suppress copyright-check of some images.
   * Put aside autogenerated files during build, and regenerate most
     possible of them.
+    Closes: bug#653401. Thanks to Peter Eisentraut.
 
  -- Jonas Smedegaard <dr at jones.dk>  Wed, 13 Jun 2012 02:21:01 +0200
 
+icecast2 (2.3.3-1) unstable; urgency=low
+
+  [ upstream ]
+  * New upstream bugfix release.
+    + Allow the source password to be undefined. This is to avoid
+      falling back to a default password which would be a security
+      problem. Fixing #1846
+    + Applied justdave's patches, fixing #1717 and #1718. HTTPS now with
+      better security and support for chained certificates.
+    + trunk/icecast/conf/icecast_minimal.xml.in: Updated <alias> to use
+      destination="" not dest="". The old dest="" attribute is still
+      supported.
+    + Added 'admin' and 'location' to default config, thus fixing #1839.
+    + Added VCLT playlist support.
+    Closes: bug#652663, which fixes CVE-2011-4612.
+
+  [ Jonas Smedegaard ]
+  * Setup git-import-orig to filter out debian subdir.
+  * Drop patches 1002 and 1003, applied upstream.
+  * Unfuzz patch 1001.
+  * Avoid locally shipped CDBS snippets (but keep them included with
+    source to minimize diff for freeze-exception inspection).
+  * Add Brazilian Portuguese (pt_BR) localization.
+    Closes: bug#652050. Thanks to Adriano Rafael Gomes.
+  * Setup git-buildpackage to use wheezy branch.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Mon, 23 Jul 2012 10:31:34 +0200
+
 icecast2 (2.3.2-9) unstable; urgency=medium
 
   * Team upload.

-- 
icecast2 packaging