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

[Alberts Muktupāvels]

Remove unity configuration, will be added back in unity.

[Dmitry Shachnev (mitya57)]

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

[lp:~muktupavels/compiz/remove-unity-config]

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

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

[Alberts Muktupāvels (muktupavels)]

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

Done.

[Dmitry Shachnev (mitya57)]

review: Approve

[lp:~muktupavels/compiz/remove-unity-config]

4211. By Alberts Muktupāvels on 2019-02-08

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

=== 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 @@
 integration = false
 plugin_list_autosort = true
 profile = mate
-
-[general_ubuntu]
-backend = gsettings
-integration = true
-plugin_list_autosort = true
-profile = unity
-
-[general_ubuntu-lowgfx]
-backend = gsettings
-integration = true
-plugin_list_autosort = true
-profile = unity-lowgfx

=== 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 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2016 Canonical
-#
-# Authors:
-#  Marco Trevisan <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/{}/plugins/core/"
-UNITY_PROFILES = ["unity", "unity-lowgfx"]
-ACTIVE_PLUGINS_KEY = "active-plugins"
-OBSOLETE_PLUGINS = ["decor", "gnomecompat", "scalefilter"]
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-for profile in UNITY_PROFILES:
-    core_profile_path = COMPIZ_CORE_PATH.format(profile)
-    core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=core_profile_path)
-    active_plugins = core_settings.get_strv(ACTIVE_PLUGINS_KEY)
-
-    for plugin in OBSOLETE_PLUGINS:
-        if not plugin in active_plugins:
-            print("No '{}' plugin active in '{}' profile, no migration needed".format(plugin, profile))
-            continue
-
-        try:
-            active_plugins.remove(plugin)
-        except ValueError:
-            pass
-
-        core_settings.set_strv(ACTIVE_PLUGINS_KEY, active_plugins)
-        Gio.Settings.sync()
-
-        # Sometimes settings don't get written correctly, so in case we fallback to dconf
-        if core_settings.get_strv(ACTIVE_PLUGINS_KEY) != active_plugins:
-            try:
-                from subprocess import Popen, PIPE, STDOUT
-                p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-                p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))
-            except:
-                pass

=== 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 @@
 debian/65compiz_profile-on-session /etc/X11/Xsession.d
-debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
-debian/unity*.ini /etc/compizconfig/
 postinst/convert-files/*.convert usr/lib/compiz/migration/
 usr/bin/gtk-window-decorator
 usr/lib/*/compizconfig/backends/libgsettings.so

=== 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 @@
-debian/00_remove_obsolete_plugins_in_unity_session_v3.py

=== 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 @@
 Uploaders: David Nusinow <[e-mail]>, Sean Finney <[e-mail]>, Cyril Brulebois <[e-mail]>
 Build-Depends: cmake (>= 3.10.0),
                debhelper (>= 9~),
-               dh-migrations,
                dh-python,
                dh-translations,
                googletest (>= 1.8.0),
@@ -159,6 +158,7 @@
           libcompizconfig0 (<= 1:0.9.8),
 Breaks: compiz-plugins-main (<= 1:0.9.8),
         compiz-plugins-main-default (<= 1:0.9.8),
+        unity (<< 7.5.0+19.04.20190208-0ubuntu1~),
 Description: OpenGL window and compositing manager - GNOME window decorator
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users

=== 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 @@
-[grid]
-+s0_animation_duration = 0
-+s0_draw_stretched_window = false
-
-[move]
-+s0_mode = 2
-+s0_increase_border_contrast = true
-+s0_lazy_positioning = true
-
-[resize]
-+s0_mode = 2
-+s0_increase_border_contrast = true

=== 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 @@
-[core]
--s0_active_plugins = staticswitcher
-
-[unityshell]
-+s0_alt_tab_timeout = true

=== 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 @@
-[expo]
-+s0_distance = 0.005
-+s0_vp_brightness = 40.0
-+s0_vp_saturation = 40.0
-+s0_vp_distance = 0.2
-+s0_reflection = false
-+s0_x_offset = 64
-+s0_y_offset = 24

=== 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 @@
-[core]
-+s0_active_plugins = copytex

=== 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 @@
-[core]
--s0_active_plugins = decor

=== 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 @@
-[scale]
-+s0_speed = 5.0
-+s0_spacing = 20

=== 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 @@
-[core]
--s0_active_plugins = scalefilter

=== 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 @@
-[core]
--s0_active_plugins = gnomecompat

=== 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 @@
 	dh_auto_test --no-parallel
 
 %:
-	dh $@ --parallel --with python3,migrations,translations
+	dh $@ --parallel --with python3,translations

=== 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 @@
-[core]
-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
-
-[ezoom]
-s0_speed = 100
-
-[expo]
-s0_expo_animation = 3
-
-[fade]
-s0_fade_mode = 1
-s0_fade_time = 1
-
-[grid]
-s0_animation_duration = 0
-s0_draw_stretched_window = false
-
-[move]
-s0_mode = 2
-s0_lazy_positioning = true
-s0_increase_border_contrast = true
-
-[resize]
-s0_mode = 2
-s0_increase_border_contrast = true
-
-[opengl]
-s0_texture_filter = 0
-
-[scale]
-s0_skip_animation = true
-
-[unityshell]
-s0_dash_blur_experimental = 0
-
-s0_override_decoration_theme = true
-s0_shadow_x_offset = 1
-s0_shadow_y_offset = 1
-s0_active_shadow_radius = 3
-s0_inactive_shadow_radius = 2
-
-s0_menus_fadein = 0
-s0_menus_fadeout = 0
-s0_menus_discovery_fadein = 0
-s0_menus_discovery_fadeout = 0
-
-s0_autohide_animation = 1
-
-[wall]
-s0_slide_duration = 0
-
-[showdesktop]
-s0_skip_animation = true

=== 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 @@
-[core]
-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