Merge pull request #71 from kwhetstone/deb_desc

[JENKINS-38437] Fix the debian package description
jenkinsci · Oct 12, 2016 · ce74c61 · ce74c61
2 parents 0c9db19 + 61107fe
commit ce74c61
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/deb/build/build.sh b/deb/build/build.sh
@@ -13,9 +13,15 @@ mkdir -p $D
 # so that multiple builds can go on concurrently
 cp -R $dir/* $D
 
+# Create a description temp file
+sed -i.bak -e 's/^\s*$/./' -e 's/^/ /' $DESCRIPTION_FILE
+
 # Expand variables in the definition
 "$BASE/bin/branding.py" $D/debian
 
+# Rewrite the file 
+mv "$DESCRIPTION_FILE.bak" "$DESCRIPTION_FILE"
+
 cat > $D/debian/changelog << EOF
 ${ARTIFACTNAME} ($VERSION) unstable; urgency=low
 

diff --git a/deb/build/debian/control b/deb/build/debian/control
@@ -11,6 +11,4 @@ Architecture: all
 Depends: ${misc:Depends}, daemon, adduser, procps, psmisc, net-tools, default-jre-headless (>= 2:1.7) | java7-runtime-headless
 Conflicts: hudson
 Replaces: hudson
-Description: continuous integration system
- Jenkins is an application that monitors executions of repeated jobs,
- such as building a software project or jobs run by cron.
+Description: @@DESCRIPTION_FILE@@