Merge branch 'branch_v1_10' of github.com:rcaelers/workrave into bran…

…ch_v1_10

# Conflicts:
#	NEWS
#	build/travis/ppa.sh

.travis.yml

@@ -54,19 +54,11 @@ stage_linux: &stage_linux
 
 stage_win32: &stage_win32
   <<: *stage_linux
+
+stage_deploy: &stage_deploy
+  <<: *stage_linux
   <<: *stage_github
   deploy:
-#    - provider: releases
-#      api_key: $GITHUB_TOKEN
-#      skip_cleanup: true
-#      file_glob: true
-#      file: _deploy/*.exe
-#      draft: true
-#      on:
-#        repo: rcaelers/workrave
-#        branch: branch_v1_10
-#        tags: true
-
     - provider: script
       skip_cleanup: true
       on:
@@ -160,16 +152,6 @@ jobs:
         CONF_DISABLE="pulse,xfce,gnome3,gstreamer,dbus,mate,indicator"
       <<: *stage_linux
 
-    - stage: build
-      env: >
-        COMPILER="gcc"
-        DOCKER_IMAGE="ubuntu-bionic"
-        CONF_GTK_VER="3"
-        CONF_ENABLE="gnome3,gsettings,xml,pulse,indicator,xfce,mate,dbus,distribution,experimental,gconf,gstreamer,exercises"
-        CONF_DISABLE=""
-        DISTCHECK="yes"
-      <<: *stage_linux
-
     - stage: build
       env: >
         COMPILER="gcc"
@@ -188,6 +170,7 @@ jobs:
         DOCKER_IMAGE="ubuntu-cosmic"
         DISTCHECK="yes"
       <<: *stage_linux
+      <<: *stage_deploy
 
     - stage: build
       env: >
@@ -222,13 +205,15 @@ jobs:
         CONFIGURATION="Release"
         DOCKER_IMAGE="mingw-gtk2"
       <<: *stage_win32
+      <<: *stage_deploy
 
     - stage: build
       env: >
         COMPILER="gcc"
         CONFIGURATION="Debug"
         DOCKER_IMAGE="mingw-gtk2"
       <<: *stage_win32
+      <<: *stage_deploy
 
     - stage: release
       script:

NEWS

@@ -7,6 +7,9 @@ http://www.workrave.org
 
 * Workrave 1.10.30
 
+** Prevent "Workrave wants to inhibit shortcuts" on Wayland
+** Fix timer bar text color under Wayland
+** Do not dim text in time bar when window is not focused.
 ** Add GetTimerRemaining dbus function.
 
 * Workrave 1.10.28 / 1.10.29

build/travis/build-linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 BASEDIR=$(dirname "$0")
 source ${BASEDIR}/config.sh
@@ -28,7 +28,7 @@ conf_opt_packages()
     fi
 }
 
-cd /workspace/source
+cd ${SOURCES_DIR}
 
 apt-get update -q
 apt-get -y -q -V --no-install-recommends install \
@@ -68,11 +68,14 @@ fi
     `conf_opt exercises` \
     `conf_opt experimental`
 
-if [ -z "$TRAVIS_TAG" -o -z "$DISTCHECK" ]; then
+mkdir -p ${DEPLOY_DIR}
+
+if [ -z "$DISTCHECK" ]; then
     make && make check
 else
     make && make dist && make distcheck
 
-    mkdir -p ${DEPLOY_DIR}
     cp -a workrave*tar.gz ${DEPLOY_DIR}
 fi
+
+ls -la ${DEPLOY_DIR}

build/travis/config.sh

@@ -1,9 +1,11 @@
 if [ -d /workspace ]; then
+    echo "Running in Docker env."
     ROOT_DIR=/workspace
     SOURCES_DIR=${ROOT_DIR}/source
 
     ISCC=${ROOT_DIR}/inno/app/ISCC.exe
 else
+    echo "Running in Travis env."
     SOURCES_DIR=${TRAVIS_BUILD_DIR}
 fi
 
@@ -15,4 +17,3 @@ MINGW_ENV=${SOURCES_DIR}/build/travis/mingw-env
 
 export DEBFULLNAME="Rob Caelers"
 export DEBEMAIL="[email protected]"
-

build/travis/ppa.sh

@@ -100,6 +100,6 @@ do
     else
         echo "Tag build : $TRAVIS_TAG"
         cd "$BUILD_DIR/$series"
-        dput workraveppa workrave_*_source.changes
+        dput -d workraveppa workrave_*_source.changes
     fi
 done