--- indicator-datetime-0.2.3.orig/debian/copyright +++ indicator-datetime-0.2.3/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Didier Roche on +Wed, 10 Feb 2010 11:11:01 +0100. + +It was downloaded from https://launchpad.net/indicator-datetime + +Upstream Author: + + Ted Gould + +Copyright: + + Copyright (C) 2009 Canonical Ltd + +License: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 3 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + +The Debian packaging is (C) 2010, Canonical Ltd. and is licensed under the +GPLv3, see /usr/share/common-licenses/GPL-3. --- indicator-datetime-0.2.3.orig/debian/watch +++ indicator-datetime-0.2.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-datetime/+download .*/indicator-datetime-([0-9.]+)\.tar\.gz --- indicator-datetime-0.2.3.orig/debian/indicator-datetime.debhelper.log +++ indicator-datetime-0.2.3/debian/indicator-datetime.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- indicator-datetime-0.2.3.orig/debian/rules +++ indicator-datetime-0.2.3/debian/rules @@ -0,0 +1,14 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/autoreconf.mk + +install/indicator-datetime:: + find debian/indicator-datetime/usr/lib -name \*.la -exec rm {} \; + find debian/indicator-datetime/usr/lib -name \*.a -exec rm {} \; + +common-binary-post-install-arch:: list-missing --- indicator-datetime-0.2.3.orig/debian/compat +++ indicator-datetime-0.2.3/debian/compat @@ -0,0 +1 @@ +5 --- indicator-datetime-0.2.3.orig/debian/changelog +++ indicator-datetime-0.2.3/debian/changelog @@ -0,0 +1,356 @@ +indicator-datetime (0.2.3-0ubuntu4~ppa1) natty; urgency=low + + * Make it so the date is reset on show not hide (LP: #793450) + + -- Ted Gould Tue, 14 Jun 2011 14:46:57 -0500 + +indicator-datetime (0.2.3-0ubuntu2~ppa1) natty; urgency=low + + * Upstream Merge + * Ellipsize calendar entries that are too long (LP: #750671) + + -- Ted Gould Fri, 15 Apr 2011 09:32:43 -0500 + +indicator-datetime (0.2.3-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Use GTK directly for detecting when the menu appears and disappears + to reset the date (LP: #649800) + ∘ Handle items being removed from the locations list by choosing + another item in the list (LP: #740948) + ∘ Check for resume in the service and update the label as well + (LP: #759854) + + -- Ted Gould Thu, 14 Apr 2011 14:51:20 -0500 + +indicator-datetime (0.2.2-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + ∘ Add language and proper distro version to geonames URL to allow + for proper server side fixes + ∘ Give full day events the day name instead of a time + ∘ Make sure the calendar follows the user setting (LP: #748772) + ∘ Ensure that events handle month boundaries correctly (LP: #746713) + ∘ Only show calendars the user has configured (LP: #729033) + ∘ Reenable clicking on the timezone in the menu to set it. + + [ Ken VanDine ] + * debian/control + - Added build depends for libgconf2-dev + + -- Ken VanDine Thu, 07 Apr 2011 14:53:52 -0400 + +indicator-datetime (0.2.1-0ubuntu1) natty; urgency=low + + * New upstream release. + * indicator-datetime-preferences crashed with SIGSEGV in + g_utf8_normalize() (LP: #727089) + * Uninstalling Evolution removes calendar from clock applet (LP: #691953) + * clock doesn't update on timezone change (LP: #735445) + * Cannot change main location (LP: #729029) + * indicator-datetime-preferences crashed with SIGSEGV in + g_simple_async_result_complete() (LP: #734951) + * Time zone map looks identical when sensitive vs. insensitive (LP: #740846) + * "Locations" window behaves like a modal dialog (LP: #740924) + * Added location for clock menu isn't used or remembered (LP: #740930) + * Time not displayed for added location in "Locations" window (LP: #740931) + * "UTC" location can be removed but not re-added (LP: #740938) + * "Locations" window bottom bar is missing a border (LP: #740941) + * Add and Remove buttons in "Locations" window have unnecessary tooltips + (LP: #740944) + * No separator between "Add Event" and locations (LP: #740971) + * indicator-datetime-preferences crashed with SIGSEGV in + g_atomic_int_exchange_and_add() (LP: #740978) + * inicator-datetime dosen't show corretly the time when changing from 24 + hours format to 12 hours (LP: #743394) + * Add tooltips on the error icons + * Fix marking to refresh as the calendar changes + * Recycle old entries to make the refresh cleaner + * Use day when timezone is set to 'locale' + * Reset time when coming back from suspend (LP: #726053) + + -- Ted Gould Thu, 31 Mar 2011 14:32:40 -0500 + +indicator-datetime (0.2.0-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Remove unused liboobs + ∘ Add translator comments and make strings translatable (LP: #737326) + ∘ Remove password dialog for calendars not the keyring + ∘ Use default matching when geonames aren't available (LP: #740870) + ∘ UI Cleanups and naming fixes (LP: #740806, LP: #740819) + ∘ Free JSON parser data + ∘ Avoid duplicates in GeoNames data (LP: #740884) + ∘ Make location completion more robust + * debian/control: Dropping liboobs + + -- Ted Gould Wed, 23 Mar 2011 16:22:50 -0500 + +indicator-datetime (0.1.98-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Make appointments match calendar month + ∘ Fix time format of appointments + ∘ Get date change signals from calendar and adjust based on them. + ∘ Crash fixes (LP: #733833, LP: #729444) + ∘ Valgrind invalid read (LP: #729175) + ∘ Translation fixes to date label (LP: #729632) + * Fix handling of reoccruing events + * Handle settings in the indicator + * Allow for hiding the calendar and the clock + + -- Ted Gould Wed, 16 Mar 2011 16:17:38 -0500 + +indicator-datetime (0.1.97-0ubuntu1~ppa1) natty; urgency=low + + * New upstream release. + * Fix handling of reoccruing events + * Handle settings in the indicator + * Allow for hiding the calendar and the clock + + -- Ted Gould Thu, 10 Mar 2011 23:14:41 -0600 + +indicator-datetime (0.1.96-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + * Preference UI cleanups + * Fix color rendering for appointments + * Fix spin buttons to behave properly + + [ Ken VanDine ] + * Better handling of recurring events (LP: #726603) + + -- Ken VanDine Thu, 03 Mar 2011 16:38:01 -0500 + +indicator-datetime (0.1.95-0ubuntu1) natty; urgency=low + + * New upstream release. + - New preference dialog + - Improved EDS support + - Improved timezone support + * debian/control: + - Update Build-Depends + + -- Michael Terry Mon, 28 Feb 2011 08:09:29 -0500 + +indicator-datetime (0.1.94-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + ∘ Timezone support + ∘ Multiple calendar support + ∘ Accessible description + + [ Ken VanDine ] + * debian/control + - Added build depends for libedataserverui1.2-dev + + -- Ken VanDine Thu, 17 Feb 2011 14:48:41 -0500 + +indicator-datetime (0.1.93-0ubuntu1) natty; urgency=low + + * New upstream release. + * Merging in first EDS branch + * debian/rules: Adding in autoreconf + + [ Ken VanDine ] + * debian/control + - New build deps for eds integration, libecal1.2-dev, libical-dev, + libgtk2.0-dev, libcairo2-dev, libedataserver1.2-dev + + -- Ted Gould Wed, 09 Feb 2011 13:25:57 -0600 + +indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low + + * debian/source/format + - Source format v1 instead of v3 + + -- Ken VanDine Tue, 08 Feb 2011 13:59:35 -0500 + +indicator-datetime (0.1.92-0ubuntu3) natty; urgency=low + + * debian/control + - Bump standards version to 3.9.1 + - Set Vcs-Bzr + * +debian/source/format + + -- Ken VanDine Tue, 08 Feb 2011 11:14:02 -0500 + +indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low + + * debian/control + - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763) + * src/datetime-service.c + - Don't crash if we can get a geoclue provider (LP: #714763) + + -- Ken VanDine Tue, 08 Feb 2011 11:02:31 -0500 + +indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low + + * New upstream release. + * Increase robustness of GeoClue error handling + * Remove g_error()'s from the .so + + -- Ted Gould Thu, 03 Feb 2011 15:10:43 -0600 + +indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low + + * New upstream release. + * Change to canonical.com for naming + * Fixing a type callback + * Switching to GDbus and dbusmenu-0.4 + * Supporting a wider range of custom strings for time and support + seconds in the custom time strings. + * Fixing to take time settings from LC_TIME + + -- Ted Gould Thu, 27 Jan 2011 16:48:48 -0600 + +indicator-datetime (0.1.90.is.0.0.6-0ubuntu2) natty; urgency=low + + * Merged gdbus and dbusmenu-glib-0.4 port + * debian/control + - Added build depends for dh-autoreconf + - bumped dbusmenu build depends to >= 0.3.91 + * debian/rules + - Added autoreconf.mk + + -- Ken VanDine Thu, 13 Jan 2011 20:48:31 -0600 + +indicator-datetime (0.1.90.is.0.0.6-0ubuntu1) natty; urgency=low + + * Uploading 0.0.6 again to superceed 0.1.90 which is still blocked on + MIR + + -- Ken VanDine Mon, 13 Dec 2010 11:30:25 -0500 + +indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low + + * debian/control + - Bump build depends for libdbusmenu-* to >= 0.3.90 + + -- Ken VanDine Thu, 09 Dec 2010 11:46:00 -0500 + +indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low + + * New upstream release. + * Generate the format string at init + * Add in Geoclue support for setting proper timezone + * Add support for building GTK2 and GTK3 versions + * debian/control: Add recommends for geoclue-ubuntu-geoip + * debian/control: Adding dependencies on Geoclue and OOBS + + -- Ted Gould Fri, 03 Dec 2010 13:46:32 -0600 + +indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low + + * Cherry-picked from upstream: + - Fix date string format (12/24h) not taken from translation (LP: #579134) + + -- Didier Roche Thu, 30 Sep 2010 16:09:41 +0200 + +indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low + + * Rebuild for libindicator ABI change (LP: #637692) + * debian/control: depends on latest libindicator-dev + + -- Didier Roche Wed, 22 Sep 2010 18:21:26 +0200 + +indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Refresh times on timezone change + * Update the date daily (lp: #614529) + * Fixing distcheck + + -- Ted Gould Thu, 09 Sep 2010 13:10:10 -0500 + +indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low + + * debian/rules: use gnome.mk so a translation template is built (lp: #612540) + + -- Sebastien Bacher Tue, 03 Aug 2010 12:41:08 +0200 + +indicator-datetime (0.0.5-0ubuntu1) maverick; urgency=low + + * New version update + + [ Ted Gould ] + * Upstream Merge + * Making time format configurable via translations and + gsettings. + * debian/control: Adding in a glib dependency to get gsettings + * Autogen update + + -- Sebastien Bacher Thu, 22 Jul 2010 21:41:12 +0200 + +indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Change menus to come from the service + + -- Ted Gould Thu, 15 Jul 2010 10:33:14 -0500 + +indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low + + [ Ted Gould ] + * New upstream release. + * Copyright fixes + * Adding translations + * Fix translation domain + + [ Didier Roche ] + * debian/control: + - bump Standards-Version to latest + - fix homepage url + - remove uneeded pkg-config build-dep + - Recommends: indicator-applet | indicator-renderer + + -- Didier Roche Mon, 07 Jun 2010 10:24:51 +0200 + +indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low + + * New upstream release. + + -- Didier Roche Thu, 03 Jun 2010 17:44:45 +0200 + +indicator-datetime (0.0.2-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream release. + * Making label guess and reasonable width starting out. + + -- Ted Gould Thu, 04 Mar 2010 12:04:55 -0600 + +indicator-datetime (0.0.1-0ubuntu1) lucid; urgency=low + + * New upstream release. + * debian/control: + - add libdbusmenu-gtk-dev build-dep (/!\ not in configure.ac) + + -- Didier Roche Fri, 26 Feb 2010 10:41:22 +0100 + +indicator-datetime (0.0.1~r2-0ubuntu3) lucid; urgency=low + + * debian/control: Adding libdbusmenu-gtk as a build dep + + -- Ted Gould Thu, 18 Feb 2010 10:47:29 -0600 + +indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low + + * debian/control: + - fix build-dep + + -- Didier Roche Thu, 11 Feb 2010 20:27:22 +0100 + +indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low + + * new upstream version + + -- Didier Roche Wed, 10 Feb 2010 12:10:48 +0100 + +indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low + + * Initial packaging + + -- Didier Roche Wed, 27 Jan 2010 12:13:00 +0100 --- indicator-datetime-0.2.3.orig/debian/control +++ indicator-datetime-0.2.3/debian/control @@ -0,0 +1,37 @@ +Source: indicator-datetime +Section: misc +Priority: optional +Maintainer: Ubuntu Desktop Team +Build-Depends: cdbs, + debhelper (>= 5), + intltool (>= 0.35.0), + libindicator-dev (>= 0.3.14), + libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90), + libglib2.0-dev (>= 2.25.0), + libido-0.1-dev (>= 0.2.2), + libgeoclue-dev (>= 0.12.0), + libecal1.2-dev (>= 2.30), + libical-dev (>= 0.44), + libgtk2.0-dev (>= 2.22), + libcairo2-dev (>= 1.10), + libjson-glib-dev, + libunique-dev, + libpolkit-gtk-1-dev, + libedataserver1.2-dev (>= 2.30), + libedataserverui1.2-dev (>= 2.30), + libgconf2-dev (>= 2.31), + dh-autoreconf +Standards-Version: 3.9.1 +Homepage: https://launchpad.net/indicator-datetime +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu + +Package: indicator-datetime +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + geoclue-ubuntu-geoip | geoclue-provider +Recommends: indicator-applet | indicator-renderer +Description: A very, very simple clock + A simple clock appearing in the indicator bar + --- indicator-datetime-0.2.3.orig/debian/source/format +++ indicator-datetime-0.2.3/debian/source/format @@ -0,0 +1 @@ +1.0 --- indicator-datetime-0.2.3.orig/data/org.ayatana.indicator.datetime.gschema.xml +++ indicator-datetime-0.2.3/data/org.ayatana.indicator.datetime.gschema.xml @@ -0,0 +1,61 @@ + + + + + + + + + + 'locale-default' + What the time format should be + + Controls the time format that is displayed in the indicator. For almost + all users this should be the default for their locale. If you think the + setting is wrong for your locale please join or talk to the translation + team for your langauge. If you just want something different you can + adjust this to be either 12 or 24 time. Or, you can use a custom format + string and set the custom-time-format setting. + + + + false + Show the number of seconds in the indicator + + Makes the datetime indicator show the number of seconds in the indicator. + It's important to note that this will cause additional battery drain as + the time will update 60 times as often, so it is not recommended. Also, + this setting will be ignored if the time-format value is set to custom. + + + + false + Show the day of the week in the indicator + + Puts the day of the week on the panel along with the time and/or date + depending on settings. This setting will be ignored if the time-format + value is set to custom. + + + + false + Show the month and date in the indicator + + Puts the month and the date in the panel along with the time and/or day + of the week depending on settings. This setting will be ignored if the + time-format value is set to custom. + + + + "%l:%M %p" + The format string passed to strftime + + The format of the time and/or date that is visible on the panel when using + the indicator. For most users this will be a set of predefined values as + determined by the configuration utility, but advanced users can change it + to anything strftime can accept. Look at the man page on strftime for + more information. + + + + --- indicator-datetime-0.2.3.orig/src/indicator-datetime.c +++ indicator-datetime-0.2.3/src/indicator-datetime.c @@ -275,8 +275,8 @@ // we should only react if we're currently visible gboolean visible; g_object_get(G_OBJECT(menu), "visible", &visible, NULL); - if (visible) return; - g_debug("notify visible menu hidden, resetting date"); + if (!visible) return; + g_debug("notify visible menu shown, resetting date"); time_t curtime; @@ -1285,6 +1285,13 @@ /* Label, probably a username, chat room or mailbox name */ mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPOINTMENT_MENUITEM_PROP_LABEL)); gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5); + + GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(mi_data->label)); + PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(mi_data->label)); + gint length = measure_string(style, context, "MMMMMMMMMMMMMMM"); // 15 char wide string max + gtk_widget_set_size_request(GTK_WIDGET(mi_data->label), length, -1); // Set the min size in pixels + + gtk_label_set_ellipsize(GTK_LABEL(mi_data->label), PANGO_ELLIPSIZE_END); gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0); gtk_widget_show(mi_data->label);