[SCM] libcitygml branch, master, updated. debian/0.14+svn128-1+3p0p1+4-25-g5cb2914

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit bf4735ee434cac4e8ed35245f197c4cbe363b145
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 19 22:51:20 2014 +0100

    Fix libopenscenegraph version detection.

diff --git a/debian/changelog b/debian/changelog
index e34e39a..a77683f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libcitygml (0.14+svn128-1+3p0p1+5) UNRELEASED; urgency=low
   * Add Debian GIS Project to Uploaders.
   * Use canonical URLs for Vcs-* fields.
   * Use copyright-format 1.0 instead of dep5 URL.
+  * Fix libopenscenegraph version detection.
+    (closes: #719396)
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 19 Jan 2014 19:43:40 +0100
 
diff --git a/debian/gencontrol b/debian/gencontrol
index e3ed091..6791d0b 100644
--- a/debian/gencontrol
+++ b/debian/gencontrol
@@ -1,9 +1,9 @@
-LIBOSG_SHARE=`dpkg --get-selections|awk '{print $1}'|grep libopenscenegraph[0-9]`
-LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE |grep $LIBOSG_SHARE |sed 's/-/ /' |awk '{print $3}'`
-TMP1=`echo $LIBOSG_VERSION|awk -F '.' '{print $1}'`
-TMP2=`echo $LIBOSG_VERSION|awk -F '.' '{print $2}'`
-TMP3=`echo $LIBOSG_VERSION|awk -F '.' '{print $3}'`
+LIBOSG_SHARE=`dpkg --get-selections | grep "libopenscenegraph[0-9]*\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}'`
+TMP3=`echo $LIBOSG_VERSION | awk -F '.' '{print $3}' | sed 's/~.*$//'`
 TMP3=$((TMP3+1))
-LIBOSG_VERSIONPLUS=$TMP1.$TMP2.$TMP3
+LIBOSG_VERSIONPLUS=$TMP1.$TMP2.$TMP3~
 echo $LIBOSG_VERSION
 dh_gencontrol -- -Vlibosg-share="$LIBOSG_SHARE" -Vlibosg-static="libopenscenegraph-dev (>=$LIBOSG_VERSION), libopenscenegraph-dev (<< $LIBOSG_VERSIONPLUS)"

-- 
Read and write CityGML files