[libcitygml] 01/03: Apply patch from Jonathan Wiltshire to fix FTBFS with OpenSceneGraph 3.2.1.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository libcitygml.

commit d5873db7a82fc529388ad7c09c3ccf5f2e70485f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 27 16:31:16 2014 +0200

    Apply patch from Jonathan Wiltshire to fix FTBFS with OpenSceneGraph 3.2.1.
---
 debian/changelog                                    | 8 ++++++++
 debian/gencontrol                                   | 2 +-
 debian/openscenegraph-plugin-citygml-shared.install | 2 +-
 debian/openscenegraph-plugin-citygml-static.install | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf24531..5cc5c20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libcitygml (0.14+svn134-1+3p2p1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Apply patch from Jonathan Wiltshire to fix FTBFS with OpenSceneGraph 3.2.1.
+    (closes: #763047)
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 27 Sep 2014 16:28:58 +0200
+
 libcitygml (0.14+svn134-1+3p2p0) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/gencontrol b/debian/gencontrol
index 6791d0b..cb92bea 100644
--- a/debian/gencontrol
+++ b/debian/gencontrol
@@ -1,4 +1,4 @@
-LIBOSG_SHARE=`dpkg --get-selections | grep "libopenscenegraph[0-9]*\s*install" | awk '{print $1}'`
+LIBOSG_SHARE=`dpkg --get-selections | grep "libopenscenegraph[0-9]*:[[:alnum:]]*\s*install" | awk '{print $1}'`
 LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE | grep "^ii\s*$LIBOSG_SHARE" | sed 's/-/ /' | awk '{print $3}'`
 TMP1=`echo $LIBOSG_VERSION | awk -F '.' '{print $1}'`
 TMP2=`echo $LIBOSG_VERSION | awk -F '.' '{print $2}'`
diff --git a/debian/openscenegraph-plugin-citygml-shared.install b/debian/openscenegraph-plugin-citygml-shared.install
index 32add27..fd4b5ad 100644
--- a/debian/openscenegraph-plugin-citygml-shared.install
+++ b/debian/openscenegraph-plugin-citygml-shared.install
@@ -1 +1 @@
-usr/lib/osgPlugins-*/*.so
+usr/lib/*/osgPlugins-*/*.so
diff --git a/debian/openscenegraph-plugin-citygml-static.install b/debian/openscenegraph-plugin-citygml-static.install
index c5cf301..2025369 100644
--- a/debian/openscenegraph-plugin-citygml-static.install
+++ b/debian/openscenegraph-plugin-citygml-static.install
@@ -1 +1 @@
-usr/lib/osgPlugins-*/*.a
+usr/lib/*/osgPlugins-*/*.a

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