diff options
| author | Matteo Nastasi <nastasi@alternativeoutput.it> | 2016-08-15 13:47:14 +0300 |
|---|---|---|
| committer | Matteo Nastasi <nastasi@alternativeoutput.it> | 2016-08-15 13:47:14 +0300 |
| commit | df01ece7441d3ab86647236079e2e883257baab0 (patch) | |
| tree | 527304967d7c9c54b1a645e4b12701e689212273 /.travis.yml | |
| parent | 715b79175a75bd0baeba6379b7d29f1f20719eea (diff) | |
| parent | 97632255c189e5b8c243f6f568c99880d58e1969 (diff) | |
Merge remote-tracking branch 'origin/next' into spice-package
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index efbf3382b..5836aedb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ before_install: - sudo apt-add-repository ppa:remmina-ppa-team/remmina-next -y - sudo apt-get update -qq - sudo apt-get install freerdp-x11 libfreerdp-dev libfreerdp-plugins-standard libfreerdp1 -y - - sudo apt-get install build-essential libssl-dev libx11-dev libxext-dev libxinerama-dev libxcursor-dev libxdamage-dev libxv-dev libxkbfile-dev libasound2-dev libxml2 libxml2-dev libxrandr-dev libxi-dev libxtst-dev libgtk-3-dev libgcrypt11-dev libssh-dev libpulse-dev libvte-2.90-dev libxkbfile-dev libtelepathy-glib-dev libjpeg-dev libgnutls-dev libgnome-keyring-dev libavahi-ui-gtk3-dev libvncserver-dev intltool libwebkit2gtk-3.0-dev libspice-protocol-dev libspice-client-gtk-3.0-dev -y + - sudo aptitude install build-essential git-core cmake libssl-dev libx11-dev libxext-dev libxinerama-dev libxcursor-dev libxdamage-dev libxv-dev libxkbfile-dev libasound2-dev libcups2-dev libxml2 libxml2-dev libxrandr-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libxi-dev libavutil-dev libavcodec-dev libxtst-dev libgtk-3-dev libgcrypt11-dev libssh-dev libpulse-dev libvte-2.90-dev libxkbfile-dev libfreerdp-dev libtelepathy-glib-dev libjpeg-dev libgnutls-dev libgnome-keyring-dev libavahi-ui-gtk3-dev libvncserver-dev libappindicator3-dev intltool libsecret-1-dev libwebkit2gtk-3.0-dev libspice-protocol-dev libspice-client-gtk-3.0-dev script: - git clean -f |