[SCM] gmerlin-encoders/master.ubuntu: Merge branch 'master' into master.ubuntu

[alessio at users.alioth.debian.org]

Finalize
Bump Standards.
Install LAME encoder.
Build-Depends on libmp3lame-dev.
Upload to unstable.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: d7bdda5abae9fb61467d5068821a5d89483a97e0
X-Git-Newrev: f856409da8d6121eaeb15190cce9d7d68bd73296

The following commit has been merged in the master.ubuntu branch:
commit f856409da8d6121eaeb15190cce9d7d68bd73296
Merge: d7bdda5abae9fb61467d5068821a5d89483a97e0 5a55c29069da3c71d6f7841899f77454a7a8d03a
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 30 10:48:57 2011 +0200

    Merge branch 'master' into master.ubuntu
    
    Solved conflicts:
    	debian/changelog

diff --combined debian/changelog
index b9edc64,3e3fafa..a2fe520
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,25 @@@
+ gmerlin-encoders (1.0.0-3) unstable; urgency=low
+ 
+   * Build-Depends on libmp3lame-dev.
+   * Install LAME encoder.
+   * Bump Standards.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Sat, 30 Jul 2011 10:38:02 +0200
+ 
  gmerlin-encoders (1.0.0-2) unstable; urgency=low
  
    * Upload to unstable.
  
   -- Alessio Treglia <alessio at debian.org>  Thu, 10 Feb 2011 09:23:50 +0100
  
 +gmerlin-encoders (1.0.0-1ubuntu1) natty; urgency=low
 +
 +  * Update gbp config.
 +  * Create gmerlin-encoders-extra to provide non-free encoders,
 +    build-depend on libmp3lame-dev,libmjpegtools-dev.
 +
 + -- Alessio Treglia <quadrispro at ubuntu.com>  Wed, 26 Jan 2011 10:03:03 +0100
 +
  gmerlin-encoders (1.0.0-1) experimental; urgency=low
  
    * Initial release. (Closes: #610164)
diff --combined debian/control
index db71bdd,90c0207..183af65
--- a/debian/control
+++ b/debian/control
@@@ -1,12 -1,11 +1,12 @@@
  Source: gmerlin-encoders
  Section: libs
  Priority: extra
 -Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-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>
  Homepage: http://gmerlin.sourceforge.net/
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
  Build-Depends: cdbs (>= 0.4.70~),
   autotools-dev,
   gnulib,
@@@ -20,12 -19,11 +20,13 @@@
   libvorbis-dev,
   libtheora-dev,
   libspeex-dev,
+  libmp3lame-dev,
   libavcodec-dev,
   libavformat-dev,
   libpostproc-dev,
   libswscale-dev,
 + libmp3lame-dev,
 + libmjpegtools-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
@@@ -59,18 -57,3 +60,18 @@@ Description: patent-free encoders for G
   .
   This package includes the "good" set of Gmerlin's plugins, which
   contains only non-proprietary and patent-free encoders.
 +
 +Package: gmerlin-encoders-extra
 +Architecture: any
 +Depends: ${shlibs:Depends},
 + ${misc:Depends}
 +Enhances: gmerlin
 +Description: non-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
 + handles even large media collections gracefully. Hardware devices appear
 + also in the tree so you can open Audio-CDs, (S)VCDs, DVDs and
 + DVB-broadcasts.
 + .
 + This package includes the "extra" set of Gmerlin's plugins, which
 + contains non-free encoders.

-- 
gmerlin-encoders packaging