[Pkg-osg-devel] Bug: #690878 "pkg-config reports wrong path"

[Alberto Luaces]

Alberto Luaces Fernández writes:

>> Hello,
>> 
>> http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690878
>> 
>> Should we do something about this before the release? I think that
>> the prefix should be /usr, I am not sure if it would qualify as an RC
>> bug and a new version would be accepted at this point, but I think
>> that it's feasible.
>
> Hello Manuel,
>
> if I remember correctly, there were some problems if one just do as
> suggested in the bug report.  Let me check this; I will have an answer
> before the weekend.

Indeed, there was more than setting the prefix.  Doing so places all the
installation products under debian/tmp/usr instead of debian/tmp.  I
have crafted a hacky patch for taking this into account, but I don't
know if it is worth to have a better solution.  I have written it at the
end of the post.

On the other hand, lintian throws a lot of

W: openscenegraph: hardening-no-fortify-functions

Since I am not fresh in this one, I can't remember if I set correctly
the hardening flags or if this is allowable.  Any ideas?

diff --git a/debian/rules b/debian/rules
index 0e0b7a9..b27efaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -344,7 +344,7 @@ install-arch: build-arch
 	mkdir -p $(CURDIR)/debian/tmp/usr
 	$(MAKE) -C build/osgstatic DESTDIR=$(CURDIR)/debian/tmp/usr install
 	$(MAKE) -C build/osg DESTDIR=$(CURDIR)/debian/tmp/usr install
-	-mv $(CURDIR)/debian/tmp/usr/share/OpenSceneGraph/bin/* $(CURDIR)/debian/tmp/usr/bin
+	-mv $(CURDIR)/debian/tmp/usr/usr/share/OpenSceneGraph/bin/* $(CURDIR)/debian/tmp/usr/usr/bin
 	for man in ${MANEXAMPLES} ; do rm -f $$man ; ln -s debian/osgexamples.1 $$man ; done
 	for man in ${MANAPPLICATIONS} ; do rm -f $$man ; ln -s debian/osgapplications.1 $$man ; done
 
@@ -352,7 +352,7 @@ install-arch: build-arch
 binary-indep: install-indep
 	dh_installdocs -i
 	dh_installchangelogs -i
-	dh_install -i -XCMakeLists.txt
+	dh_install -i -XCMakeLists.txt --sourcedir=debian/tmp/usr
 	dh_lintian -i
 	dh_compress -i
 	dh_fixperms -i
@@ -362,12 +362,12 @@ binary-indep: install-indep
 	dh_builddeb -i
 
 install-indep: build-indep
-	mkdir -p debian/tmp/usr/share/openscenegraph/
-	cp -r OpenSceneGraph/examples debian/tmp/usr/share/openscenegraph
+	mkdir -p debian/tmp/usr/usr/share/openscenegraph/
+	cp -r OpenSceneGraph/examples debian/tmp/usr/usr/share/openscenegraph
 
 # Build architecture-dependent files here.
 binary-arch: install-arch
-	dh_install -a
+	dh_install -a --sourcedir=debian/tmp/usr
 	dh_installdocs -a
 	dh_installchangelogs -a
 	dh_installexamples -a
@@ -402,7 +402,7 @@ build-stamp:
 
 	mkdir -p build/osgstatic ; cd build/osgstatic ; ${SETAFFINITY} cmake --debug-output \
 		-D CMAKE_BUILD_TYPE:STRING=Release \
-		-D CMAKE_INSTALL_PREFIX:PATH=/ \
+		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
 		-D DYNAMIC_OPENTHREADS:BOOL=OFF \
 		-D DYNAMIC_OPENSCENEGRAPH:BOOL=OFF \
 		-D BUILD_OSG_EXAMPLES:BOOL=OFF \
@@ -418,7 +418,7 @@ build-stamp:
 		-D OPENTHREADS_SOVERSION:STRING=${OPENTHREADS_SOVERSION} \
 		-D OPENSCENEGRAPH_SOVERSION:STRING=${OPENSCENEGRAPH_SOVERSION} \
 		-D CMAKE_BUILD_TYPE:STRING=Release \
-		-D CMAKE_INSTALL_PREFIX:PATH=/ \
+		-D CMAKE_INSTALL_PREFIX:PATH=/usr \
 		-D BUILD_OSG_EXAMPLES:BOOL=ON \
 		-D LIB_POSTFIX="" \
 		${LINKER_FLAGS} \


-- 
Alberto