Merge "chg: don’t use printf with variable format strings"

diff --git a/doc/jenkinsJob/config.xml b/doc/jenkinsJob/config.xml
index 00a23c16bcdd2a59de278a23698d84b457e268b3..852e725d9a44def7dcb6456b54609b575120651a 100644 (file)
--- a/doc/jenkinsJob/config.xml
+++ b/doc/jenkinsJob/config.xml
@@ -29,11 +29,13 @@
           <name>BRANCH</name>
           <description>The branch to build from.</description>
           <defaultValue>$GERRIT_PATCHSET_REVISION</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>JAVA_HOME</name>
           <description></description>
           <defaultValue>/usr/lib/jvm/openjdk-8-jdk-gigi</defaultValue>
+          <trim>false</trim>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
@@ -220,7 +222,9 @@ EOT
 localePath=$$$$LOCALE_FETCH_PATH$$$$</properties>
     </hudson.tasks.Ant>
     <hudson.tasks.Shell>
-      <command>cd gigi
+      <command>rm -v *.deb
+cd gigi
+[ -f doc/scripts/genchangelog ] &amp;&amp; doc/scripts/genchangelog
 dpkg-buildpackage -b -us -uc</command>
     </hudson.tasks.Shell>
   </builders>

diff --git a/doc/scripts/genchangelog b/doc/scripts/genchangelog
new file mode 100755 (executable)
index 0000000..4a4e716
--- /dev/null
+++ b/doc/scripts/genchangelog
@@ -0,0 +1,9 @@
+#!/bin/bash
+cd "$(git rev-parse --show-toplevel)"
+cat > debian/changelog <<EOF
+wpia-gigi ($(git describe HEAD --tags --match "v*" | sed "s/^v//")) unstable; urgency=low
+
+  * Initial release
+
+ -- WPIA Software Team <software@wpia.club>  $(git show HEAD --pretty=format:%aD --no-patch)
+EOF