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

Sat Dec 31 12:58:21 UTC 2011

Regenerate
Add libmp3lame-dev to Build-Depends
Update
Bump Standards.
Finalize changelog.
Update for FFmpeg -> libav (Closes: #638556)
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: 3e1d168eb38d8303a2ac773a4712752e9f1f252b
X-Git-Newrev: 6df7c44f1c259f5147f34ff692f0e6f172389b1b

The following commit has been merged in the master.ubuntu branch:
commit 6df7c44f1c259f5147f34ff692f0e6f172389b1b
Merge: 3e1d168eb38d8303a2ac773a4712752e9f1f252b 270ed9ef283afc25ba144fc7ff8f2558cdc0486c
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 31 13:58:13 2011 +0100

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

diff --combined debian/changelog
index 44ccc75,2c48e86..2d15f00

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,10 +1,21 @@@
+ gmerlin-encoders (1.0.0-4) unstable; urgency=low
+ 
+   * Update for FFmpeg -> libav (Closes: #638556)
+   * Bump Standards.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Sat, 03 Sep 2011 10:18:18 +0200
+ 
 +gmerlin-encoders (1.0.0-3ubuntu1) oneiric; urgency=low
 +
 +  * Merge with Debian unstable:
 +    - LAME encoder is now provided by gmerlin-encoders-good.
 +    - Remaining changes:
 +      + Build-Depends on libmjpegtool-dev.
 +      + Add gmerlin-encoders-extra to provide more non-free encoders.
 +      + Take patch from upstream SVN trunk to fix FTBFS with libav.
 +
 + -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 30 Jul 2011 11:22:04 +0200
 +
  gmerlin-encoders (1.0.0-3) unstable; urgency=low
  
    * Build-Depends on libmp3lame-dev.
@@@ -23,14 -19,6 +30,14 @@@ gmerlin-encoders (1.0.0-2) unstable; ur
  
   -- 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 0d49d7b,0318c22..1abb556
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,14 +1,15 @@@
  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.2
- Build-Depends: cdbs (>= 0.4.70~),
-  autotools-dev,
+ Build-Depends: autotools-dev,
   gnulib,
+  cdbs (>= 0.4.85~),
   debhelper (>= 7.0.1),
   dh-buildinfo,
   devscripts (>= 2.10.7~),
@@@ -25,7 -24,6 +25,7 @@@
   libavformat-dev,
   libpostproc-dev,
   libswscale-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
@@@ -49,8 -47,6 +49,8 @@@ Package: gmerlin-encoders-goo
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
 +Breaks: gmerlin-encoders-extra (<< 1.0.0-3)
 +Replaces: gmerlin-encoders-extra (<< 1.0.0-3)
  Enhances: gmerlin
  Description: patent-free encoders for Gmerlin
   Gmerlin is a multiformat media player with tree-like virtual directory
@@@ -61,18 -57,3 +61,18 @@@
   .
   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.
diff --combined debian/control.in
index f78ea0e,6e78bb3..a3a4212
--- a/debian/control.in
+++ b/debian/control.in
@@@ -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@,
   libgavl-dev (>= 1.2.0),
   libgmerlin-dev (>= 1.0.0~),
@@@ -15,12 -14,11 +15,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
@@@ -54,18 -52,3 +55,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

