[SCM] gmerlin/master: Regenerate debian/control.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 09dfacbc361bd1d6363f0c977afd328ea7c15add
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 26 10:52:04 2012 +0100

    Regenerate debian/control.
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index 1fca56a..2f178ae 100644
--- a/debian/control
+++ b/debian/control
@@ -8,15 +8,15 @@ Uploaders:
 Homepage: http://gmerlin.sourceforge.net/
 Standards-Version: 3.9.2
 Build-Depends:
+ cdbs (>= 0.4.85~),
  autotools-dev,
  gnulib,
- cdbs (>= 0.4.85~),
  debhelper (>= 7.0.1),
  dh-buildinfo,
  libtool,
  automake1.11,
  autoconf,
- devscripts (>= 2.10.7~),
+ devscripts,
  doxygen,
  fontconfig,
  libasound2-dev [linux-any],
@@ -122,6 +122,8 @@ Section: libs
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks: gmerlin-data (<< 1.0.0~dfsg)
+Replaces: gmerlin-data (<< 1.0.0~dfsg)
 Description: core library for gmerlin - runtime files
  Gmerlin is a multiformat media player with tree-like virtual directory
  structure, where you can save your files, webstreams or whatever. It

-- 
gmerlin packaging