Control: tags -1 patch

On 2013-01-29 16:13:20, Lucas Nussbaum wrote:
> Source: libcitygml
> Version: 0.14+svn128-1+3p0p1
> Severity: serious
> Tags: wheezy sid
> User: debian...@lists.debian.org
> Usertags: qa-ftbfs-20130129 qa-ftbfs
> Justification: FTBFS in wheezy on amd64
> 
> Hi,
> 
> During a rebuild of all packages in *wheezy*, your package failed to
> build on amd64.
> 
> Relevant part:
> > make[2]: Entering directory 
> > `/«BUILDDIR»/libcitygml-0.14+svn128/obj-x86_64-linux-gnu'
> > make[2]: Nothing to be done for `preinstall'.
> > make[2]: Leaving directory 
> > `/«BUILDDIR»/libcitygml-0.14+svn128/obj-x86_64-linux-gnu'
> > Install the project...
> > /usr/bin/cmake -P cmake_install.cmake
> > -- Install configuration: ""
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.so.0.0.0
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.so.0
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.so
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.a
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/include/citygml.h
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/include/vecs.h
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/citygml.pc
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/bin/citygml2vrml
> > -- Removed runtime path from 
> > "/«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/bin/citygml2vrml"
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/bin/citygmltest
> > -- Removed runtime path from 
> > "/«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/bin/citygmltest"
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/usr/lib/osgPlugins-3.0.1/ReaderWriterCityGML.so
> > -- Removed runtime path from 
> > "/«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/usr/lib/osgPlugins-3.0.1/ReaderWriterCityGML.so"
> > -- Installing: 
> > /«BUILDDIR»/libcitygml-0.14+svn128/debian/tmp/usr/usr/lib/osgPlugins-3.0.1/ReaderWriterCityGML.a
> > make[1]: Leaving directory 
> > `/«BUILDDIR»/libcitygml-0.14+svn128/obj-x86_64-linux-gnu'
> >     cd /«BUILDDIR»/libcitygml-0.14+svn128
> >    dh_install
> >     install -d debian/libcitygml0//usr/lib/x86_64-linux-gnu
> >     cp -a debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.so.0 
> > debian/libcitygml0//usr/lib/x86_64-linux-gnu/
> >     cp -a debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.so.0.0.0 
> > debian/libcitygml0//usr/lib/x86_64-linux-gnu/
> >     install -d debian/libcitygml0-dev//usr/include
> >     cp -a debian/tmp/usr/include/citygml.h 
> > debian/libcitygml0-dev//usr/include/
> >     cp -a debian/tmp/usr/include/vecs.h debian/libcitygml0-dev//usr/include/
> >     install -d debian/libcitygml0-dev//usr/lib/x86_64-linux-gnu
> >     cp -a debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.a 
> > debian/libcitygml0-dev//usr/lib/x86_64-linux-gnu/
> >     cp -a debian/tmp/usr/lib/x86_64-linux-gnu/libcitygml.so 
> > debian/libcitygml0-dev//usr/lib/x86_64-linux-gnu/
> >     install -d debian/libcitygml0-dev//usr/lib/x86_64-linux-gnu/pkgconfig
> >     cp -a debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/citygml.pc 
> > debian/libcitygml0-dev//usr/lib/x86_64-linux-gnu/pkgconfig/
> >     install -d debian/libcitygml0-bin//usr/bin
> >     cp -a debian/tmp/usr/bin/citygml2vrml debian/libcitygml0-bin//usr/bin/
> >     cp -a debian/tmp/usr/bin/citygmltest debian/libcitygml0-bin//usr/bin/
> > dh_install: openscenegraph-plugin-citygml-shared missing files 
> > (usr/lib/osgPlugins-*/*.so), aborting
> > make: *** [binary] Error 255

openscenegraph's pkg-config file has been fixed in 3.0.1-4. So now pkg-config
openscenegraph --variable libdir returns /usr/lib/osgPlugins-3.0.1. However,
libcitygml installs the plugins into $prefix/$(pkg-config openscenegraph
--variable libdir) which ends up being /usr/usr/lib/osgPlugins-3.0.1.

The attached patch fixes this problem. If needed I can perform a NMU this
weekend.

Regards
-- 
Sebastian Ramacher
diff -Nru libcitygml-0.14+svn128/debian/changelog 
libcitygml-0.14+svn128/debian/changelog
--- libcitygml-0.14+svn128/debian/changelog     2012-06-12 19:44:25.000000000 
+0200
+++ libcitygml-0.14+svn128/debian/changelog     2013-01-30 00:26:44.000000000 
+0100
@@ -1,3 +1,14 @@
+libcitygml (0.14+svn128-1+3p0p1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/rewrite_cmake.diff: Remove extra $prefix from
+    openscenegraph plugin location. (Closes: #699253)
+  * debian/control: Bump libopenscenegraph-dev Build-Depends to >= 3.0.1-4~
+    since the pkg-config output used to determine the plugin location was
+    fixed in 3.0.1-4.
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Wed, 30 Jan 2013 00:06:20 +0100
+
 libcitygml (0.14+svn128-1+3p0p1) unstable; urgency=low
 
   * New Upstream snapshot 0.14+svn128
diff -Nru libcitygml-0.14+svn128/debian/control 
libcitygml-0.14+svn128/debian/control
--- libcitygml-0.14+svn128/debian/control       2012-06-12 20:50:59.000000000 
+0200
+++ libcitygml-0.14+svn128/debian/control       2013-01-30 00:24:29.000000000 
+0100
@@ -3,7 +3,7 @@
 Maintainer: YunQiang Su <wzss...@gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9), cmake (>= 2.6.3), libxml2-dev, 
-       libgdal-dev, libopenscenegraph-dev (>= 2.8)
+       libgdal-dev, libopenscenegraph-dev (>= 3.0.1-4~)
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://code.google.com/p/libcitygml
diff -Nru libcitygml-0.14+svn128/debian/patches/rewrite_cmake.diff 
libcitygml-0.14+svn128/debian/patches/rewrite_cmake.diff
--- libcitygml-0.14+svn128/debian/patches/rewrite_cmake.diff    2012-06-12 
21:16:01.000000000 +0200
+++ libcitygml-0.14+svn128/debian/patches/rewrite_cmake.diff    2013-01-30 
00:03:39.000000000 +0100
@@ -162,8 +162,8 @@
 +      SET_TARGET_PROPERTIES(ReaderWriterCityGML-static PROPERTIES PREFIX "")
 +      
 +      install(TARGETS ReaderWriterCityGML ReaderWriterCityGML-static
-+              LIBRARY DESTINATION 
${CMAKE_INSTALL_PREFIX}/${OSGPC_LIBDIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}
-+              ARCHIVE DESTINATION 
${CMAKE_INSTALL_PREFIX}/${OSGPC_LIBDIR}/osgPlugins-${OPENSCENEGRAPH_VERSION})
++              LIBRARY DESTINATION 
${OSGPC_LIBDIR}/osgPlugins-${OPENSCENEGRAPH_VERSION}
++              ARCHIVE DESTINATION 
${OSGPC_LIBDIR}/osgPlugins-${OPENSCENEGRAPH_VERSION})
 +ENDIF( OSG AND OPENSCENEGRAPH_FOUND )
  
 -IF(WIN32)

Attachment: signature.asc
Description: Digital signature

Reply via email to