[med-svn] [htsjdk] 08/10: remove dfsg suffix in version

[Vincent Danjean]

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

vdanjean pushed a commit to branch master
in repository htsjdk.

commit ce6857abc7413b773f0879dbced852d77d32f85c
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Wed Jul 6 01:39:55 2016 +0200

    remove dfsg suffix in version
---
 debian/patches/20-fix-version.patch | 2 +-
 debian/rules                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/20-fix-version.patch b/debian/patches/20-fix-version.patch
index e2e85ec..fe9b4e1 100644
--- a/debian/patches/20-fix-version.patch
+++ b/debian/patches/20-fix-version.patch
@@ -45,7 +45,7 @@ Last-Updated: 2016-07-05
 +        commandLine "dpkg-parsechangelog", "-S", "Version"
 +        standardOutput = dpkgStdOut
 +    }
-+    return dpkgStdOut.toString().trim().replaceFirst(/-[^-]+$/, "")
++    return dpkgStdOut.toString().trim().replaceFirst(/([+]dfsg[.0-9]*)?-[^-]+$/, "")
 +}
  final isRelease = Boolean.getBoolean("release")
 -final gitVersion = gitVersion().replaceAll(".dirty", "")
diff --git a/debian/rules b/debian/rules
index b4efec7..66f17e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,4 +18,4 @@ override_dh_auto_test:
 	dh_auto_build -- test
 
 override_jh_installlibs:
-	jh_installlibs --version-strip='[+]dfsg\.[0-9]*'
+	jh_installlibs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/htsjdk.git