Merge lp:~unity-team/unity-control-center/x-sru3 into lp:unity-control-center

Proposed by Marco Trevisan (Treviño) on 2016-07-05
Status: Merged
Merge reported by: Marco Trevisan (Treviño)
Merged at revision: not available
Proposed branch: lp:~unity-team/unity-control-center/x-sru3
Merge into: lp:unity-control-center
Diff against target: 133 lines (+54/-5) (has conflicts)
4 files modified
debian/changelog (+31/-0)
debian/control (+1/-1)
panels/appearance/cc-appearance-panel.c (+21/-3)
panels/info/cc-info-panel.c (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~unity-team/unity-control-center/x-sru3
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-07-05 Needs Fixing on 2016-07-13
Review via email: mp+299173@code.launchpad.net

Commit message

Releasing Xenial SRU3

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks, looks fine but there is a merge conflict in the changelog, it should also probably target lp:unity-control-center/16.04 and not trunk

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-05-25 09:49:04 +0000
3+++ debian/changelog 2016-07-05 14:44:57 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 unity-control-center (15.04.0+16.10.20160525.1-0ubuntu1) yakkety; urgency=medium
7
8 [ Kai-Heng Feng ]
9@@ -16,6 +17,36 @@
10
11 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 14:12:08 +0000
12
13+=======
14+unity-control-center (15.04.0+16.04.20160413-0ubuntu4) UNRELEASED; urgency=medium
15+
16+ [ Trent Lloyd ]
17+ * Fix crash when application supports no mime-type (LP: #1304388)
18+
19+ [ Marco Trevisan (Treviño) ]
20+ * CcAppearancePanel: read COMPIZ_CONFIG_PROFILE value to choose the
21+ right settings path (LP: #1598770)
22+
23+ -- Trent Lloyd <trent.lloyd@canonical.com> Tue, 05 Jul 2016 16:42:41 +0200
24+
25+unity-control-center (15.04.0+16.04.20160413-0ubuntu3) xenial; urgency=medium
26+
27+ * panels/bluetooth/gnome-bluetooth/wizard/main.c:
28+ - backport fix for making pairing of old bluetooth keyboard work,
29+ thanks Kai-Heng Feng and Maurizio Gobbo (lp: #1492443)
30+
31+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 24 May 2016 16:30:41 +0200
32+
33+unity-control-center (15.04.0+16.04.20160413-0ubuntu2) xenial; urgency=medium
34+
35+ * bluetooh: remove leftover "browse" button, the backend used was
36+ removed during the bluez5 update and the panel callbacks were
37+ cleaned out, the button is doing nothing else than confusing users
38+ (LP: #1562822)
39+
40+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 17:48:47 +0200
41+
42+>>>>>>> MERGE-SOURCE
43 unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium
44
45 * remove the migration script, it was only needed for trusty updates
46
47=== modified file 'debian/control'
48--- debian/control 2016-03-18 17:37:59 +0000
49+++ debian/control 2016-07-05 14:44:57 +0000
50@@ -58,7 +58,7 @@
51 libwebkit2gtk-4.0-dev,
52 libgl1-mesa-dev,
53 valac (>= 0.20.0),
54-Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk
55+Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/16.04
56
57 Package: unity-control-center
58 Architecture: any
59
60=== modified file 'panels/appearance/cc-appearance-panel.c'
61--- panels/appearance/cc-appearance-panel.c 2016-01-28 16:15:49 +0000
62+++ panels/appearance/cc-appearance-panel.c 2016-07-05 14:44:57 +0000
63@@ -99,7 +99,7 @@
64 };
65
66 #define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
67-#define UNITY_PROFILE_PATH "/org/compiz/profiles/unity/plugins/"
68+#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
69 #define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"
70 #define UNITY_ICONSIZE_KEY "icon-size"
71 #define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"
72@@ -1848,6 +1848,19 @@
73
74 /* </hacks> */
75
76+static gchar *
77+compiz_profile_gsettings_path (const gchar *path)
78+{
79+ const gchar *profile = "unity";
80+
81+ if (g_strcmp0 (g_getenv ("COMPIZ_CONFIG_PROFILE"), "ubuntu-lowgfx") == 0)
82+ {
83+ profile = "unity-lowgfx";
84+ }
85+
86+ return g_strdup_printf (path, profile);
87+}
88+
89 static void
90 setup_unity_settings (CcAppearancePanel *self)
91 {
92@@ -1858,6 +1871,7 @@
93 GtkScale* launcher_sensitivity_scale;
94 GSettingsSchema *schema;
95 GSettingsSchemaSource* source;
96+ gchar *settings_path;
97
98 source = g_settings_schema_source_get_default ();
99 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
100@@ -1875,14 +1889,18 @@
101 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
102 if (schema)
103 {
104- priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH);
105+ settings_path = compiz_profile_gsettings_path (UNITY_GSETTINGS_PATH);
106+ priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, settings_path);
107 g_settings_schema_unref (schema);
108+ g_free (settings_path);
109 }
110 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
111 if (schema)
112 {
113- priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, COMPIZCORE_GSETTINGS_PATH);
114+ settings_path = compiz_profile_gsettings_path (COMPIZCORE_GSETTINGS_PATH);
115+ priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, settings_path);
116 g_settings_schema_unref (schema);
117+ g_free (settings_path);
118 }
119
120 if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings || !priv->unity_launcher_settings)
121
122=== modified file 'panels/info/cc-info-panel.c'
123--- panels/info/cc-info-panel.c 2016-03-09 22:06:07 +0000
124+++ panels/info/cc-info-panel.c 2016-07-05 14:44:57 +0000
125@@ -813,7 +813,7 @@
126 pattern = g_pattern_spec_new (app_data->extra_type_filter);
127 mime_types = g_app_info_get_supported_types (info);
128
129- for (i = 0; mime_types[i]; i++)
130+ for (i = 0; mime_types && mime_types[i]; i++)
131 {
132 if (!g_pattern_match_string (pattern, mime_types[i]))
133 continue;

Subscribers

People subscribed via source and target branches