[SCM] gmerlin/master: Re-generate debian/control.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6067c1d709974e749173b13261770d5f1cfca688
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 26 13:28:35 2012 +0000

    Re-generate debian/control.

diff --git a/debian/control b/debian/control
index 8a0573a..6bdd8a5 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
  libjpeg-dev,
  libpulse-dev,
  libquicktime-dev,
- libtiff4-dev,
+ libtiff4-dev | libtiff-dev,
  libv4l-dev [linux-any],
  libvisual-0.4-dev,
  libxml2-dev,
@@ -47,10 +47,9 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Recommends:
+ gmerlin-encoders,
  gmerlin-plugins-avdecoder,
  gmerlin-plugins-base
-Suggests:
- gmerlin-encoders
 Description: multiformat media player
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It
@@ -195,8 +194,10 @@ Depends:
  pkg-config,
  ${misc:Depends}
 Breaks:
+ gmerlin-data (<= 1.0.0~dfsg-12),
  libgmerlin-common (<= 1.0.0~dfsg-12)
 Replaces:
+ gmerlin-data (<= 1.0.0~dfsg-12),
  libgmerlin-common (<= 1.0.0~dfsg-12)
 Description: core library for gmerlin - development files
  Gmerlin is a multiformat media player with tree-like virtual directory

-- 
gmerlin packaging