diff -Nru indicator-cpufreq-0.2/debian/changelog indicator-cpufreq-0.2.1/debian/changelog --- indicator-cpufreq-0.2/debian/changelog 2013-01-30 09:22:54.000000000 +0700 +++ indicator-cpufreq-0.2.1/debian/changelog 2013-02-20 13:05:05.000000000 +0700 @@ -1,3 +1,11 @@ +indicator-cpufreq (0.2.1-0ubuntu1) raring; urgency=low + + * New upstream bugfix release (LP: #1130508): + - Correctly display turbo mode option in menu (LP: #1110429). + - Install hicolor icons (LP: #1125598). + + -- Artem Popov Wed, 20 Feb 2013 10:39:05 +0700 + indicator-cpufreq (0.2-0ubuntu1) raring; urgency=low * New upstream release (LP: #1105609): diff -Nru indicator-cpufreq-0.2/indicator_cpufreq/indicator.py indicator-cpufreq-0.2.1/indicator_cpufreq/indicator.py --- indicator-cpufreq-0.2/indicator_cpufreq/indicator.py 2013-01-25 21:21:30.000000000 +0700 +++ indicator-cpufreq-0.2.1/indicator_cpufreq/indicator.py 2013-02-20 10:33:17.000000000 +0700 @@ -30,7 +30,11 @@ #gettext.textdomain('indicator-cpufreq') def readable_frequency(f): - return _("%s GHz") % locale.format(_("%.2f"), f / 1.0e6) + # temp hack for properly displaying intel turbo mode (actual freq + 1000kHz) + label = _("%s GHz") % locale.format(_("%.2f"), f / 1.0e6) + if f % 10000 != 0: + label = label + " " + _("(turbo mode)") + return label governor_names = { 'conservative': _("Conservative"), diff -Nru indicator-cpufreq-0.2/PKG-INFO indicator-cpufreq-0.2.1/PKG-INFO --- indicator-cpufreq-0.2/PKG-INFO 2013-01-25 21:31:07.000000000 +0700 +++ indicator-cpufreq-0.2.1/PKG-INFO 2013-02-20 10:35:55.000000000 +0700 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: indicator-cpufreq -Version: 0.2 +Version: 0.2.1 Summary: CPU frequency scaling indicator Home-page: https://launchpad.net/indicator-cpufreq Author: Artem Popov diff -Nru indicator-cpufreq-0.2/po/bg.po indicator-cpufreq-0.2.1/po/bg.po --- indicator-cpufreq-0.2/po/bg.po 1970-01-01 06:00:00.000000000 +0600 +++ indicator-cpufreq-0.2.1/po/bg.po 2013-02-18 21:23:15.000000000 +0700 @@ -0,0 +1,74 @@ +# Bulgarian translation for indicator-cpufreq +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the indicator-cpufreq package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: indicator-cpufreq\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-07-20 16:36+0700\n" +"PO-Revision-Date: 2013-02-10 12:44+0000\n" +"Last-Translator: Atanas Kovachki \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-02-11 05:18+0000\n" +"X-Generator: Launchpad (build 16482)\n" + +#. Support for command line options. +#: ../bin/indicator-cpufreq.py:64 +msgid "indicator-cpufreq [options]" +msgstr "indicator-cpufreq [параметри]" + +#: ../bin/indicator-cpufreq.py:67 +msgid "Print the maximum debugging info (implies -vv)" +msgstr "Извлече на максимално количество информация за дебъгване (-vv)" + +#: ../bin/indicator-cpufreq.py:69 +msgid "set error_level output to warning, info, and then debug" +msgstr "настроите error_level output на warning, info и след това debug" + +#: ../indicator_cpufreq/indicator.py:34 +#, python-format +msgid "%s GHz" +msgstr "%s GHz" + +#: ../indicator_cpufreq/indicator.py:34 +#, python-format +msgid "%.2f" +msgstr "%.2f" + +#: ../indicator_cpufreq/indicator.py:37 +msgid "Conservative" +msgstr "Умерено" + +#: ../indicator_cpufreq/indicator.py:38 +msgid "Ondemand" +msgstr "При поискване" + +#. 'userspace': _("Userspace"), +#: ../indicator_cpufreq/indicator.py:40 +msgid "Powersave" +msgstr "Енергоспестяване" + +#: ../indicator_cpufreq/indicator.py:41 +msgid "Performance" +msgstr "Ускоряване" + +#: ../indicator_cpufreq/com.ubuntu.indicatorcpufreq.policy.in.h:1 +msgid "Change CPU frequency scaling" +msgstr "Промяна на честотата на процесора" + +#: ../indicator_cpufreq/com.ubuntu.indicatorcpufreq.policy.in.h:2 +msgid "System policy prevents you from changing CPU frequency scaling." +msgstr "Системаната политика пречи на промяна в честотата на процесора." + +#: ../indicator-cpufreq.desktop.in.h:1 +msgid "An indicator for monitoring and switching CPU frequency scaling" +msgstr "Индикатор за наблюдение и превключване на честотата на процесора" + +#: ../indicator-cpufreq.desktop.in.h:2 +msgid "CPU Frequency Scaling Indicator" +msgstr "Индикатор за честотата на процесора" diff -Nru indicator-cpufreq-0.2/po/ru.po indicator-cpufreq-0.2.1/po/ru.po --- indicator-cpufreq-0.2/po/ru.po 2013-01-25 21:13:10.000000000 +0700 +++ indicator-cpufreq-0.2.1/po/ru.po 2013-02-18 21:23:15.000000000 +0700 @@ -8,14 +8,14 @@ "Project-Id-Version: indicator-cpufreq\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-07-20 16:36+0700\n" -"PO-Revision-Date: 2013-01-25 04:28+0000\n" -"Last-Translator: Artem Popov \n" +"PO-Revision-Date: 2013-02-06 13:36+0000\n" +"Last-Translator: Атанас \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-25 05:40+0000\n" -"X-Generator: Launchpad (build 16445)\n" +"X-Launchpad-Export-Date: 2013-02-07 05:12+0000\n" +"X-Generator: Launchpad (build 16477)\n" #. Support for command line options. #: ../bin/indicator-cpufreq.py:64 @@ -42,7 +42,7 @@ #: ../indicator_cpufreq/indicator.py:37 msgid "Conservative" -msgstr "Conservative" +msgstr "Консервативный" #: ../indicator_cpufreq/indicator.py:38 msgid "Ondemand" diff -Nru indicator-cpufreq-0.2/setup.py indicator-cpufreq-0.2.1/setup.py --- indicator-cpufreq-0.2/setup.py 2013-01-25 20:38:40.000000000 +0700 +++ indicator-cpufreq-0.2.1/setup.py 2013-02-20 10:33:45.000000000 +0700 @@ -7,7 +7,7 @@ DistUtilsExtra.auto.setup( name='indicator-cpufreq', - version='0.2', + version='0.2.1', license='GPL-3', author='Artem Popov', author_email='artfwo@gmail.com', @@ -20,6 +20,9 @@ glob.glob('icons/ubuntu-mono-dark/*')), ('share/icons/ubuntu-mono-light/status/22', glob.glob('icons/ubuntu-mono-light/*')), + # temp fix for LP: #1125598 + ('share/icons/hicolor/22x22/status', + glob.glob('icons/ubuntu-mono-dark/*')), # ('/var/lib/polkit-1/localauthority/10-vendor.d', # ['indicator-cpufreq.pkla']), ]