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

rashad-guest pushed a commit to branch master
in repository otb.

commit eb6b0f293fda0498b396fd94ce08ddf1e3155b67
Author: Rashad Kanavath <rashad.kanav...@c-s.fr>
Date:   Tue Dec 22 13:36:28 2015 +0100

    genereate libotb-dev.install from .in
---
 debian/libotb-dev.install |  4 ++--
 debian/rules              | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/libotb-dev.install b/debian/libotb-dev.install
index d57bb06..719a671 100755
--- a/debian/libotb-dev.install
+++ b/debian/libotb-dev.install
@@ -3,7 +3,7 @@
 usr/lib/lib*.so                usr/lib/${DEB_HOST_MULTIARCH}
 
 # OTB headers
-usr/include/OTB-5.0
+usr/include/OTB-5.2
 
 # CMake helper scripts
-usr/lib/cmake/OTB-5.0
+usr/lib/cmake/OTB-5.2
diff --git a/debian/rules b/debian/rules
index f7ee23b..ecc17a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,15 +21,12 @@ ifndef PKGVERSION
     PKGVERSION=1
 endif
 
-TEMPLATES=$(wildcard debian/*.in)
-
 OTB_VERSION_MAJOR  = $(shell sed -ne 's/set(OTB_VERSION_MAJOR 
"\([0-9]*\)")/\1/p' CMakeLists.txt)
 OTB_VERSION_MINOR  = $(shell sed -ne 's/set(OTB_VERSION_MINOR 
"\([0-9]*\)")/\1/p' CMakeLists.txt)
 OTB_VERSION_PATCH  = $(shell sed -ne 's/set(OTB_VERSION_PATCH 
"\([0-9]*\)")/\1/p' CMakeLists.txt)
-OTB_VERSION_SONAME = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR)-1
+OTB_VERSION_SONAME = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR)
 OTB_VERSION_FULL   = 
$(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PATCH)
 
-
 CMAKE_FLAGS = \
        -DCMAKE_INSTALL_PREFIX=/usr \
        -DCMAKE_BUILD_TYPE:STRING=Release \
@@ -57,11 +54,9 @@ pkglib:=lib$(DEBPKGNAME)
 pkgdev:=$(pkglib)-dev
 
 templates:
-       for TEMPLATE in $(TEMPLATES) ; do \
-           sed -e 's/@SOVERSION@/$(OTB_VERSION_SONAME)/g' $$TEMPLATE > `echo 
$$TEMPLATE | sed 's/.in$$//'` ; \
-       done
+        sed -e 's/@SOVERSION@/$(OTB_VERSION_SONAME)-1/g' debian/control.in > 
debian/control
+        sed -e 's/@SOVERSION@/$(OTB_VERSION_SONAME)/g' 
debian/libotb-dev.install.in > debian/libotb-dev.install
 
-# OTB_LIB_DIRS = $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 # rather use all libs since the installed libs are spread over several packages
 OTB_LIB_DIRS = $(CURDIR)/debian/tmp/usr/lib
 
@@ -78,7 +73,7 @@ override_dh_shlibdeps:
        dh_shlibdeps -l$(OTB_LIB_DIRS)
 
 override_dh_install:
-       rm -f $(CURDIR)/debian/tmp/usr/share/doc/OTB-5.0/LICENSE
+       rm -f 
$(CURDIR)/debian/tmp/usr/share/doc/OTB-$(OTB_VERSION_SONAME)/LICENSE
        rm -f $(CURDIR)/usr/lib/otb/python/otbApplication.pyc
        dh_install --list-missing
        rm -f 
$(CURDIR)/debian/$(pkglib)/usr/lib/$(DEB_HOST_MULTIARCH)/libOTBWrapper*

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to