[SCM] gmerlin-encoders/master: Prepare for release: Update changelog and control files.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bd2a23904c490a016d2cf557adff9bfdf6ce6d8a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jul 18 16:29:40 2012 +0200

    Prepare for release: Update changelog and control files.

diff --git a/debian/changelog b/debian/changelog
index f4daddf..d864e54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+gmerlin-encoders (1.2.0-3) unstable; urgency=low
+
+  * Add myself as uploader.
+  * Fix provide gmerlin-encoders (not bogus germlin-encoders).
+  * Relax to build unversioned on cdbs: Needed version satisfied in
+    stable, and oldstable no longer supported.
+  * Build-depend on dh-buildinfo, enabling copyright-check during build.
+  * Update copyright file:
+    + Fix use pseudo-comment-in-license field for non-verbatim parts of
+      License sections: File format 1.0 mandates License field to either
+      be single-line or include all licensing info.
+    + Fix use double-indent in Copyright fields as per Policy §5.6.13.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Wed, 18 Jul 2012 16:28:10 +0200
+
 gmerlin-encoders (1.2.0-2) unstable; urgency=low
 
   * Provides: gmerlin-encoders
diff --git a/debian/control b/debian/control
index 8f7ab79..65976ee 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,16 @@ Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders:
  Alessio Treglia <alessio at debian.org>,
- IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>
+ IOhannes m zmoelnig (gpg-key at iem) <zmoelnig at iem.at>,
+ Jonas Smedegaard <dr at jones.dk>
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.3
 Build-Depends:
+ cdbs,
  autotools-dev,
  gnulib,
- cdbs (>= 0.4.85~),
  debhelper (>= 9~),
+ dh-buildinfo,
  devscripts,
  libavcodec-dev,
  libavformat-dev,
@@ -37,7 +39,7 @@ Depends:
 Enhances:
  gmerlin
 Provides:
- germlin-encoders
+ gmerlin-encoders
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: ffmpeg encoders for Gmerlin
@@ -58,7 +60,7 @@ Depends:
 Enhances:
  gmerlin
 Provides:
- germlin-encoders
+ gmerlin-encoders
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: patent-free encoders for Gmerlin

-- 
gmerlin-encoders packaging