> This is the jenkins error: > patching file plugins/expo/src/wall_offset/tests/test-expo-wall-offset.cpp > patching file plugins/expo/CMakeLists.txt > Hunk #1 FAILED at 1. > 1 out of 1 hunk FAILED -- rejects in file plugins/expo/CMakeLists.txt > patching file plugins/expo/src/windows_on_viewport/CMakeLists.txt > patching file plugins/expo/src/windows_on_viewport/include/windows-on- > viewport.h > patching file plugins/expo/src/windows_on_viewport/src/windows-on-viewport.cpp > patching file plugins/expo/src/windows_on_viewport/tests/CMakeLists.txt > patching file plugins/expo/src/windows_on_viewport/tests/test-windows-on- > viewport.cpp > patching file plugins/expo/src/client-list-generator.h > patching file plugins/expo/src/viewport-member-window.h > Patch 100_expo_layout.patch does not apply (enforce with -f) > dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit > code 1 > make[1]: *** [override_dh_quilt_patch] Error 1 > make[1]: Leaving directory `/tmp/buildd/compiz-0.9.8.2+bzr3377' > make: *** [build] Error 2 > dpkg-buildpackage: error: debian/rules build gave erro
Hmm, this branch doesn't touch the expo plugin, so that error is suprising. However, maybe trunk has broken CI. I'll look into it.
« Back to merge proposal
> This is the jenkins error: expo/src/ wall_offset/ tests/test- expo-wall- offset. cpp expo/CMakeLists .txt expo/CMakeLists .txt expo/src/ windows_ on_viewport/ CMakeLists. txt expo/src/ windows_ on_viewport/ include/ windows- on- expo/src/ windows_ on_viewport/ src/windows- on-viewport. cpp expo/src/ windows_ on_viewport/ tests/CMakeList s.txt expo/src/ windows_ on_viewport/ tests/test- windows- on- expo/src/ client- list-generator. h expo/src/ viewport- member- window. h layout. patch does not apply (enforce with -f) dh_quilt_ patch] Error 1 compiz- 0.9.8.2+ bzr3377'
> patching file plugins/
> patching file plugins/
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- rejects in file plugins/
> patching file plugins/
> patching file plugins/
> viewport.h
> patching file plugins/
> patching file plugins/
> patching file plugins/
> viewport.cpp
> patching file plugins/
> patching file plugins/
> Patch 100_expo_
> dh_quilt_patch: quilt --quiltrc /dev/null push -a || test $? = 2 returned exit
> code 1
> make[1]: *** [override_
> make[1]: Leaving directory `/tmp/buildd/
> make: *** [build] Error 2
> dpkg-buildpackage: error: debian/rules build gave erro
Hmm, this branch doesn't touch the expo plugin, so that error is suprising. However, maybe trunk has broken CI. I'll look into it.