diff options
| -rw-r--r-- | data/org.ayatana.indicator.datetime.gschema.xml | 61 | ||||
| -rw-r--r-- | debian/changelog | 428 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 54 | ||||
| -rw-r--r-- | debian/copyright | 27 | ||||
| -rw-r--r-- | debian/indicator-datetime-gtk2.install | 1 | ||||
| -rw-r--r-- | debian/indicator-datetime.install | 1 | ||||
| -rw-r--r-- | debian/patches/fix-timezones.patch | 168 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 25 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/watch | 2 |
12 files changed, 770 insertions, 0 deletions
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml new file mode 100644 index 0000000..c794d83 --- /dev/null +++ b/data/org.ayatana.indicator.datetime.gschema.xml @@ -0,0 +1,61 @@ +<schemalist> + <enum id="time-enum"> + <value nick="locale-default" value="0" /> + <value nick="12-hour" value="1" /> + <value nick="24-hour" value="2" /> + <value nick="custom" value="3" /> + </enum> + <schema id="org.ayatana.indicator.datetime" path="/apps/indicators/datetime/" gettext-domain="indicator-datetime"> + <key name="time-format" enum="time-enum"> + <default>'locale-default'</default> + <summary>What the time format should be</summary> + <description> + 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. + </description> + </key> + <key name="show-seconds" type="b"> + <default>false</default> + <summary>Show the number of seconds in the indicator</summary> + <description> + 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. + </description> + </key> + <key name="show-day" type="b"> + <default>false</default> + <summary>Show the day of the week in the indicator</summary> + <description> + 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. + </description> + </key> + <key name="show-date" type="b"> + <default>false</default> + <summary>Show the month and date in the indicator</summary> + <description> + 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. + </description> + </key> + <key name="custom-time-format" type="s"> + <default>"%l:%M %p"</default> + <summary>The format string passed to strftime</summary> + <description> + 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. + </description> + </key> + </schema> +</schemalist> diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0ea9cf3 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,428 @@ +indicator-datetime (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * New upstream release. + * libindicator 0.4 transition + * Making preferences a gnome-control-center plugin + * Calling gnome-control-center from the menu + * Fixing timezone setting with new gsd + + -- Ted Gould <ted@ubuntu.com> Thu, 07 Jul 2011 16:23:08 -0500 + +indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low + + * No change rebuild to fix badly packaged diff.gz from last time + + -- Michael Terry <mterry@ubuntu.com> Tue, 28 Jun 2011 17:55:25 +0100 + +indicator-datetime (0.2.90-0ubuntu3) oneiric; urgency=low + + * debian/rules, debian/control: + - Arg, this wasn't source format 3.0, so add quilt so that the patch + applies. + + -- Michael Terry <mterry@ubuntu.com> Tue, 28 Jun 2011 17:05:59 +0100 + +indicator-datetime (0.2.90-0ubuntu2) oneiric; urgency=low + + * debian/control: + - Drop -gtk2 recommends for the gtk3 indicator + * debian/rules: + - Use dh-autoreconf + * debian/patches/fix-timezones.patch: + - Add patch to handle g-s-d DBus API change for timezones and to + be more robust about querying what the current timezone is + + -- Michael Terry <mterry@ubuntu.com> Tue, 28 Jun 2011 15:42:39 +0100 + +indicator-datetime (0.2.90-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * New upstream release. + - Set minimum width for appointments to prevent continuous resizing + when the calendar is hiden and ensure there is enough of the + event description visible (LP: #762976) + - ellipsize long appointment descriptions (LP: #750671) + - GTK3 build + * Dropping debian/patches/lp_762976.patch and debian/patches/lp_750671.patch + as merged upstream. + * debian/control: Switching dep to libedataserverui-3.0-dev + + [ Ken VanDine ] + * debian/control + - Bumped standards version to 3.9.2 + - Add new binary for indicator-datetime-gtk2 + - Make indicator-datetime recommend indicator-datetime-gtk2 (until unity + can load gtk3 indicators) + - indicator-datetime-gtk2 replaces indicator-datetime << 0.2.90 + - Added build depends for libdbusmenu-gtk3-dev and libindicator3-dev + * debian/rules + - build for both gtk2 and gtk3 + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 22 Jun 2011 11:46:55 -0400 + +indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low + + * debian/patches/lp_762976.patch + - Set minimum width for appointments to prevent continuous resizing + when the calendar is hiden and ensure there is enough of the + event description visible (LP: #762976) + + -- Ken VanDine <ken.vandine@canonical.com> Mon, 18 Apr 2011 10:05:41 -0400 + +indicator-datetime (0.2.3-0ubuntu2) natty; urgency=low + + * debian/patches/lp_750671.patch + - ellipsize long appointment descriptions (LP: #750671) + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 15 Apr 2011 10:00:41 -0400 + +indicator-datetime (0.2.3-0ubuntu2~ppa1) natty; urgency=low + + * Upstream Merge + * Ellipsize calendar entries that are too long (LP: #750671) + + -- Ted Gould <ted@ubuntu.com> 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 <ted@ubuntu.com> 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 <ken.vandine@canonical.com> 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 <ted@ubuntu.com> 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 <ted@ubuntu.com> 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 <ted@ubuntu.com> 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 <ted@ubuntu.com> 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 <ken.vandine@canonical.com> 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 <mterry@ubuntu.com> 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 <ken.vandine@canonical.com> 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 <ted@ubuntu.com> 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 <ken.vandine@canonical.com> 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 <ken.vandine@canonical.com> 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 <ken.vandine@canonical.com> 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 <ted@ubuntu.com> 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 <ted@ubuntu.com> 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 <ken.vandine@canonical.com> 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 <ken.vandine@canonical.com> 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 <ken.vandine@canonical.com> 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 <ted@ubuntu.com> 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 <didrocks@ubuntu.com> 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 <didrocks@ubuntu.com> 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 <ted@ubuntu.com> 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 <seb128@ubuntu.com> 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 <seb128@ubuntu.com> 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 <ted@ubuntu.com> 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 <didrocks@ubuntu.com> Mon, 07 Jun 2010 10:24:51 +0200 + +indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low + + * New upstream release. + + -- Didier Roche <didrocks@ubuntu.com> 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 <ted@ubuntu.com> 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 <didrocks@ubuntu.com> 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 <ted@ubuntu.com> 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 <didrocks@ubuntu.com> Thu, 11 Feb 2010 20:27:22 +0100 + +indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low + + * new upstream version + + -- Didier Roche <didrocks@ubuntu.com> Wed, 10 Feb 2010 12:10:48 +0100 + +indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low + + * Initial packaging + + -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jan 2010 12:13:00 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b830e91 --- /dev/null +++ b/debian/control @@ -0,0 +1,54 @@ +Source: indicator-datetime +Section: misc +Priority: optional +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> +Build-Depends: cdbs, + debhelper (>= 5), + quilt, + intltool (>= 0.35.0), + libindicator-dev (>= 0.3.19), + libindicator3-dev (>= 0.3.19), + libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-gtk3-dev (>= 0.3.94), + libglib2.0-dev (>= 2.25.0), + libido-0.1-dev (>= 0.2.2), + libido3-0.1-dev (>= 0.2.90), + libunique-3.0-dev, + libgeoclue-dev (>= 0.12.0), + libecal1.2-dev (>= 2.30), + libical-dev (>= 0.44), + libgtk2.0-dev (>= 2.22), + libgtk-3-dev (>= 3.1.4), + libcairo2-dev (>= 1.10), + libjson-glib-dev, + libunique-dev, + libpolkit-gtk-1-dev, + libedataserver1.2-dev (>= 2.30), + libedataserverui-3.0-dev, + libgconf2-dev (>= 2.31), + dh-autoreconf +Standards-Version: 3.9.2 +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: Simple clock + A simple clock appearing in the indicator bar + +Package: indicator-datetime-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-datetime (= ${binary:Version}), + geoclue-ubuntu-geoip | geoclue-provider +Replaces: indicator-datetime (<< 0.2.90) +Recommends: indicator-applet | indicator-renderer +Description: Simple clock + A simple clock appearing in the indicator bar + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..1db6a43 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Didier Roche <didrocks@ubuntu.com> on +Wed, 10 Feb 2010 11:11:01 +0100. + +It was downloaded from https://launchpad.net/indicator-datetime + +Upstream Author: + + Ted Gould <ted@canonical.com> + +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. diff --git a/debian/indicator-datetime-gtk2.install b/debian/indicator-datetime-gtk2.install new file mode 100644 index 0000000..8d1fc9f --- /dev/null +++ b/debian/indicator-datetime-gtk2.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install new file mode 100644 index 0000000..19a45de --- /dev/null +++ b/debian/indicator-datetime.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr / diff --git a/debian/patches/fix-timezones.patch b/debian/patches/fix-timezones.patch new file mode 100644 index 0000000..6e32d61 --- /dev/null +++ b/debian/patches/fix-timezones.patch @@ -0,0 +1,168 @@ +Index: indicator-datetime.ubu/src/Makefile.am +=================================================================== +--- indicator-datetime.ubu.orig/src/Makefile.am 2011-06-28 15:42:04.085059003 +0100 ++++ indicator-datetime.ubu/src/Makefile.am 2011-06-28 15:42:19.553059167 +0100 +@@ -34,6 +34,7 @@ + libdatetime_la_CFLAGS = \ + $(INDICATOR_CFLAGS) \ + -Wall -Werror \ ++ -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" + libdatetime_la_LIBADD = \ + $(INDICATOR_LIBS) +@@ -55,6 +56,7 @@ + -Werror \ + -I$(top_srcdir)/libmap \ + $(PREF_CFLAGS) \ ++ -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DPKGDATADIR="\"$(pkgdatadir)\"" + indicator_datetime_preferences_LDADD = \ + $(top_builddir)/libmap/libmap.la \ +Index: indicator-datetime.ubu/src/datetime-prefs.c +=================================================================== +--- indicator-datetime.ubu.orig/src/datetime-prefs.c 2011-06-28 15:42:04.129059003 +0100 ++++ indicator-datetime.ubu/src/datetime-prefs.c 2011-06-28 15:42:19.553059167 +0100 +@@ -223,10 +223,8 @@ + if (location == NULL) + return; + +- gchar * file = g_build_filename ("/usr/share/zoneinfo", location->zone, NULL); +- g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", file), ++ g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", location->zone), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "timezone"); +- g_free (file); + + sync_entry (location->zone); + } +Index: indicator-datetime.ubu/src/datetime-service.c +=================================================================== +--- indicator-datetime.ubu.orig/src/datetime-service.c 2011-06-28 15:42:04.249059005 +0100 ++++ indicator-datetime.ubu/src/datetime-service.c 2011-06-28 15:42:19.561059167 +0100 +@@ -221,29 +221,15 @@ + current_timezone = NULL; + } + +- GError * error = NULL; +- gchar * tempzone = NULL; +- if (!g_file_get_contents(TIMEZONE_FILE, &tempzone, NULL, &error)) { +- g_warning("Unable to read timezone file '" TIMEZONE_FILE "': %s", error->message); +- g_error_free(error); ++ current_timezone = read_timezone (); ++ if (current_timezone == NULL) { + return; + } + +- /* This shouldn't happen, so let's make it a big boom! */ +- g_return_if_fail(tempzone != NULL); +- +- /* Note: this really makes sense as strstrip works in place +- so we end up with something a little odd without the dup +- so we have the dup to make sure everything is as expected +- for everyone else. */ +- current_timezone = g_strdup(g_strstrip(tempzone)); +- g_free(tempzone); +- + g_debug("System timezone is: %s", current_timezone); + + check_timezone_sync(); + +- if (error != NULL) g_error_free(error); + return; + } + +@@ -276,10 +262,8 @@ + return; + } + +- gchar * file = g_build_filename ("/usr/share/zoneinfo", (char *)zone, NULL); +- g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", file), ++ g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", zone), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, quick_set_tz_cb, NULL); +- g_free (file); + g_free (zone); + g_object_unref (proxy); + } +Index: indicator-datetime.ubu/src/indicator-datetime.c +=================================================================== +--- indicator-datetime.ubu.orig/src/indicator-datetime.c 2011-06-28 15:42:04.293059005 +0100 ++++ indicator-datetime.ubu/src/indicator-datetime.c 2011-06-28 15:42:19.565059167 +0100 +@@ -761,11 +761,18 @@ + GTimeZone * tz, const gchar * format, + GDateTime ** datetime) + { ++ gboolean unref_tz = FALSE; ++ if (tz == NULL) { ++ gchar * zone = read_timezone (); ++ if (zone == NULL) ++ return; ++ tz = g_time_zone_new(zone); ++ unref_tz = TRUE; ++ g_free (zone); ++ } ++ + GDateTime * datetime_now; +- if (tz == NULL) +- datetime_now = g_date_time_new_now_local(); +- else +- datetime_now = g_date_time_new_now(tz); ++ datetime_now = g_date_time_new_now(tz); + + gchar * timestr; + if (format == NULL) { +@@ -793,6 +800,9 @@ + else + g_date_time_unref(datetime_now); + ++ if (unref_tz) ++ g_time_zone_unref(tz); ++ + return; + } + +Index: indicator-datetime.ubu/src/utils.c +=================================================================== +--- indicator-datetime.ubu.orig/src/utils.c 2011-06-28 15:42:04.169059004 +0100 ++++ indicator-datetime.ubu/src/utils.c 2011-06-28 15:42:19.565059167 +0100 +@@ -117,6 +117,30 @@ + return rv; + } + ++gchar * ++read_timezone () ++{ ++ GError * error = NULL; ++ gchar * tempzone = NULL; ++ if (!g_file_get_contents(TIMEZONE_FILE, &tempzone, NULL, &error)) { ++ g_warning("Unable to read timezone file '" TIMEZONE_FILE "': %s", error->message); ++ g_error_free(error); ++ return NULL; ++ } ++ ++ /* This shouldn't happen, so let's make it a big boom! */ ++ g_return_val_if_fail(tempzone != NULL, NULL); ++ ++ /* Note: this really makes sense as strstrip works in place ++ so we end up with something a little odd without the dup ++ so we have the dup to make sure everything is as expected ++ for everyone else. */ ++ gchar * rv = g_strdup(g_strstrip(tempzone)); ++ g_free(tempzone); ++ ++ return rv; ++} ++ + /* Translate msg according to the locale specified by LC_TIME */ + static char * + T_(const char *msg) +Index: indicator-datetime.ubu/src/utils.h +=================================================================== +--- indicator-datetime.ubu.orig/src/utils.h 2011-06-28 15:42:04.209059004 +0100 ++++ indicator-datetime.ubu/src/utils.h 2011-06-28 15:42:19.569059167 +0100 +@@ -30,6 +30,7 @@ + gboolean is_locale_12h (void); + void split_settings_location (const gchar * location, gchar ** zone, gchar ** name); + gchar * get_current_zone_name (const gchar * location); ++gchar * read_timezone (); + gchar * generate_format_string_full (gboolean show_day, gboolean show_date); + gchar * generate_format_string_at_time (GDateTime * time); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a593ee2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-timezones.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..2ad101c --- /dev/null +++ b/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk + +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-static + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..641f050 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-datetime/+download .*/indicator-datetime-([0-9.]+)\.tar\.gz |