[SCM] liblas branch, master, updated. debian/1.2.1-1-14-gea9ec69

[David Paleino]

The following commit has been merged in the master branch:
commit ea9ec69c8d8aa78864dcaa39cc6d749279319f43
Author: David Paleino <dapal at debian.org>
Date:   Mon Apr 23 12:27:10 2012 +0200

    Add alternative dependency for libtiff

diff --git a/debian/changelog b/debian/changelog
index 970f682..885d995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ liblas (1.7.0-1) UNRELEASED; urgency=low
   * Debhelper level set to 9.
   * debian/copyright now is in format 1.0.
 
- -- David Paleino <dapal at debian.org>  Mon, 23 Apr 2012 12:23:09 +0200
+ -- David Paleino <dapal at debian.org>  Mon, 23 Apr 2012 12:26:57 +0200
 
 liblas (1.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index dac9384..4d37e90 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.49),
  cmake,
  libgeotiff-dev, 
  libgdal1-dev (>= 1.7.0), 
- libtiff5-dev,
+ libtiff5-dev | libtiff-dev,
  libboost-dev,
  libboost-program-options-dev,
  libboost-thread-dev

-- 
ASPRS LiDAR data translation library