Merge lp:~muktupavels/compiz/remove-unity-config into lp:compiz/0.9.13

Proposed by Alberts Muktupāvels on 2019-02-06
Status: Merged
Approved by: Dmitry Shachnev on 2019-02-08
Approved revision: 4211
Merged at revision: 4210
Proposed branch: lp:~muktupavels/compiz/remove-unity-config
Merge into: lp:compiz/0.9.13
Prerequisite: lp:~muktupavels/compiz/config
Diff against target: 272 lines (+2/-167)
16 files modified
compizconfig/libcompizconfig/config/config.conf (+0/-12)
debian/00_remove_obsolete_plugins_in_unity_session_v3.py (+0/-59)
debian/compiz-gnome.install (+0/-2)
debian/compiz-gnome.migrations (+0/-1)
debian/control (+1/-1)
debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade (+0/-12)
debian/profile_upgrades/com.canonical.unity.unity.01.upgrade (+0/-5)
debian/profile_upgrades/com.canonical.unity.unity.02.upgrade (+0/-8)
debian/profile_upgrades/com.canonical.unity.unity.03.upgrade (+0/-2)
debian/profile_upgrades/com.canonical.unity.unity.04.upgrade (+0/-2)
debian/profile_upgrades/com.canonical.unity.unity.05.upgrade (+0/-3)
debian/profile_upgrades/com.canonical.unity.unity.06.upgrade (+0/-2)
debian/profile_upgrades/com.canonical.unity.unity.07.upgrade (+0/-2)
debian/rules (+1/-1)
debian/unity-lowgfx.ini (+0/-53)
debian/unity.ini (+0/-2)
To merge this branch: bzr merge lp:~muktupavels/compiz/remove-unity-config
Reviewer Review Type Date Requested Status
Dmitry Shachnev 2019-02-06 Approve on 2019-02-07
Marco Trevisan (Treviño) 2019-02-06 Pending
Khurshid Alam 2019-02-06 Pending
Review via email: mp+362802@code.launchpad.net

Commit message

Remove unity configuration, will be added back in unity.

To post a comment you must log in.
Dmitry Shachnev (mitya57) wrote :

Now you can remove dh-migrations from Build-Depends.

4210. By Alberts Muktupāvels on 2019-02-07

Remove unity config, these files will be added back in unity.

Alberts Muktupāvels (muktupavels) wrote :

> Now you can remove dh-migrations from Build-Depends.

Done.

Dmitry Shachnev (mitya57) :
review: Approve
4211. By Alberts Muktupāvels on 2019-02-08

