[libcitygml] 01/02: Tweak OpenSceneGraph version detection in gencontrol script.

[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 cd99e41d423946a043904ae542c47b75637f2e8e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 28 00:44:03 2014 +0200

    Tweak OpenSceneGraph version detection in gencontrol script.
    
    Fixes FTBFS on kfreebsd-*.
---
 debian/changelog  | 7 +++++++
 debian/gencontrol | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6d9287..cf13373 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcitygml (0.14+svn134-2+3p2p1) UNRELEASED; urgency=medium
+
+  * Tweak OpenSceneGraph version detection in gencontrol script.
+    Fixes FTBFS on kfreebsd-*.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 28 Sep 2014 00:42:03 +0200
+
 libcitygml (0.14+svn134-1+3p2p1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/gencontrol b/debian/gencontrol
index cb92bea..5ae3182 100644
--- a/debian/gencontrol
+++ b/debian/gencontrol
@@ -1,9 +1,9 @@
-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}'`
+LIBOSG_SHARE=`dpkg --get-selections | grep "libopenscenegraph[0-9]*:.*\s*install" | awk '{print $1}' | awk -F: '{print $1}'`
+LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE | grep "^ii\s*$LIBOSG_SHARE" | awk '{print $3}' | sed 's/-.*//'`
 TMP1=`echo $LIBOSG_VERSION | awk -F '.' '{print $1}'`
 TMP2=`echo $LIBOSG_VERSION | awk -F '.' '{print $2}'`
 TMP3=`echo $LIBOSG_VERSION | awk -F '.' '{print $3}' | sed 's/~.*$//'`
 TMP3=$((TMP3+1))
 LIBOSG_VERSIONPLUS=$TMP1.$TMP2.$TMP3~
 echo $LIBOSG_VERSION
-dh_gencontrol -- -Vlibosg-share="$LIBOSG_SHARE" -Vlibosg-static="libopenscenegraph-dev (>=$LIBOSG_VERSION), libopenscenegraph-dev (<< $LIBOSG_VERSIONPLUS)"
+dh_gencontrol -- -Vlibosg-share="$LIBOSG_SHARE" -Vlibosg-static="libopenscenegraph-dev (>= $LIBOSG_VERSION), libopenscenegraph-dev (<< $LIBOSG_VERSIONPLUS)"

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