leigh123linux pushed to cinnamon (f20). "Merge branch 'master' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 27 10:24:32 UTC 2015
From 99b4c99642580468105b12442ee8884f97a95710 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Wed, 27 May 2015 11:22:28 +0100
Subject: update to 2.6.3 release
diff --git a/.gitignore b/.gitignore
index c23d6ed..1de9e8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
/Cinnamon-2.6.0.tar.gz
/Cinnamon-2.6.1.tar.gz
/Cinnamon-2.6.2.tar.gz
+/Cinnamon-2.6.3.tar.gz
diff --git a/0001-Power-settings-Don-t-rely-on-output.get_backlight_mi.patch b/0001-Power-settings-Don-t-rely-on-output.get_backlight_mi.patch
deleted file mode 100644
index d6fc549..0000000
--- a/0001-Power-settings-Don-t-rely-on-output.get_backlight_mi.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3bd6dbace263b45da79d692c60f516f3683d9cf5 Mon Sep 17 00:00:00 2001
-From: Clement Lefebvre <clement.lefebvre at linuxmint.com>
-Date: Fri, 22 May 2015 12:53:17 +0200
-Subject: [PATCH 1/4] Power settings: Don't rely on
- output.get_backlight_min|max() to show brightness controls as it's not
- reliable with all hardware. Try to get backlight() info directly to see if
- it's supported instead.
-
----
- files/usr/lib/cinnamon-settings/modules/cs_power.py | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_power.py b/files/usr/lib/cinnamon-settings/modules/cs_power.py
-index f48ec98..52d9a68 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_power.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_power.py
-@@ -173,9 +173,14 @@ class Module:
- screen = CinnamonDesktop.RRScreen.new(Gdk.Screen.get_default())
- outputs = CinnamonDesktop.RRScreen.list_outputs(screen)
- for output in outputs:
-- if (output.is_connected() and output.is_laptop() and output.get_backlight_min() >= 0 and output.get_backlight_max() > 0):
-- primary_output = output
-- break
-+ if (output.is_connected() and output.is_laptop()):
-+ try:
-+ # Try to get the backlight info, if it fails just move on (we used to rely on output.get_backlight_min() and output.get_backlight_max() but these aren't reliable)
-+ output.get_backlight()
-+ primary_output = output
-+ break
-+ except:
-+ pass
- except Exception, detail:
- print "Failed to query backlight information in cs_power module: %s" % detail
-
---
-2.4.1
-
diff --git a/0002-Theme-settings-Fixed-regression-caused-by-gettext-fi.patch b/0002-Theme-settings-Fixed-regression-caused-by-gettext-fi.patch
deleted file mode 100644
index abc89cb..0000000
--- a/0002-Theme-settings-Fixed-regression-caused-by-gettext-fi.patch
+++ /dev/null
@@ -1,691 +0,0 @@
-From cbdce0dfd9110948734ef88480cde0dbc153840e Mon Sep 17 00:00:00 2001
-From: Clement Lefebvre <clement.lefebvre at linuxmint.com>
-Date: Fri, 22 May 2015 13:42:36 +0200
-Subject: [PATCH 2/4] Theme settings: Fixed regression caused by gettext fix ;)
-
----
- cinnamon.pot | 246 +++++++++++----------
- .../usr/lib/cinnamon-settings/bin/ExtensionCore.py | 4 +
- 2 files changed, 131 insertions(+), 119 deletions(-)
-
-diff --git a/cinnamon.pot b/cinnamon.pot
-index 1feefa3..a26b1f4 100644
---- a/cinnamon.pot
-+++ b/cinnamon.pot
-@@ -8,7 +8,7 @@ msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2015-05-21 11:37+0200\n"
-+"POT-Creation-Date: 2015-05-22 13:42+0200\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
- "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -40,7 +40,7 @@ msgstr ""
-
- #: src/cinnamon-util.c:247
- #: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:100
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:326
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:330
- #: files/usr/lib/cinnamon-settings/modules/cs_keyboard.py:182
- msgid "Search"
- msgstr ""
-@@ -253,7 +253,7 @@ msgstr ""
-
- #: js/ui/messageTray.js:1278
- #: files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/applet.js:55
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:602
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:606
- #: files/usr/lib/cinnamon-settings/bin/XletSettings.py:71
- #: files/usr/lib/cinnamon-settings/modules/cs_startup.py:411
- msgid "Remove"
-@@ -399,7 +399,7 @@ msgstr ""
-
- #: js/ui/workspace.js:1495
- #: files/usr/share/cinnamon/applets/window-list at cinnamon.org/applet.js:633
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:989
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:993
- #: files/usr/lib/cinnamon-settings/bin/Spices.py:154
- #: files/usr/lib/cinnamon-settings/modules/cs_default.py:240
- #: files/usr/lib/cinnamon-settings/modules/cs_windows.py:179
-@@ -566,14 +566,14 @@ msgid "Please provide your password to uninstall this application"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js:259
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:184
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:611
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:186
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:615
- msgid "Add to panel"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js:262
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:186
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:613
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:188
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:617
- msgid "Add to desktop"
- msgstr ""
-
-@@ -586,7 +586,7 @@ msgid "Add to favorites"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/menu at cinnamon.org/applet.js:273
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:625
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:629
- msgid "Uninstall"
- msgstr ""
-
-@@ -869,8 +869,8 @@ msgid "Launch"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/applet.js:47
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:192
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:617
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:194
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:621
- #: files/usr/lib/cinnamon-settings/modules/cs_keyboard.py:799
- #: files/usr/lib/cinnamon-settings/modules/cs_startup.py:400
- #: files/usr/lib/cinnamon-settings/modules/cs_startup.py:680
-@@ -891,7 +891,7 @@ msgid "Laptop battery"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:52
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:306
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:311
- msgid "UPS"
- msgstr ""
-
-@@ -920,24 +920,24 @@ msgid "Cell phone"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:64
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:390
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:395
- msgid "Media player"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:66
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:381
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:386
- msgid "Tablet"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:68
- #: files/usr/lib/cinnamon-settings/modules/cs_desktop.py:43
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:393
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:398
- msgid "Computer"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:227
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:397
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:213
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:218
- msgid "Brightness"
- msgstr ""
-
-@@ -989,12 +989,12 @@ msgstr[0] ""
- msgstr[1] ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:293
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:347
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:352
- msgid "Fully charged"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/power at cinnamon.org/applet.js:297
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:331
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:336
- msgid "Using battery power"
- msgstr ""
-
-@@ -1259,8 +1259,8 @@ msgid "Cancel"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/trash at cinnamon.org/applet.js:132
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:335
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:349
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:340
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:354
- msgid "Empty"
- msgstr ""
-
-@@ -1273,7 +1273,7 @@ msgid "System Settings"
- msgstr ""
-
- #: files/usr/share/cinnamon/applets/user at cinnamon.org/applet.js:77
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:482
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:487
- msgid "Lock Screen"
- msgstr ""
-
-@@ -1689,7 +1689,7 @@ msgid "Picture"
- msgstr ""
-
- #: files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py:504
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:304
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:308
- #: files/usr/lib/cinnamon-settings/modules/cs_startup.py:697
- #: files/usr/lib/cinnamon-settings/modules/cs_user.py:62
- #: files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py:152
-@@ -1759,127 +1759,135 @@ msgstr ""
- msgid "Installed extensions"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:188
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:615
--msgid "Add to Cinnamon"
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:110
-+msgid "Installed themes"
- msgstr ""
-
- #: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:190
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:621
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:619
-+msgid "Add to Cinnamon"
-+msgstr ""
-+
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:192
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:625
- msgid "Apply theme"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:198
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:201
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:580
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:587
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:200
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:203
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:584
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:591
- msgid "Configure"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:205
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:207
- msgid "Restore default theme"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:207
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:209
- msgid "Remove all desklets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:209
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:211
- msgid "Disable all extensions"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:211
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:213
- msgid "Restore to default"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:221
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:223
- msgid "All applets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:222
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:224
- msgid "Active applets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:223
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:225
- msgid "Inactive applets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:225
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:227
- msgid "All desklets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:226
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:228
- msgid "Active desklets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:227
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:229
- msgid "Inactive desklets"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:229
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:231
- msgid "All extensions"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:230
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:232
- msgid "Active extensions"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:231
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:233
- msgid "Inactive extensions"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:241
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:243
- #: files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py:165
- msgid "Show"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:292
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:294
- msgid "Available applets (online)"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:294
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:296
- msgid "Available desklets (online)"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:296
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:298
- msgid "Available extensions (online)"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:305
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:542
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:300
-+msgid "Available themes (online)"
-+msgstr ""
-+
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:309
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:546
- msgid "Popularity"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:306
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:310
- #: files/usr/lib/cinnamon-settings/modules/cs_screensaver.py:107
- msgid "Date"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:317
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:321
- msgid "Sort by"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:401
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:405
- msgid "Install or update selected items"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:403
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:407
- msgid "Select updated"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:405
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:409
- msgid "Refresh list"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:507
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:511
- msgid "Cannot be uninstalled"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:515
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:519
- msgid "In use"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:517
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:521
- #, python-format
- msgid ""
- "\n"
-@@ -1887,60 +1895,60 @@ msgid ""
- "Instance count: %d"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:521
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:525
- msgid ""
- "Problem loading - please check Looking Glass or your system's error log"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:537
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:541
- msgid "Update available"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:539
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:543
- msgid "Installed and up-to-date"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:596
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:600
- msgid "Remove from panel"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:598
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:602
- msgid "Remove from desktop"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:600
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:604
- msgid "Remove from Cinnamon"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:751
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:755
- msgid "Unmark"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:757
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:761
- msgid "Mark for upgrade"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:759
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:763
- msgid "Mark for installation"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:763
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:785
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:767
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:789
- msgid "More info"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:896
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:900
- msgid "Please restart Cinnamon for the changes to take effect"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:947
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:951
- #, python-format
- msgid ""
- "Extension %s is not compatible with current version of cinnamon. Using it "
- "may break your system. Load anyway?"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:975
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:979
- msgid ""
- "\n"
- "There was a problem loading the selected item, and it has been disabled.\n"
-@@ -1950,52 +1958,52 @@ msgid ""
- "Please contact the developer."
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:987
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:991
- msgid "View logfile(s)"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1009
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1013
- msgid ""
- "There are multiple instances, do you want to remove all of them?\n"
- "\n"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1030
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1034
- #, python-format
- msgid "Are you sure you want to completely remove %s?"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1101
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1105
- msgid ""
- "This operation will update the selected items.\n"
- "\n"
- "Do you want to continue?"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1103
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1107
- msgid ""
- "This operation will update the selected item.\n"
- "\n"
- "Do you want to continue?"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1119
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1123
- #, python-format
- msgid "%d updates available!"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1121
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1125
- #, python-format
- msgid "%d update available!"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1181
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1185
- msgid ""
- "This will restore the default set of enabled applets. Are you sure you want "
- "to do this?"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1183
-+#: files/usr/lib/cinnamon-settings/bin/ExtensionCore.py:1187
- msgid ""
- "This will restore the default set of enabled desklets. Are you sure you want"
- " to do this?"
-@@ -2514,9 +2522,9 @@ msgstr ""
-
- #: files/usr/lib/cinnamon-settings/modules/cs_default.py:179
- #: files/usr/lib/cinnamon-settings/modules/cs_power.py:12
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:478
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:487
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:483
- #: files/usr/lib/cinnamon-settings/modules/cs_power.py:492
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:497
- msgid "Do nothing"
- msgstr ""
-
-@@ -3408,16 +3416,16 @@ msgstr ""
-
- #: files/usr/lib/cinnamon-settings/modules/cs_keyboard.py:153
- #: files/usr/lib/cinnamon-settings/modules/cs_power.py:8
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:476
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:483
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:481
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:488
- msgid "Suspend"
- msgstr ""
-
- #: files/usr/lib/cinnamon-settings/modules/cs_keyboard.py:154
- #: files/usr/lib/cinnamon-settings/modules/cs_power.py:10
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:477
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:485
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:491
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:482
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:490
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:496
- msgid "Hibernate"
- msgstr ""
-
-@@ -4069,7 +4077,7 @@ msgid "Allow the pointer to pass through the edges of adjacent panels"
- msgstr ""
-
- #: files/usr/lib/cinnamon-settings/modules/cs_power.py:9
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:484
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:489
- msgid "Shutdown immediately"
- msgstr ""
-
-@@ -4200,112 +4208,112 @@ msgstr ""
- msgid "When the battery is critically low"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:184
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:203
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:189
- #: files/usr/lib/cinnamon-settings/modules/cs_power.py:208
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:213
- msgid "Power"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:185
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:204
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:210
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:252
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:260
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:190
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:209
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:215
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:257
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:265
- msgid "Batteries"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:217
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:519
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:222
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:524
- msgid "Screen brightness"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:220
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:225
- msgid "On battery, dim screen when inactive"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:222
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:227
- msgid "Brightness level when inactive"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:224
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:229
- msgid "Dim screen after inactive for"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:270
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:275
- msgid "Devices"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:292
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:297
- #, python-format
- msgid "Caution low UPS, %s remaining"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:294
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:299
- #, python-format
- msgid "Using UPS power - %s remaining"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:300
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:305
- msgid "Caution low UPS"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:302
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:307
- msgid "Using UPS power"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:319
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:324
- #, python-format
- msgid "Charging - %s until fully charged"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:322
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:327
- #, python-format
- msgid "Caution low battery, %s remaining"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:324
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:329
- #, python-format
- msgid "Using battery power - %s remaining"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:329
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:334
- msgid "Charging"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:333
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:338
- msgid "Charging - fully charged"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:339
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:396
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:344
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:401
- msgid "Battery"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:355
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:360
- msgid "Secondary battery"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:372
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:377
- msgid "Uninterruptible power supply"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:375
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:380
- msgid "Wireless mouse"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:378
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:383
- msgid "Wireless Keyboard"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:384
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:389
- msgid "Personal digital assistant"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:387
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:392
- msgid "Cellphone"
- msgstr ""
-
--#: files/usr/lib/cinnamon-settings/modules/cs_power.py:486
-+#: files/usr/lib/cinnamon-settings/modules/cs_power.py:491
- msgid "Ask"
- msgstr ""
-
-diff --git a/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py b/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
-index d591ef9..c6c47b2 100644
---- a/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
-+++ b/files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
-@@ -106,6 +106,8 @@ class ExtensionSidePage (SidePage):
- self.stack.add_titled(extensions_vbox, "installed", _("Installed desklets"))
- elif self.collection_type == "extension":
- self.stack.add_titled(extensions_vbox, "installed", _("Installed extensions"))
-+ elif self.collection_type == "theme":
-+ self.stack.add_titled(extensions_vbox, "installed", _("Installed themes"))
-
- self.stack.expand = True
-
-@@ -294,6 +296,8 @@ class ExtensionSidePage (SidePage):
- self.stack.add_titled(getmore_vbox, "more", _("Available desklets (online)"))
- elif self.collection_type == "extension":
- self.stack.add_titled(getmore_vbox, "more", _("Available extensions (online)"))
-+ elif self.collection_type == "theme":
-+ self.stack.add_titled(getmore_vbox, "more", _("Available themes (online)"))
-
- self.stack.connect("notify::visible-child-name", self.on_page_changed)
-
---
-2.4.1
-
diff --git a/0003-Power-settings-Don-t-show-When-the-battery-is-critic.patch b/0003-Power-settings-Don-t-show-When-the-battery-is-critic.patch
deleted file mode 100644
index 03385da..0000000
--- a/0003-Power-settings-Don-t-show-When-the-battery-is-critic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ba704be19bacdc0e7a9be35bf8c51081bef91b9f Mon Sep 17 00:00:00 2001
-From: Clement Lefebvre <clement.lefebvre at linuxmint.com>
-Date: Fri, 22 May 2015 14:25:16 +0200
-Subject: [PATCH 3/4] Power settings: Don't show "When the battery is
- critically low" option with upower 1.0 (it no longer supports that)
-
----
- files/usr/lib/cinnamon-settings/modules/cs_power.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_power.py b/files/usr/lib/cinnamon-settings/modules/cs_power.py
-index 52d9a68..6c79c88 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_power.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_power.py
-@@ -156,7 +156,7 @@ class Module:
-
- section.add_row(GSettingsComboBox(_("When the power button is pressed"), CSD_SCHEMA, "button-power", button_power_options, size_group=size_group))
-
-- if self.has_battery:
-+ if self.has_battery and UPowerGlib.MAJOR_VERSION == 0 and UPowerGlib.MINOR_VERSION < 99:
- section.add_row(GSettingsComboBox(_("When the battery is critically low"), CSD_SCHEMA, "critical-battery-action", critical_options, size_group=size_group))
-
- # Batteries
---
-2.4.1
-
diff --git a/0004-Power-settings-Don-t-use-variables-that-don-t-exist-.patch b/0004-Power-settings-Don-t-use-variables-that-don-t-exist-.patch
deleted file mode 100644
index 80a3af5..0000000
--- a/0004-Power-settings-Don-t-use-variables-that-don-t-exist-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4dd9362ec0c789e4550af495c68c827954d24ce5 Mon Sep 17 00:00:00 2001
-From: Clement Lefebvre <clement.lefebvre at linuxmint.com>
-Date: Fri, 22 May 2015 19:39:46 +0200
-Subject: [PATCH 4/4] Power settings: Don't use variables that don't exist (in
- UPS handling)
-
----
- files/usr/lib/cinnamon-settings/modules/cs_power.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_power.py b/files/usr/lib/cinnamon-settings/modules/cs_power.py
-index 6c79c88..b0823e8 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_power.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_power.py
-@@ -246,7 +246,7 @@ class Module:
- # listed laptop battery as the primary device
-
- for device in devices:
-- if device[1] == UPowerGlib.DeviceKind.UPS and device_states[i] == UPowerGlib.DeviceState.DISCHARGING:
-+ if device[1] == UPowerGlib.DeviceKind.UPS and device[4] == UPowerGlib.DeviceState.DISCHARGING:
- ups_as_primary = True
-
- for device in devices:
---
-2.4.1
-
diff --git a/cinnamon.spec b/cinnamon.spec
index b3a7c85..f04d37f 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,8 +1,8 @@
#global _internal_version 32284cb
Name: cinnamon
-Version: 2.6.2
-Release: 2%{?dist}
+Version: 2.6.3
+Release: 1%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -32,10 +32,7 @@ Patch7: f22_default_panal_launcher.patch
%else
Patch7: default_panal_launcher.patch
%endif
-Patch8: 0001-Power-settings-Don-t-rely-on-output.get_backlight_mi.patch
-Patch9: 0002-Theme-settings-Fixed-regression-caused-by-gettext-fi.patch
-Patch10: 0003-Power-settings-Don-t-show-When-the-battery-is-critic.patch
-Patch11: 0004-Power-settings-Don-t-use-variables-that-don-t-exist-.patch
+
%global clutter_version 1.12.2
%global cjs_version 2.6.0
@@ -183,6 +180,7 @@ This package contains the code documentation for various Cinnamon components.
%autosetup -p1 -n Cinnamon-%{version}
sed -i -e 's at gksu@pkexec at g' files/usr/bin/cinnamon-settings-users
+sed -i -e 's at blueberry@blueman-manager at g' files/usr/lib/cinnamon-settings/cinnamon-settings.py
NOCONFIGURE=1 ./autogen.sh
@@ -282,6 +280,9 @@ fi
%doc %{_datadir}/gtk-doc/html/*/
%changelog
+* Wed May 27 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.3-1
+- update to 2.6.3 release
+
* Sat May 23 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.2-2
- Add upstream fixes
diff --git a/sources b/sources
index 05de61c..aa02bc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-371a6f165f71ac08ebabb36ba8136684 Cinnamon-2.6.2.tar.gz
+555c3484c5f5a34ec9c2043d107d67f1 Cinnamon-2.6.3.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/cinnamon.git/commit/?h=f20&id=05e5b22529c42229e29d45640743aa2e13edf002
More information about the scm-commits
mailing list