Unity Control Center

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

  1. x-sru3
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
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 Needs Fixing
Review via email: mp+299173@code.launchpad.net

Commit message

Releasing Xenial SRU3

To post a comment you must log in.
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2016-05-25 09:49:04 +0000
+++ debian/changelog 2016-07-05 14:44:57 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1unity-control-center (15.04.0+16.10.20160525.1-0ubuntu1) yakkety; urgency=medium2unity-control-center (15.04.0+16.10.20160525.1-0ubuntu1) yakkety; urgency=medium
23
3 [ Kai-Heng Feng ]4 [ Kai-Heng Feng ]
@@ -16,6 +17,36 @@
1617
17 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 14:12:08 +000018 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 14:12:08 +0000
1819
20=======
21unity-control-center (15.04.0+16.04.20160413-0ubuntu4) UNRELEASED; urgency=medium
22
23 [ Trent Lloyd ]
24 * Fix crash when application supports no mime-type (LP: #1304388)
25
26 [ Marco Trevisan (Treviño) ]
27 * CcAppearancePanel: read COMPIZ_CONFIG_PROFILE value to choose the
28 right settings path (LP: #1598770)
29
30 -- Trent Lloyd <trent.lloyd@canonical.com> Tue, 05 Jul 2016 16:42:41 +0200
31
32unity-control-center (15.04.0+16.04.20160413-0ubuntu3) xenial; urgency=medium
33
34 * panels/bluetooth/gnome-bluetooth/wizard/main.c:
35 - backport fix for making pairing of old bluetooth keyboard work,
36 thanks Kai-Heng Feng and Maurizio Gobbo (lp: #1492443)
37
38 -- Sebastien Bacher <seb128@ubuntu.com> Tue, 24 May 2016 16:30:41 +0200
39
40unity-control-center (15.04.0+16.04.20160413-0ubuntu2) xenial; urgency=medium
41
42 * bluetooh: remove leftover "browse" button, the backend used was
43 removed during the bluez5 update and the panel callbacks were
44 cleaned out, the button is doing nothing else than confusing users
45 (LP: #1562822)
46
47 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 May 2016 17:48:47 +0200
48
49>>>>>>> MERGE-SOURCE
19unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium50unity-control-center (15.04.0+16.04.20160413-0ubuntu1) xenial; urgency=medium
2051
21 * remove the migration script, it was only needed for trusty updates52 * remove the migration script, it was only needed for trusty updates
2253
=== modified file 'debian/control'
--- debian/control 2016-03-18 17:37:59 +0000
+++ debian/control 2016-07-05 14:44:57 +0000
@@ -58,7 +58,7 @@
58 libwebkit2gtk-4.0-dev,58 libwebkit2gtk-4.0-dev,
59 libgl1-mesa-dev,59 libgl1-mesa-dev,
60 valac (>= 0.20.0),60 valac (>= 0.20.0),
61Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk61Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/16.04
6262
63Package: unity-control-center63Package: unity-control-center
64Architecture: any64Architecture: any
6565
=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c 2016-01-28 16:15:49 +0000
+++ panels/appearance/cc-appearance-panel.c 2016-07-05 14:44:57 +0000
@@ -99,7 +99,7 @@
99};99};
100100
101#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"101#define UNITY_GSETTINGS_SCHEMA "org.compiz.unityshell"
102#define UNITY_PROFILE_PATH "/org/compiz/profiles/unity/plugins/"102#define UNITY_PROFILE_PATH "/org/compiz/profiles/%s/plugins/"
103#define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"103#define UNITY_GSETTINGS_PATH UNITY_PROFILE_PATH"unityshell/"
104#define UNITY_ICONSIZE_KEY "icon-size"104#define UNITY_ICONSIZE_KEY "icon-size"
105#define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"105#define UNITY_LAUNCHERSENSITIVITY_KEY "edge-responsiveness"
@@ -1848,6 +1848,19 @@
18481848
1849/* </hacks> */1849/* </hacks> */
18501850
1851static gchar *
1852compiz_profile_gsettings_path (const gchar *path)
1853{
1854 const gchar *profile = "unity";
1855
1856 if (g_strcmp0 (g_getenv ("COMPIZ_CONFIG_PROFILE"), "ubuntu-lowgfx") == 0)
1857 {
1858 profile = "unity-lowgfx";
1859 }
1860
1861 return g_strdup_printf (path, profile);
1862}
1863
1851static void1864static void
1852setup_unity_settings (CcAppearancePanel *self)1865setup_unity_settings (CcAppearancePanel *self)
1853{1866{
@@ -1858,6 +1871,7 @@
1858 GtkScale* launcher_sensitivity_scale;1871 GtkScale* launcher_sensitivity_scale;
1859 GSettingsSchema *schema;1872 GSettingsSchema *schema;
1860 GSettingsSchemaSource* source;1873 GSettingsSchemaSource* source;
1874 gchar *settings_path;
18611875
1862 source = g_settings_schema_source_get_default ();1876 source = g_settings_schema_source_get_default ();
1863 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);1877 schema = g_settings_schema_source_lookup (source, UNITY_OWN_GSETTINGS_SCHEMA, TRUE);
@@ -1875,14 +1889,18 @@
1875 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);1889 schema = g_settings_schema_source_lookup (source, UNITY_GSETTINGS_SCHEMA, TRUE);
1876 if (schema)1890 if (schema)
1877 {1891 {
1878 priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, UNITY_GSETTINGS_PATH);1892 settings_path = compiz_profile_gsettings_path (UNITY_GSETTINGS_PATH);
1893 priv->unity_settings = g_settings_new_with_path (UNITY_GSETTINGS_SCHEMA, settings_path);
1879 g_settings_schema_unref (schema);1894 g_settings_schema_unref (schema);
1895 g_free (settings_path);
1880 }1896 }
1881 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);1897 schema = g_settings_schema_source_lookup (source, COMPIZCORE_GSETTINGS_SCHEMA, TRUE);
1882 if (schema)1898 if (schema)
1883 {1899 {
1884 priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, COMPIZCORE_GSETTINGS_PATH);1900 settings_path = compiz_profile_gsettings_path (COMPIZCORE_GSETTINGS_PATH);
1901 priv->compizcore_settings = g_settings_new_with_path (COMPIZCORE_GSETTINGS_SCHEMA, settings_path);
1885 g_settings_schema_unref (schema);1902 g_settings_schema_unref (schema);
1903 g_free (settings_path);
1886 }1904 }
18871905
1888 if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings || !priv->unity_launcher_settings)1906 if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings || !priv->unity_launcher_settings)
18891907
=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c 2016-03-09 22:06:07 +0000
+++ panels/info/cc-info-panel.c 2016-07-05 14:44:57 +0000
@@ -813,7 +813,7 @@
813 pattern = g_pattern_spec_new (app_data->extra_type_filter);813 pattern = g_pattern_spec_new (app_data->extra_type_filter);
814 mime_types = g_app_info_get_supported_types (info);814 mime_types = g_app_info_get_supported_types (info);
815815
816 for (i = 0; mime_types[i]; i++)816 for (i = 0; mime_types && mime_types[i]; i++)
817 {817 {
818 if (!g_pattern_match_string (pattern, mime_types[i]))818 if (!g_pattern_match_string (pattern, mime_types[i]))
819 continue;819 continue;

Subscribers

People subscribed via source and target branches