This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch 0.14+svn128-1+3p0p1+4.1 in repository libcitygml.
commit 59e6490e1268fba959a086fc3d189e5b0f96cb8c Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jan 31 23:28:02 2014 +0100 Merge changes from 0.14+svn128-1+3p0p1+4.1 NMU. --- debian/changelog | 10 ++++++++++ debian/gencontrol | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9c86f32..1039dcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libcitygml (0.14+svn128-1+3p0p1+4.1) unstable; urgency=medium + + * Non-maintainer upload. (Closes: #718385) + + [ Peter Michael Green ] + * Make code in debian/gencontrol handle releasecandidate version of + openscenegraph correctly. (Closes: #719396) + + -- Andreas Beckmann <a...@debian.org> Sat, 25 Jan 2014 14:56:58 +0100 + libcitygml (0.14+svn128-1+3p0p1+4) unstable; urgency=low [Sebastian Ramacher] diff --git a/debian/gencontrol b/debian/gencontrol index e3ed091..c9f040d 100644 --- a/debian/gencontrol +++ b/debian/gencontrol @@ -3,7 +3,8 @@ LIBOSG_VERSION=`dpkg -l $LIBOSG_SHARE |grep $LIBOSG_SHARE |sed 's/-/ /' |awk '{p TMP1=`echo $LIBOSG_VERSION|awk -F '.' '{print $1}'` TMP2=`echo $LIBOSG_VERSION|awk -F '.' '{print $2}'` TMP3=`echo $LIBOSG_VERSION|awk -F '.' '{print $3}'` +TMP3=`echo $TMP3|awk -F '~' '{print $1}'` 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)" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel