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

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Oct 10 00:54:53 UTC 2012 

Multiarchify gmerlin-encoders-extra stuff
Release to quantal.
New changelog entry.
Regenerate
wrap-and-sort
Regenerate debian/control.
Clean-up build-depends field.
Merge branch 'master' into master.ubuntu, Ubuntu remaining changes:
Merge branch 'upstream' into master.ubuntu
Finalize changelog.
Re-gen debian/control
Remove duplicate libmp3lame-dev
Re-generate debian/control.
Add Breaks/Replaces in debian/control.in
Merge branch 'master' into master.ubuntu
Update
Take patch from upstream SVN trunk to fix FTBFS with libav.
New changelog entry.
Set Breaks/Replaces properly.
Duplicate libmp3lame-dev, clean-up
LAME encoder is now available in gmerlin-encoders-good.
Merge branch 'master' into master.ubuntu
Merge debian/changelog with master
Set debian-tag field to ubuntu/%(version)s
Finalize changelog.
Regenerate debian/control.
Set maintainer as per Ubuntu's policy.
Provide dh_install control file for gmerlin's extra encoders.
Create Ubuntu's gmerlin-encoders-extra to provide non-free encoders, build-depend on libmp3lame-dev,libmjpegtools-dev.
Update gbp config.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bd2a23904c490a016d2cf557adff9bfdf6ce6d8a
X-Git-Newrev: b1b6b915cfffa4d382a8fb42fd6e641c0c1e365e

The following commit has been merged in the master branch:
commit 21541c8101653e03881dee369b31cfce65663611
Merge: bd2a23904c490a016d2cf557adff9bfdf6ce6d8a c5e35f0b80f7556b5c97f94752156759c8210aa6
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 10 01:43:29 2012 +0100

    Merge branch 'master.ubuntu'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d864e54,43d463a..5321041
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,11 +1,26 @@@
 +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-2ubuntu1) quantal; urgency=low
+ 
+   * Merge with Debian unstable, Ubuntu remaining changes:
+     - Build-depend on libmjpegtools-dev.
+     - Provide gmerlin-encoders-extra.
+ 
+  -- Alessio Treglia <quadrispro at ubuntu.com>  Wed, 13 Jun 2012 12:51:07 +0200
+ 
  gmerlin-encoders (1.2.0-2) unstable; urgency=low
  
    * Provides: gmerlin-encoders
@@@ -39,6 -32,14 +47,14 @@@ gmerlin-encoders (1.2.0-1) unstable; ur
  
   -- 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)
@@@ -46,6 -47,17 +62,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.
@@@ -60,6 -72,14 +87,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 65976ee,436bc6c..09f9291
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,25 +1,27 @@@
  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>
 + 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,
   libflac-dev,
   libgavl-dev (>= 1.2.0),
   libgmerlin-dev (>= 1.2.0~),
+  libmjpegtools-dev,
   libmp3lame-dev,
   libogg-dev,
   libpostproc-dev,
@@@ -39,7 -39,7 +41,7 @@@ Depends
  Enhances:
   gmerlin
  Provides:
 - germlin-encoders
 + gmerlin-encoders
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Description: ffmpeg encoders for Gmerlin
@@@ -57,10 -57,14 +59,14 @@@ Architecture: an
  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
 + gmerlin-encoders
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Description: patent-free encoders for Gmerlin
@@@ -72,3 -76,24 +78,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:
+  ${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 66b104c,d096f6d..b0a1292
--- a/debian/control.in
+++ b/debian/control.in
@@@ -1,11 -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>
 + 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:
@@@ -15,6 -15,7 +16,7 @@@
   libflac-dev,
   libgavl-dev (>= 1.2.0),
   libgmerlin-dev (>= 1.2.0~),
+  libmjpegtools-dev,
   libmp3lame-dev,
   libogg-dev,
   libpostproc-dev,
@@@ -34,7 -35,7 +36,7 @@@ Depends
  Enhances:
   gmerlin
  Provides:
 - germlin-encoders
 + gmerlin-encoders
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Description: ffmpeg encoders for Gmerlin
@@@ -52,10 -53,14 +54,14 @@@ Architecture: an
  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
 + gmerlin-encoders
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
  Description: patent-free encoders for Gmerlin
@@@ -67,3 -72,24 +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:
+  ${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