[openoffice] branch AOO417 updated: With the change to git, we now use a hash as the SCM version. Remove the 'r' (eg: aoo-r1f...) which could be misconstrued as part of the hash)

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jim pushed a commit to branch AOO417
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO417 by this push:
     new 46059c9  With the change to git, we now use a hash as the SCM version. Remove the 'r' (eg: aoo-r1f...) which could be misconstrued as part of the hash)
46059c9 is described below

commit 46059c91923bf7072c2f1f85027d6ea5d4e39ccf
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Mon Aug 26 12:11:38 2019 -0400

    With the change to git, we now use a hash as the SCM version. Remove the 'r' (eg: aoo-r1f...) which could be misconstrued as part of the hash)
    
    (cherry picked from commit fe47194565bdf250addf0471ef7ed669deaabe82)
---
 main/solenv/bin/srcrelease.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/solenv/bin/srcrelease.xml b/main/solenv/bin/srcrelease.xml
index 6b01b3e..9f7166b 100644
--- a/main/solenv/bin/srcrelease.xml
+++ b/main/solenv/bin/srcrelease.xml
@@ -45,7 +45,7 @@
   <target name="declarenames" depends="getrevision">
     <property name="release.dir.name" value="${aoo.short.name}-${aoo.ver}"/>
     <property name="release.name" value="${aoo.name}-${aoo.ver}"/>
-    <property name="release.file.name" value="${release.name}-r${scm.revision}-src"/>
+    <property name="release.file.name" value="${release.name}-${scm.revision}-src"/>
     <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
     <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
     <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>