From 6c63582cddf7f9aea296aef3bcfebe4bcf8c6fbe Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Jun 2014 10:02:10 -0500 Subject: make g++ 4.9 explicit --- debian/control | 6 +++++- debian/rules | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5f45bea..6e379ad 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,12 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team -# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales + +# g++-4.9: since we use c++11 features, explicitly select a g++ version +# to protect from ABI breaks in libstdc++ +# language-pack-en-base: needed so unit tests can use 12h and 24h locales Build-Depends: cmake, + g++-4.9, dbus, dbus-test-runner, python3-dbusmock, diff --git a/debian/rules b/debian/rules index d2889aa..cf940f5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,10 @@ #!/usr/bin/make -f +# Explicitly selecting a G{CC,++}-version here to avoid accidental +# ABI breaks introduced by toolchain updates. +export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9 +export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9 + LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: -- cgit v1.2.3 From c8714f2ac53d8999d89a78810c6d60694482fdb6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 25 Jun 2014 11:01:05 -0500 Subject: omit unnecessary whitespace --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 6e379ad..6699f31 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team - # g++-4.9: since we use c++11 features, explicitly select a g++ version # to protect from ABI breaks in libstdc++ # language-pack-en-base: needed so unit tests can use 12h and 24h locales -- cgit v1.2.3 From 3b3b4ba7c02df7d06a5d3a7578ae6c11abb85db8 Mon Sep 17 00:00:00 2001 From: CI bot Date: Fri, 18 Jul 2014 12:06:28 +0000 Subject: Releasing 13.10.0+14.10.20140718-0ubuntu1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 21e1db3..eb74e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (13.10.0+14.10.20140718-0ubuntu1) utopic; urgency=low + + [ Charles Kerr ] + * make the gcc version explicit in debian/control and debian/rules. + + -- Ubuntu daily release Fri, 18 Jul 2014 12:06:28 +0000 + indicator-datetime (13.10.0+14.10.20140716-0ubuntu1) utopic; urgency=low [ Charles Kerr ] -- cgit v1.2.3 From 2d702560ea1c7f9efbd8bfa6bd4747a0517138cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mirco=20M=C3=BCller?= Date: Tue, 22 Jul 2014 16:11:57 +0100 Subject: Make use of the x-canonical-non-shaped-icon hint to suppress masking the symbolic icon with an UbuntuShape. --- src/snap.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/snap.cpp b/src/snap.cpp index 45eb14e..5480425 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -262,6 +262,8 @@ private: g_variant_new_boolean(true)); notify_notification_set_hint(m_nn, HINT_TIMEOUT, g_variant_new_int32(std::chrono::duration_cast(duration).count())); + notify_notification_set_hint(m_nn, HINT_NONSHAPEDICON, + g_variant_new_boolean(true)); /// alarm popup dialog's button to show the active alarm notify_notification_add_action(m_nn, "show", _("Show"), @@ -374,6 +376,7 @@ private: static constexpr char const * HINT_SNAP {"x-canonical-snap-decisions"}; static constexpr char const * HINT_TINT {"x-canonical-private-button-tint"}; static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"}; + static constexpr char const * HINT_NONSHAPEDICON {"x-canonical-non-shaped-icon"}; }; /** -- cgit v1.2.3 From 18c9f881e5eb01b157048d083515e59ebdd08afa Mon Sep 17 00:00:00 2001 From: CI bot Date: Fri, 25 Jul 2014 08:55:41 +0000 Subject: Releasing 13.10.0+14.10.20140725-0ubuntu1 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index eb74e1c..121bbf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-datetime (13.10.0+14.10.20140725-0ubuntu1) utopic; urgency=low + + [ Mirco Müller ] + * Make use of the x-canonical-non-shaped-icon hint to suppress masking + the symbolic icon with an UbuntuShape. (LP: #1346925) + + -- Ubuntu daily release Fri, 25 Jul 2014 08:55:41 +0000 + indicator-datetime (13.10.0+14.10.20140718-0ubuntu1) utopic; urgency=low [ Charles Kerr ] -- cgit v1.2.3