From ae2fc2d08eeb1fe9f2a0c43ea84a2cb734fb7008 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 29 Aug 2013 22:46:34 +0200 Subject: don't depends on gnome-control-center, recommends is enough, since it's only required for the preferences menu item. Let ubuntu-system-settings replace it as an alternative, that's needed on the touch image. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index fc1c924..81006ae 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, upower, - gnome-control-center (>= 3.1), -Recommends: indicator-applet (>= 0.2) | indicator-renderer, +Recommends: gnome-control-center (>= 3.1) | ubuntu-system-settings, + indicator-applet (>= 0.2) | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives the user a way to access power management preferences. -- cgit v1.2.3 From 4b27302d7f9d0bb000090e16e1a2f04f8316eb84 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Aug 2013 16:26:13 -0500 Subject: Fix dependendencies to include url-dispatcher and allow system-settings --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index fc1c924..b5cd919 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, + liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power @@ -23,7 +24,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, upower, - gnome-control-center (>= 3.1), + gnome-control-center (>= 3.1) | ubuntu-system-settings, Recommends: indicator-applet (>= 0.2) | indicator-renderer, Description: Indicator showing power state. This indicator displays current power management information and gives -- cgit v1.2.3 From 7b1c7e89d51ec3f9acdccecf50a1e19f57669f62 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 30 Aug 2013 11:22:59 +0200 Subject: revert previous commit, liburl-dispatcher1 depends on upstart-app-launch which is in universe, that's blocking indicators from landing. --- configure.ac | 3 +-- debian/control | 1 - src/service.c | 14 +++----------- 3 files changed, 4 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/configure.ac b/configure.ac index ca7e793..ba39dec 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,7 @@ GUDEV_REQUIRED_VERSION=204 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - gudev-1.0 >= $GUDEV_REQUIRED_VERSION - url-dispatcher-1]) + gudev-1.0 >= $GUDEV_REQUIRED_VERSION]) ########################### # GSETTINGS diff --git a/debian/control b/debian/control index f0ed35e..81006ae 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, - liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power diff --git a/src/service.c b/src/service.c index b4f05ea..1976332 100644 --- a/src/service.c +++ b/src/service.c @@ -22,7 +22,6 @@ #include #include -#include #include "device.h" #include "device-provider.h" @@ -533,7 +532,7 @@ create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) update_brightness_action_state (self); g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); + g_menu_append (section, _("Battery settings…"), "indicator.activate-settings"); return G_MENU_MODEL (section); } @@ -686,6 +685,8 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { + /* FIXME: unity8 settings */ + execute_command ("gnome-control-center power"); } @@ -697,14 +698,6 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, execute_command ("gnome-power-statistics"); } -static void -on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, - GVariant * param G_GNUC_UNUSED, - gpointer gself G_GNUC_UNUSED) -{ - url_dispatch_send("settings://system/battery", NULL, NULL); -} - /*** **** ***/ @@ -746,7 +739,6 @@ init_gactions (IndicatorPowerService * self) GActionEntry entries[] = { { "activate-settings", on_settings_activated }, - { "activate-phone-settings", on_phone_settings_activated }, { "activate-statistics", on_statistics_activated } }; -- cgit v1.2.3 From 81d519f3ba785f6acf80193062ab09d7fdd41e3c Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 30 Aug 2013 10:07:39 +0000 Subject: Releasing 12.10.6+13.10.20130830.2-0ubuntu1, based on r193 --- debian/changelog | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 30f05ff..d071831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +indicator-power (12.10.6+13.10.20130830.2-0ubuntu1) saucy; urgency=low + + [ Sebastien Bacher ] + * don't depends on gnome-control-center, recommends is enough, since + it's only required for the preferences menu item. Let ubuntu-system- + settings replace it as an alternative, that's needed on the touch + image. + * revert previous commit, liburl-dispatcher1 depends on upstart-app- + launch which is in universe, that's blocking indicators from + landing. + + [ Ted Gould ] + * Make settings work on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 193 + + -- Ubuntu daily release Fri, 30 Aug 2013 10:07:38 +0000 + indicator-power (12.10.6+13.10.20130823-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From a3bfe6c08f027ffead9ff0b1d40be39aa4e4f1a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Sep 2013 10:32:09 -0500 Subject: Adding a build dep on URL dispatcher --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 81006ae..f0ed35e 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, + liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power -- cgit v1.2.3 From a14a925bb75d798a45fe8f757e59e951677e5a68 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 13 Sep 2013 15:15:32 +0000 Subject: Releasing 12.10.6+13.10.20130913-0ubuntu1, based on r196 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d071831..05a590c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Adds a title in the header's action state. (LP: #1223635) + + [ Ted Gould ] + * Use URL Dispatcher for settings on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 196 + + -- Ubuntu daily release Fri, 13 Sep 2013 15:15:31 +0000 + indicator-power (12.10.6+13.10.20130830.2-0ubuntu1) saucy; urgency=low [ Sebastien Bacher ] -- cgit v1.2.3 From 8d0580572ab5697e11f74cc427b199fab349ed24 Mon Sep 17 00:00:00 2001 From: Stéphane Graber Date: Fri, 13 Sep 2013 22:43:47 -0400 Subject: Revert the previous upload as it caused 10 extra packages to be installed on all Ubuntu desktop machines and as a result caused a FeatureFreeze violation. --- configure.ac | 3 +-- debian/changelog | 7 +++++++ debian/control | 1 - src/service.c | 29 ++++++++++++++--------------- 4 files changed, 22 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/configure.ac b/configure.ac index ca7e793..ba39dec 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,7 @@ GUDEV_REQUIRED_VERSION=204 PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - gudev-1.0 >= $GUDEV_REQUIRED_VERSION - url-dispatcher-1]) + gudev-1.0 >= $GUDEV_REQUIRED_VERSION]) ########################### # GSETTINGS diff --git a/debian/changelog b/debian/changelog index 05a590c..8179a38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu2) saucy; urgency=low + + * Revert previous upload since this was bringing quite a few extra and + likely unwanted dependencies on Ubuntu desktop after FeatureFreeze. + + -- Stéphane Graber Fri, 13 Sep 2013 21:46:57 -0400 + indicator-power (12.10.6+13.10.20130913-0ubuntu1) saucy; urgency=low [ Charles Kerr ] diff --git a/debian/control b/debian/control index f0ed35e..81006ae 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 9), libgtest-dev, libglib2.0-dev (>= 2.36), libgudev-1.0-dev, - liburl-dispatcher1-dev, python, Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-power diff --git a/src/service.c b/src/service.c index b5227f6..1976332 100644 --- a/src/service.c +++ b/src/service.c @@ -22,7 +22,6 @@ #include #include -#include #include "device.h" #include "device-provider.h" @@ -332,13 +331,15 @@ create_header_state (IndicatorPowerService * self) g_variant_builder_init (&b, G_VARIANT_TYPE("a{sv}")); - g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (_("Battery"))); - g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (should_be_visible (self))); if (label != NULL) - g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label)); + { + g_variant_builder_add (&b, "{sv}", "label", g_variant_new_string (label)); + + g_free (label); + } if (icon != NULL) { @@ -348,7 +349,12 @@ create_header_state (IndicatorPowerService * self) } if (a11y != NULL) - g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_take_string (a11y)); + { + g_variant_builder_add (&b, "{sv}", "accessible-desc", + g_variant_new_string (a11y)); + + g_free (a11y); + } return g_variant_builder_end (&b); } @@ -526,7 +532,7 @@ create_phone_settings_section (IndicatorPowerService * self G_GNUC_UNUSED) update_brightness_action_state (self); g_object_unref (item); - g_menu_append (section, _("Battery settings…"), "indicator.activate-phone-settings"); + g_menu_append (section, _("Battery settings…"), "indicator.activate-settings"); return G_MENU_MODEL (section); } @@ -679,6 +685,8 @@ on_settings_activated (GSimpleAction * a G_GNUC_UNUSED, GVariant * param G_GNUC_UNUSED, gpointer gself G_GNUC_UNUSED) { + /* FIXME: unity8 settings */ + execute_command ("gnome-control-center power"); } @@ -690,14 +698,6 @@ on_statistics_activated (GSimpleAction * a G_GNUC_UNUSED, execute_command ("gnome-power-statistics"); } -static void -on_phone_settings_activated (GSimpleAction * a G_GNUC_UNUSED, - GVariant * param G_GNUC_UNUSED, - gpointer gself G_GNUC_UNUSED) -{ - url_dispatch_send("settings://system/battery", NULL, NULL); -} - /*** **** ***/ @@ -739,7 +739,6 @@ init_gactions (IndicatorPowerService * self) GActionEntry entries[] = { { "activate-settings", on_settings_activated }, - { "activate-phone-settings", on_phone_settings_activated }, { "activate-statistics", on_statistics_activated } }; -- cgit v1.2.3 From 7b46f6c74aee2ca3a4d64f8d3f91d98719dab551 Mon Sep 17 00:00:00 2001 From: Timo Jyrinki Date: Wed, 18 Sep 2013 12:54:08 +0300 Subject: Manual changelog entry to indicate why the reverting of the revert is ok now. The dependency url-dispatcher was fixed to not pull in extra packages on the desktop images, fixing the issue that caused the previous revert. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8179a38..7c05fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.6+13.10.20130913-0ubuntu3) UNRELEASED; urgency=low + + * The dependency url-dispatcher was fixed to not pull in extra packages + on the desktop images, fixing the issue that caused the previous revert. + + -- Timo Jyrinki Wed, 18 Sep 2013 12:52:51 +0300 + indicator-power (12.10.6+13.10.20130913-0ubuntu2) saucy; urgency=low * Revert previous upload since this was bringing quite a few extra and -- cgit v1.2.3 From 97e7e6d7151ecdcb007d68596e86ecb134c4441d Mon Sep 17 00:00:00 2001 From: Łukasz 'sil2100' Zemczak Date: Wed, 18 Sep 2013 15:51:46 +0200 Subject: Add the FFe bug number to the last changelog entry (LP: #1215980) --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7c05fe8..a1855c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ indicator-power (12.10.6+13.10.20130913-0ubuntu3) UNRELEASED; urgency=low * The dependency url-dispatcher was fixed to not pull in extra packages - on the desktop images, fixing the issue that caused the previous revert. + on the desktop images, fixing the issue that caused the previous revert + (FFe bug - LP: #1215980) -- Timo Jyrinki Wed, 18 Sep 2013 12:52:51 +0300 -- cgit v1.2.3 From 9b17a6b627923cd783757c66c60665c7fe225995 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Wed, 18 Sep 2013 13:57:00 +0000 Subject: Releasing 12.10.6+13.10.20130918.2-0ubuntu1, based on r201 --- debian/changelog | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a1855c5..36e3f96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,17 @@ -indicator-power (12.10.6+13.10.20130913-0ubuntu3) UNRELEASED; urgency=low +indicator-power (12.10.6+13.10.20130918.2-0ubuntu1) saucy; urgency=low + [ Timo Jyrinki ] * The dependency url-dispatcher was fixed to not pull in extra packages on the desktop images, fixing the issue that caused the previous revert (FFe bug - LP: #1215980) - -- Timo Jyrinki Wed, 18 Sep 2013 12:52:51 +0300 + [ Ted Gould ] + * Use URL dispatcher to show settings on the phone. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 201 + + -- Ubuntu daily release Wed, 18 Sep 2013 13:57:00 +0000 indicator-power (12.10.6+13.10.20130913-0ubuntu2) saucy; urgency=low -- cgit v1.2.3 From cca397579b2d799eb99a2ce92a843d17479f7a6a Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 4 Oct 2013 02:28:43 +0000 Subject: Releasing 12.10.6+13.10.20131004-0ubuntu1, based on r204 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 36e3f96..5b81768 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +indicator-power (12.10.6+13.10.20131004-0ubuntu1) saucy; urgency=low + + [ Charles Kerr ] + * Revert bug #824629 code -- use the correct charge % when deciding + what icon to use. (LP: #1215520, #824629) + * Listen for the "Resuming" signal from upower to refresh devices when + resuming from suspend/hibernate. (LP: #1224931) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 204 + + -- Ubuntu daily release Fri, 04 Oct 2013 02:28:43 +0000 + indicator-power (12.10.6+13.10.20130918.2-0ubuntu1) saucy; urgency=low [ Timo Jyrinki ] -- cgit v1.2.3 From 2d02157d59f2290617b2fc4e112900d16fc1853a Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 8 Oct 2013 02:34:02 +0000 Subject: Releasing 12.10.6+13.10.20131008-0ubuntu1, based on r206 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b81768..be60f61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-power (12.10.6+13.10.20131008-0ubuntu1) saucy; urgency=low + + [ Ted Gould ] + * Adding an additional slash to the settings URL. (LP: #1231444) + + [ Ubuntu daily release ] + * Automatic snapshot from revision 206 + + -- Ubuntu daily release Tue, 08 Oct 2013 02:34:01 +0000 + indicator-power (12.10.6+13.10.20131004-0ubuntu1) saucy; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From 52f40f1e32ce05f9a3d1c4f026d91d53c904b35e Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Tue, 29 Oct 2013 10:31:05 +0000 Subject: Releasing 12.10.6+14.04.20131029.1-0ubuntu1, based on r210 --- debian/changelog | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index be60f61..e340616 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +indicator-power (12.10.6+14.04.20131029.1-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * Don't leak the g_file_get_contents value, reported by valgrind . + + [ Marcus Tomlinson ] + * Added torch icons to either end of brightness slider. (LP: #1227250) + + [ Ted Gould ] + * Adding a phone_greeter profile. + + [ Ubuntu daily release ] + * Automatic snapshot from revision 210 + + -- Ubuntu daily release Tue, 29 Oct 2013 10:31:03 +0000 + indicator-power (12.10.6+13.10.20131008-0ubuntu1) saucy; urgency=low [ Ted Gould ] -- cgit v1.2.3