Merge remote-tracking branch 'upstream/v2.6.x-release' into merge25-26-jul14

.gitignore

@@ -10,9 +10,6 @@ record-and-playback/.project
 .vagrant/*
 **/.settings/*
 */.gradle
-bbb-api-demo/bin*
-bbb-api-demo/.classpath
-bbb-api-demo/.project
 bigbluebutton-web/.settings*
 bigbluebutton-web/.classpath
 bigbluebutton-web/.project

.gitlab-ci.yml

@@ -74,11 +74,6 @@ bbb-config-build:
   script:
     - build/setup-inside-docker.sh bbb-config
 
-bbb-demo-build:
-  extends: .build_job
-  script:
-    - build/setup-inside-docker.sh bbb-demo
-
 bbb-etherpad-build:
   extends: .build_job
   script:

bigbluebutton-config/bin/bbb-conf

@@ -381,7 +381,7 @@ start_bigbluebutton () {
 
     systemctl start $TOMCAT_SERVICE || {
         echo
-        echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI or BBB-Demo."
+        echo "# Warning: $TOMCAT_SERVICE could not be started. Please, check BBB-LTI."
         echo "#     Run the command:"
         echo "#       sudo journalctl -u $TOMCAT_SERVICE"
         echo "#     To better understand the ERROR"

bigbluebutton-web/.gitignore

@@ -2,7 +2,6 @@
 *.war
 stacktrace.log
 lib
-web-app/demo/bbb_api_conf.jsp
 target/*
 bin/*
 plugins/*

build/packages-template/bbb-apps-akka/build.sh

@@ -36,7 +36,7 @@ sed -i "s/^version .*/version := \"$VERSION\"/g" build.sbt
 if [[ -n $EPOCH && $EPOCH -gt 0 ]] ; then
     echo 'version in Debian := "'$EPOCH:$VERSION'"' >> build.sbt
 else
-    echo 'version in Debian := "'$VERSION-$BUILD'"' >> build.sbt
+    echo 'version in Debian := "'1:$VERSION-$BUILD'"' >> build.sbt
 fi
 sbt update
 sbt debian:packageBin

build/packages-template/bbb-fsesl-akka/build.sh

@@ -51,7 +51,7 @@ sed -i "s/^version .*/version := \"$VERSION\"/g" build.sbt
 if [[ -n $EPOCH && $EPOCH -gt 0 ]] ; then
     echo 'version in Debian := "'$EPOCH:$VERSION'"' >> build.sbt
 else
-    echo 'version in Debian := "'$VERSION-$BUILD'"' >> build.sbt
+    echo 'version in Debian := "'1:$VERSION-$BUILD'"' >> build.sbt
 fi
 sbt debian:packageBin
 cp ./target/*.deb ..