[SCM] libshout/master: Prepare for release: Update changelog, control file and copyright hints.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 288a3f4b2b304886ad4e6f996f2396fa44b96b08
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jun 5 16:38:56 2012 +0200

    Prepare for release: Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 39528c5..d2b6a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libshout (2.3.1-1) experimental; urgency=low
+
+  * New upstream release.
+    + Opus support.
+
+  * Build-depend on libopus-dev.
+  * Thanks to Ron Lee for coordinating this release.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Tue, 05 Jun 2012 16:37:38 +0200
+
 libshout (2.3.0-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index bdd9a12..c960565 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: cdbs,
  pkg-config,
  libtheora-dev,
  libspeex-dev,
+ libopus-dev,
  d-shlibs (>= 0.48)
 Vcs-Git: git://git.debian.org/pkg-multimedia/libshout.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libshout.git
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 4c217c7..477df00 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -17,7 +17,6 @@ Files: INSTALL
  debian/gbp.conf
  debian/libshout3-dev.install
  debian/patches/1001_upstream_is_not_debian.patch
- debian/patches/1002_link_against_libspeex.patch
  debian/patches/1003_fix_pkg-config_requires.patch
  debian/patches/README
  debian/patches/series
@@ -128,7 +127,7 @@ Copyright: 1991, Free Software Foundation, Inc
   interest in the
   law: that is to say, a work containing the Library or a
   notices, you must include the
-License: LGPL-2+
+License: LGPL-ever
  FIXME
 
 Files: config.guess
@@ -229,6 +228,12 @@ Copyright: 2002-2003, the Icecast team <team at icecast.org>
 License: LGPL-2+
  FIXME
 
+Files: src/opus.c
+Copyright: 2005, the Icecast team <team at icecast.org>
+  2011-2012, Xiph.Org Foundation
+License: LGPL-2+
+ FIXME
+
 Files: src/net/sock.c
 Copyright: 1999, the icecast team
 License: LGPL-2+

-- 
libshout packaging