[hdf5] 01/03: Symbols files: ignore -patch and ~(alpha|pre)

[Gilles Filippini]

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

pini pushed a commit to branch master-1.10
in repository hdf5.

commit b4eac7ee3b936bb5f9bd5f65727b01dced552a71
Author: Gilles Filippini <pini at debian.org>
Date:   Tue May 24 23:41:15 2016 +0200

    Symbols files: ignore -patch and ~(alpha|pre)
---
 debian/process-symbols-files | 2 +-
 debian/rules                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/process-symbols-files b/debian/process-symbols-files
index 3e990b8..dadbbd6 100755
--- a/debian/process-symbols-files
+++ b/debian/process-symbols-files
@@ -7,7 +7,7 @@ debian_dir="$(dirname "$(readlink -f "$0")")"
 cd "$debian_dir"
 
 # 2- Get version and sonames
-version="$(grep 'HDF5 config.lt' ../configure | awk '{print $3}' | sed -r 's/-patch/./;s/-(alpha|pre)[0-9]*//')"
+version="$(grep 'HDF5 config.lt' ../configure | awk '{print $3}' | sed -r 's/-patch[0-9]*//;s/-(alpha|pre)[0-9]*//')"
 soname=$(cd .. && ./debian/rules SONAME)
 soname_cxx=$(cd .. && ./debian/rules SONAME_CXX)
 
diff --git a/debian/rules b/debian/rules
index b4c6cc6..0fc472d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@
 
 package = libhdf5
 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-libversion ?= $(shell echo $(pkgversion) | sed 's/^\([0-9\.]*\)\(~[^~+]*\)\?\(+docs[0-9]*\)\?-[^-]*$$/\1/')
+libversion ?= $(shell echo $(pkgversion) | sed -r 's/^([0-9\.]*)([-~][^-~+]*)?(\+docs[0-9]*)?-[^-]*$$/\1/')
 
 # BEGIN - Get sonames from config/lt_vers.am
 include config/lt_vers.am

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