[SCM] libshout/master: Update changelog and control file.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e2ce0edf306649bee1ba3cb68a3ff48efe94e94
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Dec 8 09:40:40 2011 +0700

    Update changelog and control file.

diff --git a/debian/changelog b/debian/changelog
index 14e5f9a..14393c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+libshout (2.2.2-7) UNRELEASED; urgency=low
+
+  * Modernize CDBS:
+    + Drop local snippets: Now upstream.
+    + Suppress optional snippets to ease backporting.
+    + Declare build-dependencies recursively expanded (using = not := ).
+    + Stop build-dependency tidying (done upstream now).
+  * Update package relations:
+    + Relax to build-depend unversioned when satisfied even in
+      oldstable:
+      - cdbs
+      - debhelper
+      - libogg-dev
+      - libvorbis-dev
+      - libtheora-dev
+      - d-shlibs
+    + Drop obsolete/superfluous build-dependencies:
+      - devscripts
+      - quilt
+      - patchutils
+  * Stop cleanup of debian subdir: superfluous with source format 3.0.
+  * Improve d-shlibs handling:
+    + Add local ld1-dev quirk (duplicating recent upstream quirk, to
+      ease backporting).
+      Closes: bug#650546. Thanks to Samuel Thibault.
+    + Stop using local hacked copy (libspeex1-dev quirk now upstream).
+    + Drop superfluously invoking d-devlibdeps (done implicitly by
+      d-shlibmove).
+    + Tighten rules to ensure invoked only once.
+  * Bump debhelper compatilibity level to 7.
+  * Drop dpkg local-options hints from packaging source: now defaults.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Thu, 08 Dec 2011 09:25:08 +0700
+
 libshout (2.2.2-6) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index cd6c641..f1b69db 100644
--- a/debian/control
+++ b/debian/control
@@ -6,19 +6,16 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
  Guillaume Pellerin <yomguy at altern.org>,
  Romain Beauxis <toots at rastageeks.org>,
  Ying-Chun Liu <grandpaul at gmail.com>
-Build-Depends: cdbs (>= 0.4.39),
+Build-Depends: cdbs,
  autotools-dev,
- devscripts (>= 2.10.7),
- quilt,
- patchutils (>= 0.2.25),
- debhelper (>= 6),
+ debhelper,
  dh-buildinfo,
- libogg-dev (>> 1.0.0),
- libvorbis-dev (>> 1.0.0),
+ libogg-dev,
+ libvorbis-dev,
  pkg-config,
- libtheora-dev (>> 0.0.0.alpha4),
+ libtheora-dev,
  libspeex-dev,
- d-shlibs (>= 0.18)
+ d-shlibs
 Vcs-Git: git://git.debian.org/pkg-multimedia/libshout.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libshout.git
 Standards-Version: 3.9.1

-- 
libshout packaging