lp:~3v1n0/compiz/apply-debian-patches-upstream

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.12 at revision 3981

Andrea Azzarone: Approve on 2015-10-15

PS Jenkins bot: Pending (continuous-integration) requested 2015-10-15

Diff: 2566 lines (+238/-1494)

31 files modified

compizconfig/ccsm/ccm/Constants.py.in (+6/-0)
compizconfig/ccsm/ccm/Settings.py (+2/-10)
compizconfig/ccsm/ccm/Widgets.py (+41/-1)
compizconfig/ccsm/ccsm (+9/-1)
compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml (+6/-0)
debian/changelog (+6/-0)
debian/patches/100_workaround_virtualbox_hang.patch (+0/-175)
debian/patches/ccsm_add_first_run_warning.patch (+0/-105)
debian/patches/ccsm_disable_unity_checkbox.patch (+0/-20)
debian/patches/ccsm_remove_redundant_sliders.patch (+0/-38)
debian/patches/series (+0/-7)
debian/patches/ubuntu-config.patch (+0/-886)
debian/patches/ubuntu_super_p.patch (+0/-30)
debian/patches/unity_support_test.patch (+0/-90)
debian/rules (+1/-20)
metadata/core.xml.in (+6/-6)
plugins/animation/animation.xml.in (+20/-20)
plugins/commands/commands.xml.in (+2/-1)
plugins/decor/decor.xml.in (+4/-4)
plugins/expo/expo.xml.in (+10/-10)
plugins/ezoom/ezoom.xml.in (+4/-4)
plugins/fade/fade.xml.in (+2/-1)
plugins/gnomecompat/gnomecompat.xml.in (+1/-0)
plugins/grid/grid.xml.in (+2/-2)
plugins/resize/resize.xml.in (+8/-8)
plugins/scale/scale.xml.in (+9/-11)
plugins/staticswitcher/staticswitcher.xml.in (+8/-9)
plugins/vpswitch/vpswitch.xml.in (+0/-2)
plugins/wall/wall.xml.in (+32/-32)
src/plugin.cpp (+58/-0)
tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3991. By Marco Trevisan (Treviño) on 2015-10-15

debian/changelog: Syncing changelog with proposed

3990. By Marco Trevisan (Treviño) on 2015-10-15

debian/rules: remove quilt usage

3989. By Marco Trevisan (Treviño) on 2015-10-15

Remove debug code

3988. By Marco Trevisan (Treviño) on 2015-10-15

Remove virtualbox workaround patch

This shouldn't be needed anymore as it was a temporary fix for LP:1127866

3987. By Marco Trevisan (Treviño) on 2015-10-15

debian/patches: remove them all, we now apply them uptream

3986. By Marco Trevisan (Treviño) on 2015-10-15

Apply debian/patches/100_workaround_virtualbox_hang.patch

3985. By Marco Trevisan (Treviño) on 2015-10-15

Apply debian/patches/unity_support_test.patch

3984. By Marco Trevisan (Treviño) on 2015-10-15

Apply patch debian/patches/ccsm_disable_unity_checkbox.patch

Added a fix to use XDG_CURRENT_DESKTOP

3983. By Marco Trevisan (Treviño) on 2015-10-15

Apply debian/patches/ccsm_add_first_run_warning.patch

3982. By Marco Trevisan (Treviño) on 2015-10-15

Apply debian/patches/ccsm_remove_redundant_sliders.patch