[SCM] gmerlin/master: Add alternative on Build-Depends: libtiff4-dev | libtiff-dev.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c95160ab1777e65cdf32ae136a84c47310bb1b52
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Sep 4 18:46:57 2012 +0200

    Add alternative on Build-Depends: libtiff4-dev | libtiff-dev.

diff --git a/debian/control.in b/debian/control.in
index 17e8c42..48ed087 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,7 +24,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,

-- 
gmerlin packaging