[SCM] gmerlin-encoders/master.ubuntu: Merge branch 'master' into master.ubuntu, Ubuntu remaining changes:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Jun 12 10:10:52 UTC 2012 

Finalize
Regenerate debian/control.
Provides: gmerlin-encoders
Finalize
Update gmerlin-encoders-good.install.
Regenerate debian/control
Oops, s/Depends/Pre-Depends/ (where necessary)
Finalize changelog.
Introduce Multi-Arch support.
wrap-and-sort -a -s
Update Vcs tags.
Update debian/copyright, group files by license.
Generated changelog
Simplified patch
Regenerated
Made it compile with libav/ffmpeg found in debian
Updated copyright using final DEP-5 format
Bumped standard to 3.9.3
Needs gmerlin>=1.2.0~
Removed obsolete patches
Refreshed patches
Merge tag 'upstream/1.2.0'
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: 339b6eff20d1acebfb9ec7229f297039c0d3d0c0
X-Git-Newrev: 43c2adc3ab3f8cc0eeda5084501d3756dbf96048

The following commit has been merged in the master.ubuntu branch:
commit 43c2adc3ab3f8cc0eeda5084501d3756dbf96048
Merge: 9ae7df8990078633d3939756da463e719bb46a32 8af3baaddde0ebb6c41c127245a97c60c6d0834a
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jun 12 12:10:04 2012 +0200

    Merge branch 'master' into master.ubuntu, Ubuntu remaining changes:
    
    - Build-depend on libmjpegtools-dev.
    - Provide gmerlin-encoders-extra

diff --combined debian/changelog
index ccdb939,f4daddf..1ad00b2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,29 +1,37 @@@
+ gmerlin-encoders (1.2.0-2) unstable; urgency=low
+ 
+   * Provides: gmerlin-encoders
+     gmerlin suggests gmerlin-encoders, but this virtual package is
+     not provided by anyone (yet)
+ 
+  -- IOhannes m zmölnig <zmoelnig at iem.at>  Tue, 12 Jun 2012 11:31:03 +0200
+ 
+ gmerlin-encoders (1.2.0-1) unstable; urgency=low
+ 
+   [ IOhannes m zmölnig ]
+   * Imported Upstream version 1.2.0.
+   * Bumped standard to 3.9.3.
+   * Needs gmerlin>=1.2.0~.
+   * Refreshed patches.
+   * Removed obsolete patches.
+   * Updated copyright using final DEP-5 format.
+   * Fixed build-issue with older libav/ffmpeg version.
+ 
+   [ Alessio Treglia ]
+   * Introduce Multi-Arch support.
+   * Update debian/copyright, group files by license.
+   * Update Vcs tags.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Mon, 11 Jun 2012 19:51:45 +0200
+ 
 +gmerlin-encoders (1.0.0-4ubuntu1) precise; urgency=low
 +
 +  * Merge with Debian unstable, remaining changes:
 +    - Build-depend on libmjpegtools-dev.
 +    - Provide gmerlin-encoders-extra
 +
 + -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 31 Dec 2011 14:05:14 +0100
 +
  gmerlin-encoders (1.0.0-4) unstable; urgency=low
  
    * Update for FFmpeg -> libav (Closes: #638556)
@@@ -13,17 -31,6 +39,17 @@@
  
   -- 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.
@@@ -38,14 -45,6 +64,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 0567d18,8f7ab79..eaa3822
--- a/debian/control
+++ b/debian/control
@@@ -1,40 -1,45 +1,48 @@@
  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>,
+ 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~),
+ Standards-Version: 3.9.3
+ Build-Depends:
   autotools-dev,
   gnulib,
-  debhelper,
-  dh-buildinfo,
+  cdbs (>= 0.4.85~),
+  debhelper (>= 9~),
   devscripts,
-  libgavl-dev (>= 1.2.0),
-  libgmerlin-dev (>= 1.0.0~),
+  libavcodec-dev,
+  libavformat-dev,
   libflac-dev,
+  libgavl-dev (>= 1.2.0),
+  libgmerlin-dev (>= 1.2.0~),
++ libmjpegtools-dev,
+  libmp3lame-dev,
   libogg-dev,
-  libvorbis-dev,
+  libpostproc-dev,
+  libshout3-dev,
++ libshout3-dev
 + libtheora-dev,
   libspeex-dev,
-  libmp3lame-dev,
-  libavcodec-dev,
-  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
 - 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
+ Provides:
+  germlin-encoders
+ Multi-Arch: same
+ Pre-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
@@@ -47,11 -52,15 +55,19 @@@
  
  Package: gmerlin-encoders-good
  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
+ Depends:
+  ${misc:Depends},
+  ${shlibs:Depends}
++Breaks:
++ gmerlin-encoders-extra (<< 1.0.0-3)
++Replaces:
++ gmerlin-encoders-extra (<< 1.0.0-3)
+ Enhances:
+  gmerlin
+ Provides:
+  germlin-encoders
+ Multi-Arch: same
+ Pre-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
@@@ -61,18 -70,3 +77,24 @@@
   .
   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
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
++Provides:
++ gmerlin-encoders
++Enhances:
++ gmerlin
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
 +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 9b01a91,bfa6caa..6d564ac
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,35 -1,41 +1,44 @@@
  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>,
+ 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@,
-  libgavl-dev (>= 1.2.0),
-  libgmerlin-dev (>= 1.0.0~),
+ Standards-Version: 3.9.3
+ Build-Depends:
+  @cdbs@,
+  libavcodec-dev,
+  libavformat-dev,
   libflac-dev,
+  libgavl-dev (>= 1.2.0),
+  libgmerlin-dev (>= 1.2.0~),
++ libmjpegtools-dev,
+  libmp3lame-dev,
   libogg-dev,
-  libvorbis-dev,
+  libpostproc-dev,
+  libshout3-dev,
++ libshout3-dev
 + libtheora-dev,
   libspeex-dev,
-  libmp3lame-dev,
-  libavcodec-dev,
-  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
 - 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
+ Provides:
+  germlin-encoders
+ Multi-Arch: same
+ Pre-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
@@@ -42,11 -48,15 +51,19 @@@
  
  Package: gmerlin-encoders-good
  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
+ Depends:
+  ${misc:Depends},
+  ${shlibs:Depends}
++Breaks:
++ gmerlin-encoders-extra (<< 1.0.0-3)
++Replaces:
++ gmerlin-encoders-extra (<< 1.0.0-3)
+ Enhances:
+  gmerlin
+ Provides:
+  germlin-encoders
+ Multi-Arch: same
+ Pre-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
@@@ -56,18 -66,3 +73,24 @@@
   .
   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
++Depends:
++ ${misc:Depends},
++ ${shlibs:Depends}
++Provides:
++ gmerlin-encoders
++Enhances:
++ gmerlin
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
 +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

More information about the pkg-multimedia-commits mailing list