[SCM] gmerlin-encoders/master: Finalize changelog.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 27f4fa66258f95de575000965d9b43c0121288d8
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 19:48:43 2012 +0200

    Finalize changelog.

diff --git a/debian/control b/debian/control
index 12e1378..4740a58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,37 +2,42 @@ Source: gmerlin-encoders
 Section: libs
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio at debian.org>,
+Uploaders:
+ Alessio Treglia <alessio at debian.org>,
  IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.3
-Build-Depends: cdbs (>= 0.4.70~),
+Build-Depends:
  autotools-dev,
  gnulib,
- debhelper,
- dh-buildinfo,
+ cdbs (>= 0.4.85~),
+ debhelper (>= 9~),
  devscripts,
+ libavcodec-dev,
+ libavformat-dev,
+ libflac-dev,
  libgavl-dev (>= 1.2.0),
  libgmerlin-dev (>= 1.2.0~),
- libflac-dev,
- libogg-dev,
- libvorbis-dev,
- libtheora-dev,
- libspeex-dev,
  libmp3lame-dev,
- libavcodec-dev,
- libavformat-dev,
+ libogg-dev,
  libpostproc-dev,
+ libshout3-dev,
+ libspeex-dev,
  libswscale-dev,
- libshout3-dev
-Vcs-Git: git://git.debian.org/pkg-multimedia/gmerlin-encoders.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gmerlin-encoders.git
+ libtheora-dev,
+ libvorbis-dev
+Vcs-Git: git://anonscm.debian.org/pkg-multimedia/gmerlin-encoders.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/gmerlin-encoders.git
 
 Package: gmerlin-encoders-ffmpeg
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Enhances: gmerlin
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Enhances:
+ gmerlin
+Multi-Arch: same
+Depends: ${misc:Pre-Depends}
 Description: ffmpeg encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -45,9 +50,13 @@ Description: ffmpeg encoders for Gmerlin
 
 Package: gmerlin-encoders-good
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Enhances: gmerlin
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Enhances:
+ gmerlin
+Multi-Arch: same
+Depends: ${misc:Pre-Depends}
 Description: patent-free encoders for Gmerlin
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It

-- 
gmerlin-encoders packaging