[SCM] OCE packaging branch, debian, updated. debian/0.7.0-3-102-g4f138a0

[Denis Barbier]

The following commit has been merged in the debian branch:
commit c0f5dc332ec28dce9a99817d3b5687ebc1404403
Author: Denis Barbier <bouzim at gmail.com>
Date:   Wed Jan 4 20:05:42 2012 +0100

    Rpath settings can be set directly to the right values with OCE 0.8.0
    
    Drop chrpath usage, and do no more override dh_shlibdeps.  The latter
    was broken, oce-draw did not depend on liboce-ocaf as it should.

diff --git a/debian/control b/debian/control
index 9c2e15a..160576b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8), quilt, cmake, chrpath,
+Build-Depends: debhelper (>= 8), quilt, cmake,
  libx11-dev, libxmu-dev, libxext-dev, tcl8.5-dev, tk8.5-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libftgl-dev, libgl2ps-dev
diff --git a/debian/rules b/debian/rules
index cc430cf..00a568c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ override_dh_auto_configure:
         -DOCE_BUILD_TYPE:STRING=Release \
         -DOCE_INSTALL_PREFIX:PATH=/usr \
         -DOCE_DRAW:BOOL=ON \
+        -DOCE_RPATH_FILTER_SYSTEM_PATHS:BOOL=ON \
         -DOCE_MULTITHREAD_LIBRARY:STRING=NONE \
         -DOCE_WITH_FREEIMAGE:BOOL=ON \
         -DOCE_WITH_GL2PS:BOOL=ON
@@ -24,15 +25,10 @@ override_dh_auto_install:
 	# Install manual page
 	cp -p debian/DRAWEXE.1 debian/tmp/usr/share/man/man1/
 	find debian/tmp/usr/share -name FILES -exec rm -f {} \;
-	# Remove rpath
-	chrpath -d debian/tmp/usr/lib/lib*.so
-	chrpath -r /usr/lib/oce-0.7.0 debian/tmp/usr/bin/DRAWEXE
 
 override_dh_install:
 	dh_install --list-missing
 	rm -rf debian/oce-draw/usr/include
 
-override_dh_shlibdeps:
-	dh_shlibdeps -X/usr/lib/oce-
 override_dh_makeshlibs:
 	dh_makeshlibs -Noce-draw

-- 
OCE packaging