[SCM] liblas branch, master, updated. debian/1.2.1-1-19-gc0051fc

[David Paleino]

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

    Moved from CDBS to dh

diff --git a/debian/changelog b/debian/changelog
index 885d995..742a771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ liblas (1.7.0-1) UNRELEASED; urgency=low
   [ David Paleino ]
   * Updated debian/watch to reflect new source location.
   * Package moved to git, reflect the change in Vcs-* fields.
+  * Moved from CDBS to dh
 
   [ Francesco Paolo Lovergine ]
   * New upstream version with SONAME bumping.
@@ -15,7 +16,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:26:57 +0200
+ -- David Paleino <dapal at debian.org>  Mon, 23 Apr 2012 13:02:39 +0200
 
 liblas (1.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4d37e90..15dca9d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: cdbs (>= 0.4.49), 
+Build-Depends:
  debhelper (>= 9), 
  cmake,
  libgeotiff-dev, 
diff --git a/debian/rules b/debian/rules
index e3b25fa..9fb1ac9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS = \
-					-DWITH-GDAL=TRUE \
-					-DWITH-GEOTIFF=TRUE
-
-#DEB_MAKE_CHECK_TARGET = test
-
+%:
+	dh $@ \
+		-Scmake
+
+override_dh_auto_configure:
+	dh_auto_configure -Scmake -- \
+		-DWITH_GDAL=TRUE \
+		-DWITH_GEOTIFF=TRUE \
+		-DGEOTIFF_INCLUDE_DIR=/usr/include/geotiff

-- 
ASPRS LiDAR data translation library