[otb] 04/04: avoid double qoutes in upstream version number variable OTB_VERSION_FULL

Rashad Kanavath rashad-guest at moszumanska.debian.org
Thu Dec 17 18:01:41 UTC 2015


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

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

commit b41a7e5da3e562d5c1b877771455d6f1f2dc4303
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Date:   Thu Dec 17 19:01:12 2015 +0100

    avoid double qoutes in upstream version number variable OTB_VERSION_FULL
---
 debian/rules | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index f5581df..7c4ffbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,11 +27,12 @@ OTB_VERSION_MAJOR  = $(shell sed -ne 's/set(OTB_VERSION_MAJOR "\([0-9]*\)")/\1/p
 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_FULL   = "$(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PATCH)"
+OTB_VERSION_FULL   = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PATCH)
 
 
 CMAKE_FLAGS = \
 	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DOTB_INSTALL_PYTHON_DIR="lib/otb/python"
 	-DCMAKE_BUILD_TYPE:STRING=Release \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DOTB_USE_CURL:BOOL=ON \
@@ -68,8 +69,8 @@ OTB_LIB_DIRS = $(CURDIR)/debian/tmp/usr/lib
 %:
 	dh $@ --with pkgkde_symbolshelper --parallel
 
-override_dh_auto_configure:
-	dh_auto_configure -- templates $(CMAKE_FLAGS)
+override_dh_auto_configure: templates
+	dh_auto_configure --  $(CMAKE_FLAGS)
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c0 -v$(OTB_VERSION_FULL)

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



More information about the Pkg-grass-devel mailing list