[SCM] lives packaging branch, master, updated. debian/1.1.8-1-51-ge3bc186

[hrickards-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e3bc186d4ca5e0cb443c3916e964be7308257d5f
Merge: a13bb49b1251c7c728db1d87e1a87b5d134d3823 99e6b47a88e6ab3f8be35aa16c7d27e7f079dd8a
Author: Harry Rickards <harry at linux.com>
Date:   Wed Jan 13 10:05:33 2010 +0000

    Merge branch 'master' of ssh://hrickards-guest@git.debian.org/git/pkg-multimedia/lives

diff --combined debian/changelog
index 8e6564a,9bc121e..e5da446
--- a/debian/changelog
+++ b/debian/changelog
@@@ -17,17 -17,13 +17,17 @@@ lives (1.1.8-2) unstable; urgency=lo
      be pulled in via shlibs.
    * Updated to use Debian fork of cdda2wav, icedax.
    * Added more detail to debian/README.source and updated for quilt
 +  * Added debian/README.Debian giving details about transcode,
 +    mencoder and mjpegtools
 +  * Added theora and ogg to Recommends: in debian/control so users at
 +    least have ogg and theora to encode in
    
    [ Alessio Treglia ]
    * debian/rules:
      - Don't include quilt.make rules file, it's unnecessary.
      - Adjust clean target properly.
    * debian/control:
-     - Set debhelper build-dependency version to 7.0.8~ (to make backporters'
+     - Set debhelper build-dependency version to 7.0.50~ (to make backporters'
        life easy).
      - Bump-up quilt to (at least) 0.46-7~.
      - Add myself to the Uploaders field.
@@@ -39,9 -35,6 +39,9 @@@
    * Remove debian/LiVES.desktop, the same file is already provided by
      upstream.
  
 +  [ Reinhard Tartler ]
 +  * use multiline depends for lives' recommends field
 +
   -- Harry Rickards <hrickards at l33tmyst.com>  Mon, 11 Jan 2010 18:55:23 +0000
  
  lives (1.1.8-1) unstable; urgency=low

-- 
lives packaging