[med-svn] [htsjdk] 04/10: Fix version handling

[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 f89051ae01ee3e2e86483c2801857470fa877a95
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Wed Jul 6 00:08:45 2016 +0200

    Fix version handling
---
 debian/patches/20-fix-version.patch | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/patches/20-fix-version.patch b/debian/patches/20-fix-version.patch
index 56d8700..578e7ba 100644
--- a/debian/patches/20-fix-version.patch
+++ b/debian/patches/20-fix-version.patch
@@ -1,10 +1,11 @@
 Description: use debian/changelog as source for version instead of git
+ Also force the name of the root project to avoid it to be copied from the directory name
 Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
 Forwarded: not-needed
 Last-Updated: 2016-07-05
 --- a/build.gradle
 +++ b/build.gradle
-@@ -45,9 +45,16 @@
+@@ -45,9 +45,17 @@
  sourceCompatibility = 1.8
  targetCompatibility = 1.8
  
@@ -14,12 +15,21 @@ Last-Updated: 2016-07-05
 +        commandLine "dpkg-parsechangelog", "-S", "Version"
 +        standardOutput = dpkgStdOut
 +    }
-+    return dpkgStdOut.toString().trim()
++    return dpkgStdOut.toString().trim().replaceFirst(/-[^-]+$/, "")
 +}
  final isRelease = Boolean.getBoolean("release")
 -final gitVersion = gitVersion().replaceAll(".dirty", "")
 -version = isRelease ? gitVersion : gitVersion + "-SNAPSHOT"
-+version = getDebianVersion()
++final debianVersion = getDebianVersion()
++version = debianVersion
  
  logger.info("build for version:" + version)
  group = 'com.github.samtools'
+--- /dev/null
++++ b/settings.gradle
+@@ -0,0 +1 @@
++rootProject.name = rootName
+--- /dev/null
++++ b/gradle.properties
+@@ -0,0 +1 @@
++rootName=htsjdk

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