Add breaks on unity to prevent compiz upgrade without upgrading unity.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'compizconfig/libcompizconfig/config/config.conf'
--- compizconfig/libcompizconfig/config/config.conf 2019-02-08 11:08:34 +0000
+++ compizconfig/libcompizconfig/config/config.conf 2019-02-08 11:08:34 +0000
@@ -13,15 +13,3 @@
13integration = false13integration = false
14plugin_list_autosort = true14plugin_list_autosort = true
15profile = mate15profile = mate
16
17[general_ubuntu]
18backend = gsettings
19integration = true
20plugin_list_autosort = true
21profile = unity
22
23[general_ubuntu-lowgfx]
24backend = gsettings
25integration = true
26plugin_list_autosort = true
27profile = unity-lowgfx
2816
=== removed file 'debian/00_remove_obsolete_plugins_in_unity_session_v3.py'
--- debian/00_remove_obsolete_plugins_in_unity_session_v3.py 2016-08-01 10:02:24 +0000
+++ debian/00_remove_obsolete_plugins_in_unity_session_v3.py 1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
1#!/usr/bin/python3
2# -*- coding: utf-8 -*-
3# Copyright (C) 2016 Canonical
4#
5# Authors:
6# Marco Trevisan <marco.trevisan@canonical.com>
7#
8# This program is free software; you can redistribute it and/or modify it under
9# the terms of the GNU General Public License as published by the Free Software
10# Foundation; version 3.
11#
12# This program is distributed in the hope that it will be useful, but WITHOUTa
13# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
14# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
15# details.
16#
17# You should have received a copy of the GNU General Public License along with
18# this program; if not, write to the Free Software Foundation, Inc.,
19# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
21from gi.repository import Gio
22import os,sys
23
24COMPIZ_SCHEMA = "org.compiz"
25COMPIZ_CORE_PATH = "/org/compiz/profiles/{}/plugins/core/"
26UNITY_PROFILES = ["unity", "unity-lowgfx"]
27ACTIVE_PLUGINS_KEY = "active-plugins"
28OBSOLETE_PLUGINS = ["decor", "gnomecompat", "scalefilter"]
29
30if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
31 print("No compiz schemas found, no migration needed")
32 sys.exit(0)
33
34for profile in UNITY_PROFILES:
35 core_profile_path = COMPIZ_CORE_PATH.format(profile)
36 core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=core_profile_path)
37 active_plugins = core_settings.get_strv(ACTIVE_PLUGINS_KEY)
38
39 for plugin in OBSOLETE_PLUGINS:
40 if not plugin in active_plugins:
41 print("No '{}' plugin active in '{}' profile, no migration needed".format(plugin, profile))
42 continue
43
44 try:
45 active_plugins.remove(plugin)
46 except ValueError:
47 pass
48
49 core_settings.set_strv(ACTIVE_PLUGINS_KEY, active_plugins)
50 Gio.Settings.sync()
51
52 # Sometimes settings don't get written correctly, so in case we fallback to dconf
53 if core_settings.get_strv(ACTIVE_PLUGINS_KEY) != active_plugins:
54 try:
55 from subprocess import Popen, PIPE, STDOUT
56 p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
57 p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
58 except:
59 pass
600
=== modified file 'debian/compiz-gnome.install'
--- debian/compiz-gnome.install 2019-02-05 01:33:12 +0000
+++ debian/compiz-gnome.install 2019-02-08 11:08:34 +0000
@@ -1,6 +1,4 @@
1debian/65compiz_profile-on-session /etc/X11/Xsession.d1debian/65compiz_profile-on-session /etc/X11/Xsession.d
2debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
3debian/unity*.ini /etc/compizconfig/
4postinst/convert-files/*.convert usr/lib/compiz/migration/2postinst/convert-files/*.convert usr/lib/compiz/migration/
5usr/bin/gtk-window-decorator3usr/bin/gtk-window-decorator
6usr/lib/*/compizconfig/backends/libgsettings.so4usr/lib/*/compizconfig/backends/libgsettings.so
75
=== removed file 'debian/compiz-gnome.migrations'
--- debian/compiz-gnome.migrations 2016-08-01 10:02:24 +0000
+++ debian/compiz-gnome.migrations 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1debian/00_remove_obsolete_plugins_in_unity_session_v3.py
20
=== modified file 'debian/control'
--- debian/control 2019-02-05 16:33:02 +0000
+++ debian/control 2019-02-08 11:08:34 +0000
@@ -6,7 +6,6 @@
6Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>6Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>
7Build-Depends: cmake (>= 3.10.0),7Build-Depends: cmake (>= 3.10.0),
8 debhelper (>= 9~),8 debhelper (>= 9~),
9 dh-migrations,
10 dh-python,9 dh-python,
11 dh-translations,10 dh-translations,
12 googletest (>= 1.8.0),11 googletest (>= 1.8.0),
@@ -159,6 +158,7 @@
159 libcompizconfig0 (<= 1:0.9.8),158 libcompizconfig0 (<= 1:0.9.8),
160Breaks: compiz-plugins-main (<= 1:0.9.8),159Breaks: compiz-plugins-main (<= 1:0.9.8),
161 compiz-plugins-main-default (<= 1:0.9.8),160 compiz-plugins-main-default (<= 1:0.9.8),
161 unity (<< 7.5.0+19.04.20190208-0ubuntu1~),
162Description: OpenGL window and compositing manager - GNOME window decorator162Description: OpenGL window and compositing manager - GNOME window decorator
163 Compiz brings to life a variety of visual effects that make the Linux desktop163 Compiz brings to life a variety of visual effects that make the Linux desktop
164 easier to use, more powerful and intuitive, and more accessible for users164 easier to use, more powerful and intuitive, and more accessible for users
165165
=== removed directory 'debian/profile_upgrades'
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade 2017-07-20 09:53:59 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1[grid]
2+s0_animation_duration = 0
3+s0_draw_stretched_window = false
4
5[move]
6+s0_mode = 2
7+s0_increase_border_contrast = true
8+s0_lazy_positioning = true
9
10[resize]
11+s0_mode = 2
12+s0_increase_border_contrast = true
130
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.01.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.01.upgrade 2012-06-19 11:22:48 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.01.upgrade 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1[core]
2-s0_active_plugins = staticswitcher
3
4[unityshell]
5+s0_alt_tab_timeout = true
60
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.02.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.02.upgrade 2012-06-19 11:22:48 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.02.upgrade 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1[expo]
2+s0_distance = 0.005
3+s0_vp_brightness = 40.0
4+s0_vp_saturation = 40.0
5+s0_vp_distance = 0.2
6+s0_reflection = false
7+s0_x_offset = 64
8+s0_y_offset = 24
90
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.03.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.03.upgrade 2013-02-17 07:28:12 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.03.upgrade 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1[core]
2+s0_active_plugins = copytex
30
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.04.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.04.upgrade 2014-02-09 18:02:04 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.04.upgrade 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1[core]
2-s0_active_plugins = decor
30
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.05.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.05.upgrade 2014-02-17 20:56:15 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.05.upgrade 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1[scale]
2+s0_speed = 5.0
3+s0_spacing = 20
40
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.06.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.06.upgrade 2014-02-17 20:57:18 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.06.upgrade 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1[core]
2-s0_active_plugins = scalefilter
30
=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.07.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity.07.upgrade 2014-03-10 15:21:11 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity.07.upgrade 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1[core]
2-s0_active_plugins = gnomecompat
30
=== modified file 'debian/rules'
--- debian/rules 2019-02-08 11:08:34 +0000
+++ debian/rules 2019-02-08 11:08:34 +0000
@@ -63,4 +63,4 @@
63 dh_auto_test --no-parallel63 dh_auto_test --no-parallel
6464
65%:65%:
66 dh $@ --parallel --with python3,migrations,translations66 dh $@ --parallel --with python3,translations
6767
=== removed file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini 2017-11-16 03:04:35 +0000
+++ debian/unity-lowgfx.ini 1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
1[core]
2s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell
3
4[ezoom]
5s0_speed = 100
6
7[expo]
8s0_expo_animation = 3
9
10[fade]
11s0_fade_mode = 1
12s0_fade_time = 1
13
14[grid]
15s0_animation_duration = 0
16s0_draw_stretched_window = false
17
18[move]
19s0_mode = 2
20s0_lazy_positioning = true
21s0_increase_border_contrast = true
22
23[resize]
24s0_mode = 2
25s0_increase_border_contrast = true
26
27[opengl]
28s0_texture_filter = 0
29
30[scale]
31s0_skip_animation = true
32
33[unityshell]
34s0_dash_blur_experimental = 0
35
36s0_override_decoration_theme = true
37s0_shadow_x_offset = 1
38s0_shadow_y_offset = 1
39s0_active_shadow_radius = 3
40s0_inactive_shadow_radius = 2
41
42s0_menus_fadein = 0
43s0_menus_fadeout = 0
44s0_menus_discovery_fadein = 0
45s0_menus_discovery_fadeout = 0
46
47s0_autohide_animation = 1
48
49[wall]
50s0_slide_duration = 0
51
52[showdesktop]
53s0_skip_animation = true
540
=== removed file 'debian/unity.ini'
--- debian/unity.ini 2017-07-20 09:53:59 +0000
+++ debian/unity.ini 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1[core]
2s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;commands;unityshell

Subscribers

People subscribed via source and target branches