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
1=== modified file 'compizconfig/libcompizconfig/config/config.conf'
2--- compizconfig/libcompizconfig/config/config.conf 2019-02-08 11:08:34 +0000
3+++ compizconfig/libcompizconfig/config/config.conf 2019-02-08 11:08:34 +0000
4@@ -13,15 +13,3 @@
5 integration = false
6 plugin_list_autosort = true
7 profile = mate
8-
9-[general_ubuntu]
10-backend = gsettings
11-integration = true
12-plugin_list_autosort = true
13-profile = unity
14-
15-[general_ubuntu-lowgfx]
16-backend = gsettings
17-integration = true
18-plugin_list_autosort = true
19-profile = unity-lowgfx
20
21=== removed file 'debian/00_remove_obsolete_plugins_in_unity_session_v3.py'
22--- debian/00_remove_obsolete_plugins_in_unity_session_v3.py 2016-08-01 10:02:24 +0000
23+++ debian/00_remove_obsolete_plugins_in_unity_session_v3.py 1970-01-01 00:00:00 +0000
24@@ -1,59 +0,0 @@
25-#!/usr/bin/python3
26-# -*- coding: utf-8 -*-
27-# Copyright (C) 2016 Canonical
28-#
29-# Authors:
30-# Marco Trevisan <marco.trevisan@canonical.com>
31-#
32-# This program is free software; you can redistribute it and/or modify it under
33-# the terms of the GNU General Public License as published by the Free Software
34-# Foundation; version 3.
35-#
36-# This program is distributed in the hope that it will be useful, but WITHOUTa
37-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
38-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
39-# details.
40-#
41-# You should have received a copy of the GNU General Public License along with
42-# this program; if not, write to the Free Software Foundation, Inc.,
43-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
44-
45-from gi.repository import Gio
46-import os,sys
47-
48-COMPIZ_SCHEMA = "org.compiz"
49-COMPIZ_CORE_PATH = "/org/compiz/profiles/{}/plugins/core/"
50-UNITY_PROFILES = ["unity", "unity-lowgfx"]
51-ACTIVE_PLUGINS_KEY = "active-plugins"
52-OBSOLETE_PLUGINS = ["decor", "gnomecompat", "scalefilter"]
53-
54-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
55- print("No compiz schemas found, no migration needed")
56- sys.exit(0)
57-
58-for profile in UNITY_PROFILES:
59- core_profile_path = COMPIZ_CORE_PATH.format(profile)
60- core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=core_profile_path)
61- active_plugins = core_settings.get_strv(ACTIVE_PLUGINS_KEY)
62-
63- for plugin in OBSOLETE_PLUGINS:
64- if not plugin in active_plugins:
65- print("No '{}' plugin active in '{}' profile, no migration needed".format(plugin, profile))
66- continue
67-
68- try:
69- active_plugins.remove(plugin)
70- except ValueError:
71- pass
72-
73- core_settings.set_strv(ACTIVE_PLUGINS_KEY, active_plugins)
74- Gio.Settings.sync()
75-
76- # Sometimes settings don't get written correctly, so in case we fallback to dconf
77- if core_settings.get_strv(ACTIVE_PLUGINS_KEY) != active_plugins:
78- try:
79- from subprocess import Popen, PIPE, STDOUT
80- p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
81- p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
82- except:
83- pass
84
85=== modified file 'debian/compiz-gnome.install'
86--- debian/compiz-gnome.install 2019-02-05 01:33:12 +0000
87+++ debian/compiz-gnome.install 2019-02-08 11:08:34 +0000
88@@ -1,6 +1,4 @@
89 debian/65compiz_profile-on-session /etc/X11/Xsession.d
90-debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
91-debian/unity*.ini /etc/compizconfig/
92 postinst/convert-files/*.convert usr/lib/compiz/migration/
93 usr/bin/gtk-window-decorator
94 usr/lib/*/compizconfig/backends/libgsettings.so
95
96=== removed file 'debian/compiz-gnome.migrations'
97--- debian/compiz-gnome.migrations 2016-08-01 10:02:24 +0000
98+++ debian/compiz-gnome.migrations 1970-01-01 00:00:00 +0000
99@@ -1,1 +0,0 @@
100-debian/00_remove_obsolete_plugins_in_unity_session_v3.py
101
102=== modified file 'debian/control'
103--- debian/control 2019-02-05 16:33:02 +0000
104+++ debian/control 2019-02-08 11:08:34 +0000
105@@ -6,7 +6,6 @@
106 Uploaders: David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>, Cyril Brulebois <kibi@debian.org>
107 Build-Depends: cmake (>= 3.10.0),
108 debhelper (>= 9~),
109- dh-migrations,
110 dh-python,
111 dh-translations,
112 googletest (>= 1.8.0),
113@@ -159,6 +158,7 @@
114 libcompizconfig0 (<= 1:0.9.8),
115 Breaks: compiz-plugins-main (<= 1:0.9.8),
116 compiz-plugins-main-default (<= 1:0.9.8),
117+ unity (<< 7.5.0+19.04.20190208-0ubuntu1~),
118 Description: OpenGL window and compositing manager - GNOME window decorator
119 Compiz brings to life a variety of visual effects that make the Linux desktop
120 easier to use, more powerful and intuitive, and more accessible for users
121
122=== removed directory 'debian/profile_upgrades'
123=== removed file 'debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade'
124--- debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade 2017-07-20 09:53:59 +0000
125+++ debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade 1970-01-01 00:00:00 +0000
126@@ -1,12 +0,0 @@
127-[grid]
128-+s0_animation_duration = 0
129-+s0_draw_stretched_window = false
130-
131-[move]
132-+s0_mode = 2
133-+s0_increase_border_contrast = true
134-+s0_lazy_positioning = true
135-
136-[resize]
137-+s0_mode = 2
138-+s0_increase_border_contrast = true
139
140=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.01.upgrade'
141--- debian/profile_upgrades/com.canonical.unity.unity.01.upgrade 2012-06-19 11:22:48 +0000
142+++ debian/profile_upgrades/com.canonical.unity.unity.01.upgrade 1970-01-01 00:00:00 +0000
143@@ -1,5 +0,0 @@
144-[core]
145--s0_active_plugins = staticswitcher
146-
147-[unityshell]
148-+s0_alt_tab_timeout = true
149
150=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.02.upgrade'
151--- debian/profile_upgrades/com.canonical.unity.unity.02.upgrade 2012-06-19 11:22:48 +0000
152+++ debian/profile_upgrades/com.canonical.unity.unity.02.upgrade 1970-01-01 00:00:00 +0000
153@@ -1,8 +0,0 @@
154-[expo]
155-+s0_distance = 0.005
156-+s0_vp_brightness = 40.0
157-+s0_vp_saturation = 40.0
158-+s0_vp_distance = 0.2
159-+s0_reflection = false
160-+s0_x_offset = 64
161-+s0_y_offset = 24
162
163=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.03.upgrade'
164--- debian/profile_upgrades/com.canonical.unity.unity.03.upgrade 2013-02-17 07:28:12 +0000
165+++ debian/profile_upgrades/com.canonical.unity.unity.03.upgrade 1970-01-01 00:00:00 +0000
166@@ -1,2 +0,0 @@
167-[core]
168-+s0_active_plugins = copytex
169
170=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.04.upgrade'
171--- debian/profile_upgrades/com.canonical.unity.unity.04.upgrade 2014-02-09 18:02:04 +0000
172+++ debian/profile_upgrades/com.canonical.unity.unity.04.upgrade 1970-01-01 00:00:00 +0000
173@@ -1,2 +0,0 @@
174-[core]
175--s0_active_plugins = decor
176
177=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.05.upgrade'
178--- debian/profile_upgrades/com.canonical.unity.unity.05.upgrade 2014-02-17 20:56:15 +0000
179+++ debian/profile_upgrades/com.canonical.unity.unity.05.upgrade 1970-01-01 00:00:00 +0000
180@@ -1,3 +0,0 @@
181-[scale]
182-+s0_speed = 5.0
183-+s0_spacing = 20
184
185=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.06.upgrade'
186--- debian/profile_upgrades/com.canonical.unity.unity.06.upgrade 2014-02-17 20:57:18 +0000
187+++ debian/profile_upgrades/com.canonical.unity.unity.06.upgrade 1970-01-01 00:00:00 +0000
188@@ -1,2 +0,0 @@
189-[core]
190--s0_active_plugins = scalefilter
191
192=== removed file 'debian/profile_upgrades/com.canonical.unity.unity.07.upgrade'
193--- debian/profile_upgrades/com.canonical.unity.unity.07.upgrade 2014-03-10 15:21:11 +0000
194+++ debian/profile_upgrades/com.canonical.unity.unity.07.upgrade 1970-01-01 00:00:00 +0000
195@@ -1,2 +0,0 @@
196-[core]
197--s0_active_plugins = gnomecompat
198
199=== modified file 'debian/rules'
200--- debian/rules 2019-02-08 11:08:34 +0000
201+++ debian/rules 2019-02-08 11:08:34 +0000
202@@ -63,4 +63,4 @@
203 dh_auto_test --no-parallel
204
205 %:
206- dh $@ --parallel --with python3,migrations,translations
207+ dh $@ --parallel --with python3,translations
208
209=== removed file 'debian/unity-lowgfx.ini'
210--- debian/unity-lowgfx.ini 2017-11-16 03:04:35 +0000
211+++ debian/unity-lowgfx.ini 1970-01-01 00:00:00 +0000
212@@ -1,53 +0,0 @@
213-[core]
214-s0_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
215-
216-[ezoom]
217-s0_speed = 100
218-
219-[expo]
220-s0_expo_animation = 3
221-
222-[fade]
223-s0_fade_mode = 1
224-s0_fade_time = 1
225-
226-[grid]
227-s0_animation_duration = 0
228-s0_draw_stretched_window = false
229-
230-[move]
231-s0_mode = 2
232-s0_lazy_positioning = true
233-s0_increase_border_contrast = true
234-
235-[resize]
236-s0_mode = 2
237-s0_increase_border_contrast = true
238-
239-[opengl]
240-s0_texture_filter = 0
241-
242-[scale]
243-s0_skip_animation = true
244-
245-[unityshell]
246-s0_dash_blur_experimental = 0
247-
248-s0_override_decoration_theme = true
249-s0_shadow_x_offset = 1
250-s0_shadow_y_offset = 1
251-s0_active_shadow_radius = 3
252-s0_inactive_shadow_radius = 2
253-
254-s0_menus_fadein = 0
255-s0_menus_fadeout = 0
256-s0_menus_discovery_fadein = 0
257-s0_menus_discovery_fadeout = 0
258-
259-s0_autohide_animation = 1
260-
261-[wall]
262-s0_slide_duration = 0
263-
264-[showdesktop]
265-s0_skip_animation = true
266
267=== removed file 'debian/unity.ini'
268--- debian/unity.ini 2017-07-20 09:53:59 +0000
269+++ debian/unity.ini 1970-01-01 00:00:00 +0000
270@@ -1,2 +0,0 @@
271-[core]
272-s0_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