[SCM] icecast2/master: Merge remote-tracking branch 'origin/wheezy'

[fsateler at users.alioth.debian.org]

Update Spanish deconf translation. Closes: #686773
Team upload
Update Spanish deconf translation
Update Brazilian Portuguese deconf translation. Closes: #686716
Update Dutch deconf translation. Closes: #686659
Add Italian deconf translation. Closes: #686691
Update Czech deconf translation. Closes: #686607
Add Polish deconf translation. Closes: #686596
Update German deconf translation. Closes: #686591
Update Portuguese deconf translation. Closes: #686530
Update French translation
Update Swedish translation. Closes: #686444
Update Vietnamese deconf translation
Update Danish deconf translation. Closes: #686288
New Slovak deconf translation. Closes: #686280
Update Russian deconf translation. Closes: #686263
Update internal POT and PO files (debconf-updatepo)
Mark the first debconf template as translatable, closes: #686181
Add Brazilian Portuguese (pt_BR) localization. Closes: bug#652050. Thanks to Adriano Rafael Gomes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: dfc4fb33afc2a6af633c31de0c42e65c37dcef1f
X-Git-Newrev: 9142d0b19306ccb8e89b7b50db70171bbb49b190

The following commit has been merged in the master branch:
commit c546e6499998b8f30f8e76c73c7b9baa8b31ddec
Merge: dfc4fb33afc2a6af633c31de0c42e65c37dcef1f 07344d16197f23f364b077a03bb987155a9fbea4
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Feb 25 19:39:44 2014 -0300

    Merge remote-tracking branch 'origin/wheezy'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 67d8059,ad6e0ed..78053b2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,6 +1,26 @@@
 -icecast2 (2.3.2-9+deb7u1) wheezy; urgency=low
 +icecast2 (2.3.3-2) UNRELEASED; urgency=low
  
 -  * Team upload.
 +  [ Jonas Smedegaard ]
 +  * 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:
 +    + 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.
 +
 +  [ David Prévot ]
    * Mark the first debconf template as translatable. Closes: #686181
  
    [ Debconf translations ]
@@@ -36,38 -16,10 +36,38 @@@
    * Czech, Michal Simunek. Closes: #686607
    * Italian, Beatrice Torracca. Closes: #686691
    * Dutch, Jeroen Schot. Closes: #686659
-   * Brazilian Portuguese, Adriano Rafael Gomes. Closes: #686716
+   * Brazilian Portuguese, Adriano Rafael Gomes. Closes: #652050, #686716
    * Spanish, Javier Fernández-Sanguino. Closes: #686773
  
 - -- David Prévot <taffit at debian.org>  Tue, 04 Sep 2012 22:49:01 -0400
 + -- 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
  

-- 
icecast2 packaging