[ossim] 15/25: Moved to current dh auto commands

[Francesco Lovergine]

This is an automated email from the git hooks/post-receive script.

frankie pushed a commit to branch master
in repository ossim.

commit 1cdfe729987eb5f7159ba351f8d5bc647eee50d8
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 4 17:47:17 2014 +0100

    Moved to current dh auto commands
---
 debian/changelog |  7 ++++---
 debian/compat    |  2 +-
 debian/control   | 12 ++++++------
 debian/rules     | 31 ++++++++++++++++++++++++++-----
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8061c9..0a65f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,8 @@ ossim (1.8.16-1) unstable; urgency=low
   * New upstream release.
     (closes: #640010)
   * Moved debian repository to git with new packaging style to simplify
-    mantainership. New Vcs-* fields set.
-  * Policy bumped to 3.9.6.
+    mantainership. New Vcs-* canonical fields set.
+  * Policy bumped to 3.9.5.
   * Debhelper level set to 9.
   * Annotated README.source about getting upstream source.
   * Moved to source format 3.0.
@@ -19,8 +19,9 @@ ossim (1.8.16-1) unstable; urgency=low
     (closes: #628413)
   * Fixed for libpng-dev b-d.
     (closes: #662460)
+  * Removed cdbs use, now using modern dh_* methods.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 19 Mar 2012 14:27:41 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 04 Mar 2014 17:23:02 +0100
 
 ossim (1.7.21-4) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 4415b04..9a3dd4e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +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
+Build-Depends: cmake (>= 2.8)
  , debhelper (>= 9)
  , libopenscenegraph-dev
  , libzzip-dev
@@ -12,14 +11,15 @@ Build-Depends:
  , libtiff5-dev
  , libjpeg-dev
  , libexpat1-dev
- , libcurl4-gnutls-dev|libcurl4-dev
+ , libcurl4-gnutls-dev | libcurl4-dev
  , libpng-dev
  , libgif-dev
  , libgeotiff-dev
- , libopenthreads-dev, 
+ , libopenthreads-dev 
  , libtar-dev
  , libfreetype6-dev
  , autotools-dev
+ , libtiff-dev
 Standards-Version: 3.9.5
 Homepage: http://www.ossim.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/ossim.git
@@ -29,7 +29,7 @@ Package: libossim1.8.16
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: The OSSIM library -- shared library
+Description: OSSIM library -- shared library
  Open Source Software Image Map (OSSIM) is a high performance engine for
  remote sensing, image processing, geographical information systems and
  photogrammetry. It has been actively developed since 1996.
@@ -54,7 +54,7 @@ Package: libossim-dev
 Architecture: any
 Section: libdevel
 Depends: libossim1.8.16 (= ${binary:Version}), ${misc:Depends}, libgeotiff-dev 
-Description: The OSSIM library -- development files
+Description: OSSIM library -- development files
  Open Source Software Image Map (OSSIM) is a high performance engine for
  remote sensing, image processing, geographical information systems and
  photogrammetry. It has been actively developed since 1996.
diff --git a/debian/rules b/debian/rules
index 3b638d5..db0edd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,12 @@ else
     OPTFLAG = --enable-optimization
 endif
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@ --with cmake
 
-install/ossim-core::
+override_dh_auto_install:
 	-find debian/tmp/usr/share/ossim/templates -type f -exec chmod a-x {} \;
+	dh_auto_install
 
 # Add here any variable or target overrides you need.
 
@@ -25,8 +26,28 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 		--enable-singleSharedOssimLibrary --enable-singleStaticOssimLibrary \
 		--with-freetype=/usr --with-mpi=no $(OPTFLAG) 
 
-clean::
-	[ -f Makefile ] || $(MAKE) clean; \
+CMAKE_OPTS = \
+       -DCMAKE_INSTALL_PREFIX=/usr \
+       -DCMAKE_MODULE_PATH=$(CUR_DIR)/CMakeModules \
+       -DBUILD_OSSIM_FRAMEWORKS=ON \
+       -DBUILD_OSSIM_FREETYPE_SUPPORT=ON \
+       -DBUILD_OSSIM_ID_SUPPORT=ON \
+       -DBUILD_OSSIM_MPI_SUPPORT=OFF \
+       -DBUILD_OSSIM_TEST_APPS=ON \
+       -DBUILD_SHARED_LIBS=ON
+
+override_dh_auto_configure:
+	[ -d debian/build ] || mkdir debian/build
+	[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
+	cd debian/build && \
+		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" \
+		cmake $(CMAKE_OPTS) ../..
+
+override_dh_auto_build:
+	$(MAKE) -C debian/build
+
+#override_dh_clean:
+#	[ -f Makefile ] || $(MAKE) clean; \
 	find $(CURRENT) -name Makefile -delete; \
 	find $(CURRENT) -name "*.o" -delete; \
 	rm -f Makefile.common \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git