diff options
-rw-r--r-- | debian/changelog | 573 | ||||
-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/disable_Werror.patch | 31 | ||||
-rw-r--r-- | debian/patches/gtk_box_api.patch | 41 | ||||
-rw-r--r-- | debian/patches/lp_802384.patch | 18 | ||||
-rw-r--r-- | debian/patches/lp_844741.patch | 12 | ||||
-rw-r--r-- | debian/patches/series | 4 | ||||
-rwxr-xr-x | debian/rules | 32 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 2 |
14 files changed, 798 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..cbec1e7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,573 @@ +indicator-datetime (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * New upstream release. + * Still need to distribute these files even if we're not building it + * Adding some extra ignore stuff in + * Adding in code coverage calculation + * Allow ccpanel to be optional + * Move to use libtimezone map + * Add a name hint on the indicator + * Build fixes for updated dependencies + * Fixing Geoclue support + + -- Ted Gould <ted@ubuntu.com> Fri, 17 Feb 2012 16:16:23 -0600 + +indicator-datetime (0.3.1-0ubuntu5) precise; urgency=low + + * no change rebuild for libindicator7 + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 25 Jan 2012 09:54:53 -0500 + +indicator-datetime (0.3.1-0ubuntu4) precise; urgency=low + + [ Andreas Moog ] + * Migrate from libpolkit-gtk-1-dev to libpolkit-gobject-1-dev. + + [ Martin Pitt ] + * Add disable_Werror.patch: Disable -Werror, causes build failures due to + deprecated symbols. + + -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 23 Jan 2012 13:09:08 +0100 + +indicator-datetime (0.3.1-0ubuntu3) precise; urgency=low + + * Rebuild for the new e-d-s libraries. + * debian/patches/gtk_box_api.patch: port gtk_hbox_new() to gtk_box_new() if + building for GTK3, no change if building against GTK2. + + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 13 Jan 2012 00:03:40 +0100 + +indicator-datetime (0.3.1-0ubuntu2) precise; urgency=low + + * debian/patches/lp_802384.patch + - Fixed a NULL check which prevented querying geoclue (LP: #802384) + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 28 Oct 2011 11:20:55 -0400 + +indicator-datetime (0.3.1-0ubuntu1) oneiric-proposed; urgency=low + + * New upstream release. + * Drop an unused icon (LP: #746176) + * Fix showing a timezone that we're currently set to (LP: #833337) + * Remove check for libunique as it's unused + * debian/control: Drop libunique requirements, it was unused + + -- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 13:40:21 -0500 + +indicator-datetime (0.3.0-0ubuntu3) oneiric; urgency=low + + * Reupload to oneiric final, the fix is safe and important enough. + + -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 06 Oct 2011 06:50:30 +0200 + +indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low + + * debian/patches/lp_844741.patch + - gnome-control-center crashed with SIGABRT in raise() (LP: #844741) + + -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Oct 2011 11:59:21 -0400 + +indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low + + [ Ken VanDine ] + * debian/control + - Added recommends for e-d-s + + [ Ted Gould ] + * New upstream release. + * Fix corrupt environment when LANGUAGE not set (LP: #861123) + * Measure string size with GLib (LP: #730476) + * Free ECals when they have errors (LP: #774071) + * Fix untranslated string (LP: #853130) + + -- Ted Gould <ted@ubuntu.com> Thu, 29 Sep 2011 15:39:41 -0500 + +indicator-datetime (0.2.95-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * New upstream release. + * Set default timezone on events without (LP: #837359) + * Update docs to specify correct custom formats (LP: #775113) + * Remove add event when using greeter (LP: #836521) + * Fix gettext domain for builder files (LP: #845473) + * Update date correctly when opening menu (LP: #793450) + + [ Didier Roche ] + * debian/control: + - bump the libglib build-dep + + -- Ted Gould <ted@ubuntu.com> Thu, 15 Sep 2011 10:45:57 -0500 + +indicator-datetime (0.2.93-0ubuntu2) oneiric; urgency=low + + * debian/rules + - dh_translations doesn't handle multibuilds, so manually add the domain + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Aug 2011 10:35:45 -0400 + +indicator-datetime (0.2.93-0ubuntu1) oneiric; urgency=low + + * New upstream release. + ∘ Use cleaner GDateTime API + ∘ Use locale preferred date format (LP: #729056) + ∘ Use real ellipsis (LP: #621339) + + -- Ted Gould <ted@ubuntu.com> Thu, 18 Aug 2011 15:36:21 -0500 + +indicator-datetime (0.2.92-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Adding in a new greeter mode + * Fixing autotools + + -- Ted Gould <ted@ubuntu.com> Thu, 11 Aug 2011 11:30:50 -0500 + +indicator-datetime (0.2.91-0ubuntu3) oneiric; urgency=low + + * debian/rules + - run intltool-update to update the translations template + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 12 Aug 2011 10:26:04 -0400 + +indicator-datetime (0.2.91-0ubuntu2) oneiric; urgency=low + + * No change rebuild for evolution-data-server 3.1.3.1 + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 12 Jul 2011 13:45:24 -0400 + +indicator-datetime (0.2.91-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * 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 + * Dropped debian/patches/fix-timezones.patch: merged upstream + + [ Ken VanDine ] + * debian/control + - Bumped build depends for libindicator to >= 0.3.90 + - Added build depends on libgnome-control-center-dev + - Added depends for gnome-control-center + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 08 Jul 2011 09:38:50 -0400 + +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..3167f9e --- /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.90), + libindicator3-dev (>= 0.3.90), + libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-gtk3-dev (>= 0.3.94), + libglib2.0-dev (>= 2.29.19), + libido-0.1-dev (>= 0.2.2), + libido3-0.1-dev (>= 0.2.90), + 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, + libpolkit-gobject-1-dev, + libedataserver1.2-dev (>= 2.30), + libedataserverui-3.0-dev, + libgconf2-dev (>= 2.31), + libgnome-control-center-dev, + 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}, + gnome-control-center, + geoclue-ubuntu-geoip | geoclue-provider +Recommends: indicator-applet | indicator-renderer, evolution-data-server +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}), + gnome-control-center, + 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/disable_Werror.patch b/debian/patches/disable_Werror.patch new file mode 100644 index 0000000..fc267ca --- /dev/null +++ b/debian/patches/disable_Werror.patch @@ -0,0 +1,31 @@ +Description: Disable -Werror, causes build failures due to deprecated symbols. +Author: Martin Pitt <martin.pitt@ubuntu.com> + +Index: indicator-datetime/src/Makefile.am +=================================================================== +--- indicator-datetime.orig/src/Makefile.am 2011-10-06 06:50:07.814203000 +0200 ++++ indicator-datetime/src/Makefile.am 2012-01-23 13:04:31.541545936 +0100 +@@ -15,7 +15,6 @@ + settings-shared.h + indicator_datetime_service_CFLAGS = \ + -Wall \ +- -Werror \ + $(SERVICE_CFLAGS) \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" +@@ -33,7 +32,6 @@ + indicator-datetime.c + libdatetime_la_CFLAGS = \ + $(INDICATOR_CFLAGS) \ +- -Wall -Werror \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" + libdatetime_la_LIBADD = \ +@@ -53,7 +51,6 @@ + settings-shared.h + libindicator_datetime_la_CFLAGS = \ + -Wall \ +- -Werror \ + -I$(top_srcdir)/libmap \ + $(PREF_CFLAGS) \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ diff --git a/debian/patches/gtk_box_api.patch b/debian/patches/gtk_box_api.patch new file mode 100644 index 0000000..0dd28f0 --- /dev/null +++ b/debian/patches/gtk_box_api.patch @@ -0,0 +1,41 @@ +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> +Subject: Port to the new gtk_box_new() instead of gtk_hbox_new(). + +Index: indicator-datetime/src/indicator-datetime.c +=================================================================== +--- indicator-datetime.orig/src/indicator-datetime.c 2012-01-12 23:59:50.815675283 +0100 ++++ indicator-datetime/src/indicator-datetime.c 2012-01-13 00:02:24.083668449 +0100 +@@ -34,6 +34,7 @@ + #include <glib-object.h> + #include <glib/gi18n-lib.h> + #include <gio/gio.h> ++#include <gtk/gtk.h> + + /* Indicator Stuff */ + #include <libindicator/indicator.h> +@@ -1261,7 +1262,12 @@ + + mi_data->gmi = gtk_menu_item_new(); + ++#if GTK_CHECK_VERSION(3, 2, 0) ++ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); ++ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); ++#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 4); ++#endif + + /* Icon, probably someone's face or avatar on an IM */ + mi_data->icon = gtk_image_new(); +@@ -1472,7 +1478,12 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), + dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO)); + ++#if GTK_CHECK_VERSION(3, 2, 0) ++ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); ++ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); ++#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 4); ++#endif + + /* Label, probably a username, chat room or mailbox name */ + mi_data->label = gtk_label_new(""); diff --git a/debian/patches/lp_802384.patch b/debian/patches/lp_802384.patch new file mode 100644 index 0000000..2c30c9f --- /dev/null +++ b/debian/patches/lp_802384.patch @@ -0,0 +1,18 @@ +=== modified file 'src/datetime-service.c' +--- a/src/datetime-service.c 2011-10-13 04:30:40 +0000 ++++ b/src/datetime-service.c 2011-10-23 21:54:15 +0000 +@@ -1404,7 +1404,12 @@ + + geo_master = client; + +- if (geo_master != NULL) { ++ if (error != NULL) { ++ g_warning("Unable to get a GeoClue client! '%s' Geolocation based timezone support will not be available.", error->message); ++ return; ++ } ++ ++ if (geo_master == NULL) { + g_warning(_("Unable to get a GeoClue client! Geolocation based timezone support will not be available.")); + return; + } + diff --git a/debian/patches/lp_844741.patch b/debian/patches/lp_844741.patch new file mode 100644 index 0000000..459779d --- /dev/null +++ b/debian/patches/lp_844741.patch @@ -0,0 +1,12 @@ +=== modified file 'src/timezone-completion.c' +--- a/src/timezone-completion.c 2011-09-06 12:47:37 +0000 ++++ b/src/timezone-completion.c 2011-10-05 15:47:06 +0000 +@@ -355,7 +355,6 @@ + gchar * locale = get_locale (); + gchar * url = g_strdup_printf (GEONAME_URL, escaped, version, locale); + g_free (locale); +- g_free (version); + g_free (escaped); + + GFile * file = g_file_new_for_uri (url); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ab309a3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +disable_Werror.patch +lp_844741.patch +lp_802384.patch +gtk_box_api.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..6d5fdb5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,32 @@ +#!/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 + cd po; intltool-update --pot --verbose + # Language packs + for d in $$(find debian/tmp -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \ + sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ + echo "X-Ubuntu-Gettext-Domain=indicator-datetime" >> $$d; \ + done; + 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 |