From 988a0e6cc220f1b78cbabded6fc7e5ab8c40aa61 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 10 Feb 2010 11:40:04 +0100 Subject: Initial packaging --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 20 ++++++++++++++++++++ debian/copyright | 31 +++++++++++++++++++++++++++++++ debian/rules | 10 ++++++++++ debian/watch | 2 ++ 6 files changed, 69 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4511028 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +indicator-datetime (0.0.1~r1-0ubuntu1) UNRELEASED; urgency=low + + * Initial packaging + + -- Didier Roche 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..49f0656 --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: indicator-datetime +Section: misc +Priority: optional +Maintainer: Ubuntu Desktop Team +Build-Depends: cdbs, + debhelper (>= 5), + pkg-config, + intltool (>= 0.35.0), + libindicate-dev (>= 0.3.0), + libdbusmenu-glib-dev (>= 0.1.1) +Standards-Version: 3.8.3 +Homepage: https://launchpad.net/indicator-applet-developers + +Package: indicator-datetime +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: A very, very simple clock + A simple clock appearing in the indicator bar + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..0f2c982 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +The Debian packaging is (C) 2009, Canonical Ltd. and is licensed under the +GPLv3, see /usr/share/common-licenses/GPL-3. diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..6202dd3 --- /dev/null +++ b/debian/rules @@ -0,0 +1,10 @@ +#!/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 + +# List any files which are not installed +include /usr/share/cdbs/1/rules/utils.mk +common-binary-post-install-arch:: list-missing + 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 -- cgit v1.2.3 From 565a60a383e7a1b7e0b6c94f55544e8258ce1d18 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 10 Feb 2010 12:06:54 +0100 Subject: remove .la and .a file --- debian/rules | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 6202dd3..87f7f7e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ 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 - -# List any files which are not installed include /usr/share/cdbs/1/rules/utils.mk -common-binary-post-install-arch:: list-missing +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 -- cgit v1.2.3 From 404882ad36b3092f115fba92e40d85829c77e3a5 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 10 Feb 2010 12:08:35 +0100 Subject: update copyright --- debian/copyright | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 0f2c982..1db6a43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,9 +23,5 @@ License: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -The Debian packaging is (C) 2009, Canonical Ltd. and is licensed under the +The Debian packaging is (C) 2010, Canonical Ltd. and is licensed under the GPLv3, see /usr/share/common-licenses/GPL-3. -- cgit v1.2.3 From d127f5f47854308571bf6635d474825e4a1ceb7a Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 10 Feb 2010 12:10:51 +0100 Subject: releasing version 0.0.1~r2-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ba0ecf2..385c5f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-datetime (0.0.1~r2-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low * new upstream version - -- Didier Roche Wed, 27 Jan 2010 12:13:00 +0100 + -- Didier Roche Wed, 10 Feb 2010 12:10:48 +0100 indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 8fb2b5aa6ce133bf3f83b873af97639aeee60b84 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 11 Feb 2010 20:27:20 +0100 Subject: * debian/control: - fix build-dep --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 385c5f9..82f5d2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.1~r2-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: + - fix build-dep + + -- Didier Roche Thu, 11 Feb 2010 20:26:58 +0100 + indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low * new upstream version diff --git a/debian/control b/debian/control index 49f0656..5347b7d 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: cdbs, debhelper (>= 5), pkg-config, intltool (>= 0.35.0), - libindicate-dev (>= 0.3.0), + libindicator-dev (>= 0.3.0), libdbusmenu-glib-dev (>= 0.1.1) Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-applet-developers -- cgit v1.2.3 From 86c5b21756930411a0916008a8f5f07606760a65 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 11 Feb 2010 20:27:25 +0100 Subject: releasing version 0.0.1~r2-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 82f5d2b..8bb1a90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.1~r2-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low * debian/control: - fix build-dep - -- Didier Roche Thu, 11 Feb 2010 20:26:58 +0100 + -- Didier Roche Thu, 11 Feb 2010 20:27:22 +0100 indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 286d9727bda2d0ca4a8184c7868c55bc6aba4752 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 10:43:35 -0600 Subject: debian/control: Adding libdbusmenu-gtk as a build dep --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8bb1a90..1d0b831 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.0.1~r2-0ubuntu3) UNRELEASED; urgency=low + + * debian/control: Adding libdbusmenu-gtk as a build dep + + -- Ted Gould Thu, 18 Feb 2010 10:43:12 -0600 + indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 5347b7d..da100b2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: cdbs, pkg-config, intltool (>= 0.35.0), libindicator-dev (>= 0.3.0), - libdbusmenu-glib-dev (>= 0.1.1) + libdbusmenu-glib-dev (>= 0.1.1), + libdbusmenu-gtk-dev (>= 0.1.1) Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-applet-developers -- cgit v1.2.3 From 9646023abbcc4f2914fa513118a9de8c3e9374c0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 10:47:38 -0600 Subject: releasing version 0.0.1~r2-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1d0b831..9f60c66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-datetime (0.0.1~r2-0ubuntu3) UNRELEASED; urgency=low +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:43:12 -0600 + -- Ted Gould Thu, 18 Feb 2010 10:47:29 -0600 indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low -- cgit v1.2.3 From de70f9adb1ea04d2cd64525a3df459dfca893c93 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 25 Feb 2010 13:31:37 -0600 Subject: releasing version 0.0.1-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8e0ed97..80f7658 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-datetime (0.0.1-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.0.1-0ubuntu1) lucid; urgency=low * Initial Upstream Release - -- Ted Gould Thu, 25 Feb 2010 12:42:50 -0600 + -- Ted Gould Thu, 25 Feb 2010 13:31:34 -0600 indicator-datetime (0.0.1~r2-0ubuntu3) lucid; urgency=low -- cgit v1.2.3 From 4827706617c4009108fdc8e6b662a8994ed39d3e Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Fri, 26 Feb 2010 10:41:20 +0100 Subject: * debian/control: - add libdbusmenu-gtk-dev build-dep (/!\ not in configure.ac) --- debian/changelog | 2 ++ debian/control | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e8e7d2a..2d89419 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ indicator-datetime (0.0.1-0ubuntu1) UNRELEASED; urgency=low * New upstream release. + * debian/control: + - add libdbusmenu-gtk-dev build-dep (/!\ not in configure.ac) -- Didier Roche Fri, 26 Feb 2010 10:39:44 +0100 diff --git a/debian/control b/debian/control index 5347b7d..da100b2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: cdbs, pkg-config, intltool (>= 0.35.0), libindicator-dev (>= 0.3.0), - libdbusmenu-glib-dev (>= 0.1.1) + libdbusmenu-glib-dev (>= 0.1.1), + libdbusmenu-gtk-dev (>= 0.1.1) Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-applet-developers -- cgit v1.2.3 From c16b46883470d8aaccbab6ab76c2cbe953b912d5 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Fri, 26 Feb 2010 10:41:28 +0100 Subject: releasing version 0.0.1-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2d89419..19ee918 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.0.1-0ubuntu1) UNRELEASED; urgency=low +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:39:44 +0100 + -- Didier Roche Fri, 26 Feb 2010 10:41:22 +0100 indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low -- cgit v1.2.3 From 650a34e3aef656b0a5d2d76b5d26c2a027798438 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 4 Mar 2010 12:05:07 -0600 Subject: releasing version 0.0.2-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fde9490..fd473ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.2-0ubuntu2) UNRELEASED; urgency=low +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:01:17 -0600 + -- Ted Gould Thu, 04 Mar 2010 12:04:55 -0600 indicator-datetime (0.0.1-0ubuntu1) lucid; urgency=low -- cgit v1.2.3 From 43138ce788723d7d5877021e2f390b4b43787d5f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Jun 2010 12:40:54 -0500 Subject: releasing version 0.0.3-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6f227da..8cafee3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.0.3-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Copyright fixes * Adding translations * Fix translation domain - -- Ted Gould Thu, 03 Jun 2010 12:36:35 -0500 + -- Ted Gould Thu, 03 Jun 2010 12:40:49 -0500 indicator-datetime (0.0.2-0ubuntu1~ppa1) lucid; urgency=low -- cgit v1.2.3 From c2ff294e75eb22c452499d8c405a54b3f31d8fdf Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 3 Jun 2010 13:19:07 -0500 Subject: releasing version 0.0.2-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6918eba..49dad06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.0.2-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low * New upstream release. -- cgit v1.2.3 From f724c18fda41d9a29d0cf80bb7a4adea4f209ade Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 7 Jun 2010 10:27:01 +0200 Subject: * debian/control: - bump Standards-Version to latest --- debian/changelog | 7 ++++++- debian/control | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f736b8..15c3b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ indicator-datetime (0.0.3-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * New upstream release. * Copyright fixes * Adding translations * Fix translation domain - -- Ted Gould Thu, 03 Jun 2010 12:40:49 -0500 + [ Didier Roche ] + * debian/control: + - bump Standards-Version to latest + + -- Didier Roche Mon, 07 Jun 2010 10:24:51 +0200 indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index da100b2..0a4d2f7 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: cdbs, libindicator-dev (>= 0.3.0), libdbusmenu-glib-dev (>= 0.1.1), libdbusmenu-gtk-dev (>= 0.1.1) -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-applet-developers Package: indicator-datetime -- cgit v1.2.3 From a40dac6068f31dfca2bcdf5ff6610029556c5b74 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 7 Jun 2010 10:27:26 +0200 Subject: fix homepage url --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 15c3b00..193a75f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ indicator-datetime (0.0.3-0ubuntu1) UNRELEASED; urgency=low [ Didier Roche ] * debian/control: - bump Standards-Version to latest + - fix homepage url -- Didier Roche Mon, 07 Jun 2010 10:24:51 +0200 diff --git a/debian/control b/debian/control index 0a4d2f7..d7d5f92 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: cdbs, libdbusmenu-glib-dev (>= 0.1.1), libdbusmenu-gtk-dev (>= 0.1.1) Standards-Version: 3.8.4 -Homepage: https://launchpad.net/indicator-applet-developers +Homepage: https://launchpad.net/indicator-datetime Package: indicator-datetime Architecture: any -- cgit v1.2.3 From d55ceb3b97e8e904ef02f24ea105c1ef387af845 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 7 Jun 2010 10:29:54 +0200 Subject: remove uneeded pkg-config build-dep --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 193a75f..7fd83bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ indicator-datetime (0.0.3-0ubuntu1) UNRELEASED; urgency=low * debian/control: - bump Standards-Version to latest - fix homepage url + - remove uneeded pkg-config build-dep -- Didier Roche Mon, 07 Jun 2010 10:24:51 +0200 diff --git a/debian/control b/debian/control index d7d5f92..9dff62e 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), - pkg-config, intltool (>= 0.35.0), libindicator-dev (>= 0.3.0), libdbusmenu-glib-dev (>= 0.1.1), -- cgit v1.2.3 From a80ffd8de1dd3304c2a195cece53d53571aaf75d Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 7 Jun 2010 13:19:48 +0200 Subject: Recommends: indicator-applet | indicator-renderer --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7fd83bd..21707dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ indicator-datetime (0.0.3-0ubuntu1) UNRELEASED; urgency=low - 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 diff --git a/debian/control b/debian/control index 9dff62e..40c540b 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Package: indicator-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: indicator-applet | indicator-renderer Description: A very, very simple clock A simple clock appearing in the indicator bar -- cgit v1.2.3 From f0e88ea41b38f7b1590e728b30a8f43a9a5980fd Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 8 Jun 2010 12:17:15 +0200 Subject: releasing version 0.0.3-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 21707dd..9d82a81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.0.3-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low [ Ted Gould ] * New upstream release. -- cgit v1.2.3 From f1cf5b2adebdd677efb55c68d28722ed4f162848 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 12 Jul 2010 16:01:30 -0500 Subject: Autogen update --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 106bdc6..0aecb9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) UNRELEASED; urgency=low * Merge upstream * Change menus to come from the service + * Autogen update - -- Ted Gould Mon, 12 Jul 2010 15:52:39 -0500 + -- Ted Gould Mon, 12 Jul 2010 16:01:20 -0500 indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From d051dbe509a1e88a0c3047a19c94130d58a9aa94 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 12 Jul 2010 16:02:14 -0500 Subject: releasing version 0.0.3-0ubuntu2~ppa1~service1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0aecb9a..0913c6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) lucid; urgency=low * Merge upstream * Change menus to come from the service * Autogen update - -- Ted Gould Mon, 12 Jul 2010 16:01:20 -0500 + -- Ted Gould Mon, 12 Jul 2010 16:02:10 -0500 indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 450c1e83e165e1762c2f1ce495b70afeb2b4edb7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 12 Jul 2010 20:59:50 -0500 Subject: debian/control: Adding in a glib dependency to get gsettings --- debian/changelog | 3 ++- debian/control | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 19b025e..95e78d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) UNRELEASED; urgency=low * Merge upstream * Adding in GSettings for configuring the format on the panel. + * debian/control: Adding in a glib dependency to get gsettings - -- Ted Gould Mon, 12 Jul 2010 20:57:15 -0500 + -- Ted Gould Mon, 12 Jul 2010 20:59:29 -0500 indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) lucid; urgency=low diff --git a/debian/control b/debian/control index 40c540b..7ef65bc 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: cdbs, intltool (>= 0.35.0), libindicator-dev (>= 0.3.0), libdbusmenu-glib-dev (>= 0.1.1), - libdbusmenu-gtk-dev (>= 0.1.1) + libdbusmenu-gtk-dev (>= 0.1.1), + libglib2.0-dev (>= 2.25.0) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-datetime -- cgit v1.2.3 From 826f0582121e92933bde6415e4c8e6d4ae968f19 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 12 Jul 2010 21:42:56 -0500 Subject: Autogen update --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 95e78d5..bb3c1cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) UNRELEASED; urgency=low * Merge upstream * Adding in GSettings for configuring the format on the panel. * debian/control: Adding in a glib dependency to get gsettings + * Autogen update - -- Ted Gould Mon, 12 Jul 2010 20:59:29 -0500 + -- Ted Gould Mon, 12 Jul 2010 21:42:48 -0500 indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) lucid; urgency=low -- cgit v1.2.3 From 9343fb925e25f5f4d593f88f7e18deecf0aabe32 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 13 Jul 2010 11:10:29 -0500 Subject: releasing version 0.0.3-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 673c8a3..d0e92e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu2~ppa1) lucid; urgency=low * Merge upstream * Change menus to come from the service * Autogen update - -- Ted Gould Tue, 13 Jul 2010 11:09:29 -0500 + -- Ted Gould Tue, 13 Jul 2010 11:10:26 -0500 indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 72a8638789f2fd5e4e48ad62db2a7a97c21acd0b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Jul 2010 11:31:41 -0500 Subject: releasing version 0.0.3-0ubuntu2~ppa1~confmat1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bb3c1cb..a6b3940 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) lucid; urgency=low * Merge upstream * Adding in GSettings for configuring the format on the panel. * debian/control: Adding in a glib dependency to get gsettings * Autogen update - -- Ted Gould Mon, 12 Jul 2010 21:42:48 -0500 + -- Ted Gould Wed, 14 Jul 2010 11:31:28 -0500 indicator-datetime (0.0.3-0ubuntu2~ppa1~service1) lucid; urgency=low -- cgit v1.2.3 From 6ad83a198ae45dff5f038a4fa13a70777f944449 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Jul 2010 11:32:05 -0500 Subject: Rebuilding for new glib --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a6b3940..a2be9f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat2) UNRELEASED; urgency=low + + * Rebuilding for new glib + + -- Ted Gould Wed, 14 Jul 2010 11:31:46 -0500 + indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) lucid; urgency=low * Merge upstream -- cgit v1.2.3 From fc3ab7720e32da20cf06c2b0e6af2aac0cc44f73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Jul 2010 11:32:37 -0500 Subject: releasing version 0.0.3-0ubuntu2~ppa1~confmat2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a2be9f4..a79b5b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat2) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat2) lucid; urgency=low * Rebuilding for new glib - -- Ted Gould Wed, 14 Jul 2010 11:31:46 -0500 + -- Ted Gould Wed, 14 Jul 2010 11:32:34 -0500 indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat1) lucid; urgency=low -- cgit v1.2.3 From fb316fcd1a0f967f14f7e8ab14bbd7b419786dd0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Jul 2010 10:33:16 -0500 Subject: releasing version 0.0.4-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 40c0bd0..7e2cd91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.4-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.0.4-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. * Change menus to come from the service - -- Ted Gould Thu, 15 Jul 2010 10:32:12 -0500 + -- Ted Gould Thu, 15 Jul 2010 10:33:14 -0500 indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From f0b07afe1d87e8e134f3629624ee33788c834e8e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Jul 2010 21:27:00 -0500 Subject: releasing version 0.0.3-0ubuntu2~ppa1~confmat3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 544f06c..e44e193 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat3) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat3) lucid; urgency=low * Upstream Merge * Moving around the preferences to have something more flexible and updating code. - -- Ted Gould Thu, 15 Jul 2010 21:25:40 -0500 + -- Ted Gould Thu, 15 Jul 2010 21:26:56 -0500 indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat2) lucid; urgency=low -- cgit v1.2.3 From bae1864b2d7fa6a11a31e843f549d5ab7cb39fcc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Jul 2010 17:03:46 -0500 Subject: releasing version 0.0.3-0ubuntu2~ppa1~confmat4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a5a8214..e37bdbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat4) UNRELEASED; urgency=low +indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat4) lucid; urgency=low * Upstream Merge * Whew. Now it does everything, just choose your format! - -- Ted Gould Fri, 16 Jul 2010 17:00:50 -0500 + -- Ted Gould Fri, 16 Jul 2010 17:03:43 -0500 indicator-datetime (0.0.3-0ubuntu2~ppa1~confmat3) lucid; urgency=low -- cgit v1.2.3 From 3ce9af6066484f5faa6ac3a2569d7ea9fb804745 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Jul 2010 07:52:07 -0500 Subject: releasing version 0.0.4-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 25719dd..e057a49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.0.4-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.0.4-0ubuntu2~ppa1) lucid; urgency=low * Upstream Merge * Making time format configurable via translations and @@ -6,7 +6,7 @@ indicator-datetime (0.0.4-0ubuntu2~ppa1) UNRELEASED; urgency=low * debian/control: Adding in a glib dependency to get gsettings * Autogen update - -- Ted Gould Mon, 19 Jul 2010 07:50:10 -0500 + -- Ted Gould Mon, 19 Jul 2010 07:52:01 -0500 indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From ad7305f85c811817622a21abd4b8a6bb8d7839fa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Aug 2010 22:03:52 -0500 Subject: releasing version 0.0.4-0ubuntu2~ppa2~update1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c6ae7a3..fb8e330 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.0.4-0ubuntu2~ppa2~update1) UNRELEASED; urgency=low +indicator-datetime (0.0.4-0ubuntu2~ppa2~update1) maverick; urgency=low * Upstream Merge * Refresh times on timezone change * Update the date daily - -- Ted Gould Mon, 30 Aug 2010 22:02:43 -0500 + -- Ted Gould Mon, 30 Aug 2010 22:03:50 -0500 indicator-datetime (0.0.4-0ubuntu2~ppa1) lucid; urgency=low -- cgit v1.2.3 From 60c2bd35d848053af194695e098232489c5a0439 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 7 Sep 2010 19:22:45 +0200 Subject: releasing version 0.0.5-0ubuntu2 --- debian/changelog | 13 +++++++++++-- debian/rules | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e057a49..92c3ced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,21 @@ -indicator-datetime (0.0.4-0ubuntu2~ppa1) lucid; urgency=low +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 - -- Ted Gould Mon, 19 Jul 2010 07:52:01 -0500 + -- Sebastien Bacher Thu, 22 Jul 2010 21:41:12 +0200 indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low diff --git a/debian/rules b/debian/rules index 87f7f7e..ff2614a 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ 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 install/indicator-datetime:: -- cgit v1.2.3 From 07b0183fa5ddf8ea3200ae58bd22f95989beae10 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 12:49:05 -0500 Subject: Update the date daily (lp: #614529) --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6cc2ab4..87b0be3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,9 @@ indicator-datetime (0.0.5-0ubuntu3~ppa1) UNRELEASED; urgency=low * Upstream Merge * Refresh times on timezone change - * Update the date daily + * Update the date daily (lp: #614529) - -- Ted Gould Tue, 07 Sep 2010 12:45:14 -0500 + -- Ted Gould Tue, 07 Sep 2010 12:48:44 -0500 indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From 50a929d404a5bb7244043bafb3b0f5467c674eef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Sep 2010 13:00:30 -0500 Subject: releasing version 0.0.5-0ubuntu3~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3d55785..30ecb9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.0.5-0ubuntu3~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.0.5-0ubuntu3~ppa1) maverick; urgency=low * Upstream Merge * Refresh times on timezone change @@ -6,7 +6,7 @@ indicator-datetime (0.0.5-0ubuntu3~ppa1) UNRELEASED; urgency=low * Fixing distcheck * Autogen - -- Ted Gould Tue, 07 Sep 2010 12:59:13 -0500 + -- Ted Gould Tue, 07 Sep 2010 13:00:25 -0500 indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From c10092cc091880a55138bbd23597ef0043115ce7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Sep 2010 13:10:15 -0500 Subject: releasing version 0.0.6-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3e9ee5b..bf6f276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.0.6-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu1~ppa1) 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 12:59:51 -0500 + -- Ted Gould Thu, 09 Sep 2010 13:10:10 -0500 indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From 853418a9952d986f1ee2cabf6f2fd2c98cb37a86 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 11:06:34 +0200 Subject: * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 097ee42..e75d9c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu2) UNRELEASED; urgency=low + + * Rebuild for libindicator ABI change (LP: #637692) + * debian/control: depends on latest libindicator-dev + + -- Didier Roche Wed, 22 Sep 2010 11:05:15 +0200 + indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 9477216..b97d1f4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), intltool (>= 0.35.0), - libindicator-dev (>= 0.3.0), + libindicator-dev (>= 0.3.14), libdbusmenu-glib-dev (>= 0.1.1), libdbusmenu-gtk-dev (>= 0.1.1), libglib2.0-dev (>= 2.25.0), -- cgit v1.2.3 From 033e07600d4c846192706351d4deacec6bc8bfdd Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 18:21:28 +0200 Subject: releasing version 0.0.6-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e75d9c7..df81697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.6-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu2) libindicator; urgency=low * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev - -- Didier Roche Wed, 22 Sep 2010 11:05:15 +0200 + -- Didier Roche Wed, 22 Sep 2010 18:21:26 +0200 indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 1c8015f0f5c242b4c44680c71eae7a801af9939f Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 18:26:19 +0200 Subject: releasing version 0.0.6-0ubuntu2 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index df81697..c5467dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.0.6-0ubuntu2) libindicator; urgency=low +indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev -- cgit v1.2.3 From f37658a9eccd1e0e8a9ad48212d037344b0bfaee Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 30 Sep 2010 16:09:37 +0200 Subject: * Cherry-picked from upstream: - Fix date string format (12/24h) not taken from translation (LP: #579134) --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c5467dd..9584cd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu3) UNRELEASED; 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:08:19 +0200 + indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low * Rebuild for libindicator ABI change (LP: #637692) -- cgit v1.2.3 From 974563dd39779e15266247310a65a24e96eeee6d Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 30 Sep 2010 16:09:42 +0200 Subject: releasing version 0.0.6-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9584cd0..15ee615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.6-0ubuntu3) UNRELEASED; urgency=low +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:08:19 +0200 + -- Didier Roche Thu, 30 Sep 2010 16:09:41 +0200 indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low -- cgit v1.2.3 From c6d36a6650057d6b4186f37dcc4f38c368c7b3c7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Oct 2010 15:17:33 -0600 Subject: Autogen --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2dcd7d3..dd3d5d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-datetime (0.0.6-0ubuntu1~ppa2~geo1) UNRELEASED; urgency=low * Upstream Merge * Add in Geoclue support for setting proper timezone + * Autogen - -- Ted Gould Thu, 07 Oct 2010 15:56:49 -0600 + -- Ted Gould Fri, 08 Oct 2010 15:17:25 -0600 indicator-datetime (0.0.6-0ubuntu1~ppa1) maverick; urgency=low -- cgit v1.2.3 From b8dc0d28967d936d62550fd9f57650cdd0013522 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Oct 2010 15:19:09 -0600 Subject: debian/control: Adding dependencies on Geoclue and OOBS --- debian/changelog | 3 ++- debian/control | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dd3d5d4..98c01c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ indicator-datetime (0.0.6-0ubuntu1~ppa2~geo1) UNRELEASED; urgency=low * Upstream Merge * Add in Geoclue support for setting proper timezone * Autogen + * debian/control: Adding dependencies on Geoclue and OOBS - -- Ted Gould Fri, 08 Oct 2010 15:17:25 -0600 + -- Ted Gould Fri, 08 Oct 2010 15:18:45 -0600 indicator-datetime (0.0.6-0ubuntu1~ppa1) maverick; urgency=low diff --git a/debian/control b/debian/control index 7ef65bc..e59ba9a 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,8 @@ Build-Depends: cdbs, libdbusmenu-glib-dev (>= 0.1.1), libdbusmenu-gtk-dev (>= 0.1.1), libglib2.0-dev (>= 2.25.0) + libgeoclue-dev, + liboobs-1-dev Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-datetime -- cgit v1.2.3 From d912f723019995095e2b1aca83899c971db2f763 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Oct 2010 15:21:05 -0600 Subject: Stupid comma --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e59ba9a..260bbf8 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: cdbs, libindicator-dev (>= 0.3.0), libdbusmenu-glib-dev (>= 0.1.1), libdbusmenu-gtk-dev (>= 0.1.1), - libglib2.0-dev (>= 2.25.0) + libglib2.0-dev (>= 2.25.0), libgeoclue-dev, liboobs-1-dev Standards-Version: 3.8.4 -- cgit v1.2.3 From 1c7c20e38d00688278192dd7130e9a2d64779733 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Oct 2010 15:21:11 -0600 Subject: releasing version 0.0.6-0ubuntu1~ppa2~geo1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 98c01c8..028cfaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.0.6-0ubuntu1~ppa2~geo1) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu1~ppa2~geo1) maverick; urgency=low * Upstream Merge * Add in Geoclue support for setting proper timezone * Autogen * debian/control: Adding dependencies on Geoclue and OOBS - -- Ted Gould Fri, 08 Oct 2010 15:18:45 -0600 + -- Ted Gould Fri, 08 Oct 2010 15:21:07 -0600 indicator-datetime (0.0.6-0ubuntu1~ppa1) maverick; urgency=low -- cgit v1.2.3 From bff4b4479f0589c28b5f8d803221d2a844e1c628 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Oct 2010 16:02:22 -0600 Subject: debian/control: Add recommends for ubuntu-geoip --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 028cfaf..e579563 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.0.6-0ubuntu1~ppa2~geo2) UNRELEASED; urgency=low + + * debian/control: Add recommends for ubuntu-geoip + + -- Ted Gould Fri, 08 Oct 2010 16:01:40 -0600 + indicator-datetime (0.0.6-0ubuntu1~ppa2~geo1) maverick; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 260bbf8..8b24869 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Package: indicator-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-applet | indicator-renderer +Recommends: indicator-applet | indicator-renderer, ubuntu-geoip Description: A very, very simple clock A simple clock appearing in the indicator bar -- cgit v1.2.3 From 57b28fe0574cfbb8724a6efc7f11391371001c7d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Oct 2010 16:04:43 -0600 Subject: releasing version 0.0.6-0ubuntu1~ppa2~geo2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e579563..83d1817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-datetime (0.0.6-0ubuntu1~ppa2~geo2) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu1~ppa2~geo2) maverick; urgency=low * debian/control: Add recommends for ubuntu-geoip - -- Ted Gould Fri, 08 Oct 2010 16:01:40 -0600 + -- Ted Gould Fri, 08 Oct 2010 16:04:40 -0600 indicator-datetime (0.0.6-0ubuntu1~ppa2~geo1) maverick; urgency=low -- cgit v1.2.3 From 5d6e1fc00f1e6d19c463d32ad7449b5dcbd5617f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 22 Oct 2010 11:52:45 -0400 Subject: releasing version 0.0.6-0ubuntu1~ppa2~geo3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6324e1e..b743be9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.6-0ubuntu1~ppa2~geo3) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu1~ppa2~geo3) maverick; urgency=low * Upstream Merge * Cleaning up whitespace and callbacks - -- Ted Gould Fri, 22 Oct 2010 11:34:13 -0400 + -- Ted Gould Fri, 22 Oct 2010 11:52:43 -0400 indicator-datetime (0.0.6-0ubuntu1~ppa2~geo2) maverick; urgency=low -- cgit v1.2.3 From 4c2ef2a44263275c471728a98e751723721348aa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 24 Oct 2010 13:34:19 -0400 Subject: releasing version 0.0.6-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d709644..c0800ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.0.6-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu1~ppa2) maverick; urgency=low * Upstream Merge * Add in Geoclue support for setting proper timezone * debian/control: Add recommends for ubuntu-geoip * debian/control: Adding dependencies on Geoclue and OOBS - -- Ted Gould Sun, 24 Oct 2010 13:33:23 -0400 + -- Ted Gould Sun, 24 Oct 2010 13:34:17 -0400 indicator-datetime (0.0.6-0ubuntu1~ppa1) maverick; urgency=low -- cgit v1.2.3 From b242c9d47d501660b756775e741fc8eb5161b80d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Nov 2010 11:38:32 -0600 Subject: debian/control: Adjusting requirement from ubuntu-geoip to geoclue-ubuntu-geoip to match distro change. --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c60d73f..62794dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu4~ppa2) UNRELEASED; urgency=low + + * debian/control: Adjusting requirement from ubuntu-geoip to + geoclue-ubuntu-geoip to match distro change. + + -- Ted Gould Mon, 15 Nov 2010 11:38:01 -0600 + indicator-datetime (0.0.6-0ubuntu4~ppa1) maverick; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 5eba1f9..5311e6d 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Package: indicator-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-applet | indicator-renderer, ubuntu-geoip +Recommends: indicator-applet | indicator-renderer, geoclue-ubuntu-geoip Description: A very, very simple clock A simple clock appearing in the indicator bar -- cgit v1.2.3 From 709a6335ab62da1f1948bdc2a19a624ba4f59555 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 15 Nov 2010 11:41:53 -0600 Subject: releasing version 0.0.6-0ubuntu4~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 62794dc..c1526da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.6-0ubuntu4~ppa2) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu4~ppa2) maverick; urgency=low * debian/control: Adjusting requirement from ubuntu-geoip to geoclue-ubuntu-geoip to match distro change. - -- Ted Gould Mon, 15 Nov 2010 11:38:01 -0600 + -- Ted Gould Mon, 15 Nov 2010 11:41:50 -0600 indicator-datetime (0.0.6-0ubuntu4~ppa1) maverick; urgency=low -- cgit v1.2.3 From 04f95aabad5e8ca3e9503d696aa894d03b036de2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Dec 2010 13:46:35 -0600 Subject: releasing version 0.1.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index abf9463..bee8eec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.1.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.90-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. * Generate the format string at init @@ -7,7 +7,7 @@ indicator-datetime (0.1.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: Add recommends for geoclue-ubuntu-geoip * debian/control: Adding dependencies on Geoclue and OOBS - -- Ted Gould Fri, 03 Dec 2010 13:37:34 -0600 + -- Ted Gould Fri, 03 Dec 2010 13:46:32 -0600 indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low -- cgit v1.2.3 From 62471dbe9fa9196597f37ec8d1780b6359ec5d5a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Dec 2010 13:08:54 -0500 Subject: releasing version 0.1.90-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b03e301..2c758af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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. diff --git a/debian/control b/debian/control index 02ee6d1..49a3ca8 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Build-Depends: cdbs, debhelper (>= 5), intltool (>= 0.35.0), libindicator-dev (>= 0.3.14), - libdbusmenu-glib-dev (>= 0.1.1), - libdbusmenu-gtk-dev (>= 0.1.1), + libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90), libglib2.0-dev (>= 2.25.0), libido-0.1-dev (>= 0.1.10), libgeoclue-dev (>= 0.12.0), -- cgit v1.2.3 From eff9a42cf00092a3f3ad09ba0bc5434a7dcad623 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 16:48:53 -0600 Subject: releasing version 0.1.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 689eccf..c8eee59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.1.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Change to canonical.com for naming @@ -8,7 +8,7 @@ indicator-datetime (0.1.91-0ubuntu1~ppa1) UNRELEASED; urgency=low seconds in the custom time strings. * Fixing to take time settings from LC_TIME - -- Ted Gould Thu, 27 Jan 2011 16:43:14 -0600 + -- Ted Gould Thu, 27 Jan 2011 16:48:48 -0600 indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low -- cgit v1.2.3 From c5b4403212947c1e65de4b955a212296de1e4d9c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Feb 2011 15:10:46 -0600 Subject: releasing version 0.1.92-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 267395f..8a4b1d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.1.92-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.92-0ubuntu1~ppa1) 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:09:32 -0600 + -- Ted Gould Thu, 03 Feb 2011 15:10:43 -0600 indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low -- cgit v1.2.3 From b0053ad9ed47043b4810446ee57ce76d648f7040 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 3 Feb 2011 17:27:27 -0500 Subject: releasing version 0.1.92-0ubuntu1 --- debian/changelog | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8a4b1d2..c5410c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.1.92-0ubuntu1~ppa1) natty; urgency=low +indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low * New upstream release. * Increase robustness of GeoClue error handling @@ -36,6 +36,24 @@ indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low -- Ted Gould Fri, 03 Dec 2010 13:46:32 -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.0.6-0ubuntu3) maverick; urgency=low * Cherry-picked from upstream: -- cgit v1.2.3 From bd06bdfcb217149140a043473fca6ed66e4b9786 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Feb 2011 15:24:29 -0600 Subject: debian/rules: Adding in autoreconf --- debian/changelog | 3 ++- debian/rules | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a9b2e6e..e56b9bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) UNRELEASED; urgency=low * Upstream Merge * Merging in first EDS branch + * debian/rules: Adding in autoreconf - -- Ted Gould Fri, 04 Feb 2011 15:22:40 -0600 + -- Ted Gould Fri, 04 Feb 2011 15:24:17 -0600 indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low diff --git a/debian/rules b/debian/rules index ff2614a..baf32ef 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ 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 {} \; -- cgit v1.2.3 From 6fe7de54ad02b5ba121c2a5e3cdf2b9453dd83f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Feb 2011 15:25:15 -0600 Subject: releasing version 0.1.92-0ubuntu2~ppa1~apnt1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e56b9bf..30c5353 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) UNRELEASED; urgency=low +indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) natty; urgency=low * Upstream Merge * Merging in first EDS branch * debian/rules: Adding in autoreconf - -- Ted Gould Fri, 04 Feb 2011 15:24:17 -0600 + -- Ted Gould Fri, 04 Feb 2011 15:25:13 -0600 indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From f4a727b6f697774d6238f4110a8417892ed91396 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Feb 2011 15:35:14 -0600 Subject: releasing version 0.1.92-0ubuntu2~ppa1~apnt2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1e165c0..f3e1b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) UNRELEASED; urgency=low +indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) natty; urgency=low * Upstream Merge * Unreffing the menu item - -- Ted Gould Fri, 04 Feb 2011 15:32:55 -0600 + -- Ted Gould Fri, 04 Feb 2011 15:35:12 -0600 indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) natty; urgency=low -- cgit v1.2.3 From bde608a3bf5cd96f61ca6a62dbfbdd7c28070c86 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 4 Feb 2011 15:53:08 -0600 Subject: releasing version 0.1.92-0ubuntu2~ppa1~apnt3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e4a31d7..7cbc3e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt3) UNRELEASED; urgency=low +indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt3) natty; urgency=low * Upstream Merge * Debugging statements and cleaning code a bit - -- Ted Gould Fri, 04 Feb 2011 15:51:57 -0600 + -- Ted Gould Fri, 04 Feb 2011 15:53:05 -0600 indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) natty; urgency=low -- cgit v1.2.3 From 1574cb582b931daf4bd4891a5c9add56e637901a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 11:48:27 -0500 Subject: releasing version 0.1.92-0ubuntu3 --- debian/changelog | 9 +++++++++ debian/control | 3 ++- debian/source/format | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 debian/source/format (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e6613e4..83d252e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 diff --git a/debian/control b/debian/control index d56e2a9..b02380d 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,9 @@ Build-Depends: cdbs, libido-0.1-dev (>= 0.1.10), libgeoclue-dev (>= 0.12.0), liboobs-1-dev (>= 2.31.0) -Standards-Version: 3.8.4 +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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3 From ab79902d9ea172709358b761bc4675da2f4bd6d3 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 14:06:05 -0500 Subject: releasing version 0.1.92-0ubuntu4 --- debian/changelog | 7 +++++++ debian/source/format | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 83d252e..13d34cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 diff --git a/debian/source/format b/debian/source/format index 163aaf8..d3827e7 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +1.0 -- cgit v1.2.3 From 8899ada093975b480bab52098be03490d3ae1b58 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Feb 2011 14:26:29 -0600 Subject: releasing version 0.1.92-0ubuntu2~ppa1~apnt4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0fcbb5e..d7b1a6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt4) UNRELEASED; urgency=low +indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt4) natty; urgency=low * Upstream Merge * Adding some color support along with times - -- Ted Gould Tue, 08 Feb 2011 14:18:05 -0600 + -- Ted Gould Tue, 08 Feb 2011 14:26:28 -0600 indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt3) natty; urgency=low -- cgit v1.2.3 From 3162d34af9b5e91e2aaa7aa3c0d866a82db843b5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Feb 2011 22:25:27 -0600 Subject: releasing version 0.1.92-0ubuntu5~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e555f3e..94d8e7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.1.92-0ubuntu5~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.92-0ubuntu5~ppa1) natty; urgency=low * Upstream Merge * Merging in first EDS branch * debian/rules: Adding in autoreconf - -- Ted Gould Tue, 08 Feb 2011 22:21:14 -0600 + -- Ted Gould Tue, 08 Feb 2011 22:25:24 -0600 indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low -- cgit v1.2.3 From 7b97bf9b84d3c23e021f69974abe661663a7f3a7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Feb 2011 13:26:05 -0600 Subject: releasing version 0.1.93-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3ebba21..c229ef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.1.93-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.1.93-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Merging in first EDS branch * debian/rules: Adding in autoreconf - -- Ted Gould Wed, 09 Feb 2011 13:23:03 -0600 + -- Ted Gould Wed, 09 Feb 2011 13:25:57 -0600 indicator-datetime (0.1.92-0ubuntu4+r41) UNRELEASED; urgency=low -- cgit v1.2.3 From e7e3df4f785e467a59308f7b99817cfbaeecab2c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 13:09:06 -0600 Subject: releasing version 0.1.94-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 82c35f3..ddd1a33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.1.94-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.94-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Timezone support ∘ Multiple calendar support ∘ Accessible description - -- Ted Gould Thu, 17 Feb 2011 13:07:48 -0600 + -- Ted Gould Thu, 17 Feb 2011 13:09:04 -0600 indicator-datetime (0.1.93-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 96ca6cb8abee237021d36989d08b8ba8d49b7a4b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 14:54:18 -0600 Subject: releasing version 0.1.96-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 29df0b5..da12f5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.1.96-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.96-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Perference UI cleanups * Fix color rendering for appointments * Fix spin buttons to behave properly - -- Ted Gould Thu, 03 Mar 2011 14:48:38 -0600 + -- Ted Gould Thu, 03 Mar 2011 14:54:15 -0600 indicator-datetime (0.1.95-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 66c8394d67e6a80346f2c5f4a0288088b3e83af1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Mar 2011 23:14:45 -0600 Subject: releasing version 0.1.97-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d891caf..79bef8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.1.97-0ubuntu1~ppa1) UNRELEASED; urgency=low +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:10:55 -0600 + -- Ted Gould Thu, 10 Mar 2011 23:14:41 -0600 indicator-datetime (0.1.96-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 9f4692c75d64a4ed46584420170445935a0709ae Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 14 Mar 2011 21:48:44 -0500 Subject: releasing version 0.1.97-0ubuntu1~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 214a4e8..6175eb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.1.97-0ubuntu1~ppa2) UNRELEASED; urgency=low +indicator-datetime (0.1.97-0ubuntu1~ppa2) natty; urgency=low * Upstream Merge * Fix appointment time format * Change appointments with selected date in calendar - -- Ted Gould Mon, 14 Mar 2011 21:47:01 -0500 + -- Ted Gould Mon, 14 Mar 2011 21:48:42 -0500 indicator-datetime (0.1.97-0ubuntu1~ppa1) natty; urgency=low -- cgit v1.2.3 From 27e02c433cc3a871e100a7120f9f9e6e73c5a661 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 16:17:41 -0500 Subject: releasing version 0.1.98-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 49afb1a..75792ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.1.98-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.1.98-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Make appointments match calendar month @@ -8,7 +8,7 @@ indicator-datetime (0.1.98-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Valgrind invalid read (LP: #729175) ∘ Translation fixes to date label (LP: #729632) - -- Ted Gould Wed, 16 Mar 2011 16:06:55 -0500 + -- Ted Gould Wed, 16 Mar 2011 16:17:38 -0500 indicator-datetime (0.1.97-0ubuntu1~ppa1) natty; urgency=low -- cgit v1.2.3 From 66623a950c198ee724305971c3eaae173a007ea9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Mar 2011 16:19:05 -0500 Subject: debian/control: Dropping liboobs --- debian/changelog | 3 ++- debian/control | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aafbba3..e11b681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ indicator-datetime (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ 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:15:45 -0500 + -- Ted Gould Wed, 23 Mar 2011 16:18:22 -0500 indicator-datetime (0.1.98-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index ff8df82..884a37a 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: cdbs, libglib2.0-dev (>= 2.25.0), libido-0.1-dev (>= 0.2.2), libgeoclue-dev (>= 0.12.0), - liboobs-1-dev (>= 2.31.0), libecal1.2-dev (>= 2.30), libical-dev (>= 0.44), libgtk2.0-dev (>= 2.22), -- cgit v1.2.3 From d4f784368426403772cbc203286d54ecd1588b19 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 23 Mar 2011 16:22:57 -0500 Subject: releasing version 0.2.0-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e11b681..d304ffa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.0-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Remove unused liboobs @@ -11,7 +11,7 @@ indicator-datetime (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Make location completion more robust * debian/control: Dropping liboobs - -- Ted Gould Wed, 23 Mar 2011 16:18:22 -0500 + -- Ted Gould Wed, 23 Mar 2011 16:22:50 -0500 indicator-datetime (0.1.98-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 6f36075655f0be9070b221528158133f068673f9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Mar 2011 20:55:19 -0500 Subject: releasing version 0.2.0-0ubuntu2~ppa1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a376c2d..f0c005e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ indicator-datetime (0.2.0-0ubuntu2~ppa1) natty; urgency=low * inicator-datetime dosen't show corretly the time when changing from 24 hours format to 12 hours (LP: #743394) - -- Ted Gould Tue, 29 Mar 2011 20:41:10 -0500 + -- Ted Gould Tue, 29 Mar 2011 20:55:14 -0500 indicator-datetime (0.2.0-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 73d5ba3818692cd324d17cd075d21fe72f1490da Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 30 Mar 2011 17:11:51 -0500 Subject: releasing version 0.2.0-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3116100..164975b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.0-0ubuntu2~ppa2) UNRELEASED; urgency=low +indicator-datetime (0.2.0-0ubuntu2~ppa2) natty; urgency=low * Upstream Merge * Add tooltips on the error icons @@ -6,7 +6,7 @@ indicator-datetime (0.2.0-0ubuntu2~ppa2) UNRELEASED; urgency=low * Recycle old entries to make the refresh cleaner * Use day when timezone is set to 'locale' - -- Ted Gould Wed, 30 Mar 2011 17:01:00 -0500 + -- Ted Gould Wed, 30 Mar 2011 17:11:49 -0500 indicator-datetime (0.2.0-0ubuntu2~ppa1) natty; urgency=low -- cgit v1.2.3 From 73c2d5d59935280a2d11234e5c36a11ea5505ed7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 31 Mar 2011 14:32:44 -0500 Subject: releasing version 0.2.1-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 25dcf3a..02a9919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.1-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.1-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * indicator-datetime-preferences crashed with SIGSEGV in @@ -27,7 +27,7 @@ indicator-datetime (0.2.1-0ubuntu1~ppa1) UNRELEASED; urgency=low * Use day when timezone is set to 'locale' * Reset time when coming back from suspend (LP: #726053) - -- Ted Gould Thu, 31 Mar 2011 14:29:37 -0500 + -- Ted Gould Thu, 31 Mar 2011 14:32:40 -0500 indicator-datetime (0.2.0-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 7d3e15037161dd727a6855e393eb3cb86cf91e72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 4 Apr 2011 11:16:47 -0500 Subject: releasing version 0.2.1-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cc3a461..9f9fe05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.2.1-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.1-0ubuntu2~ppa1) natty; urgency=low * Upstream Merge * Make sure the calendar follows the user setting (LP: #748772) * Ensure that events handle month boundries correctly (LP: #746713) * Only show calendars the user has configured (LP: #729033) - -- Ted Gould Mon, 04 Apr 2011 11:14:57 -0500 + -- Ted Gould Mon, 04 Apr 2011 11:16:44 -0500 indicator-datetime (0.2.1-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 27c56bd90ab38a79d5eca970b7ba4dca2652c01a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Apr 2011 09:21:32 -0500 Subject: releasing version 0.2.1-0ubuntu2~ppa2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7a987a9..1cb4b7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.2.1-0ubuntu2~ppa2) UNRELEASED; urgency=low +indicator-datetime (0.2.1-0ubuntu2~ppa2) natty; urgency=low * Upstream Merge * Give full day events the day name instead of a time - -- Ted Gould Wed, 06 Apr 2011 08:27:25 -0500 + -- Ted Gould Wed, 06 Apr 2011 08:39:30 -0500 indicator-datetime (0.2.1-0ubuntu2~ppa1) natty; urgency=low -- cgit v1.2.3 From adea7dfe30540cf8c9d2ebe20e3973c418657280 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Apr 2011 13:23:29 -0500 Subject: releasing version 0.2.2-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2f90b2e..e24f564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.2-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.2-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Add language and proper distro version to geonames URL to allow @@ -9,7 +9,7 @@ indicator-datetime (0.2.2-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Only show calendars the user has configured (LP: #729033) ∘ Reenable clicking on the timezone in the menu to set it. - -- Ted Gould Thu, 07 Apr 2011 13:20:49 -0500 + -- Ted Gould Thu, 07 Apr 2011 13:23:25 -0500 indicator-datetime (0.2.1-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 980177afd2ec65ad0e098be0b76c43f569e28311 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 Apr 2011 22:33:47 -0500 Subject: releasing version 0.2.2-0ubuntu2~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6bfc94b..07d242f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.2-0ubuntu2~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.2-0ubuntu2~ppa1) natty; urgency=low * Upstream Merge * Use GTK directly for detecting when the menu appears and disappears @@ -6,7 +6,7 @@ indicator-datetime (0.2.2-0ubuntu2~ppa1) UNRELEASED; urgency=low * Handle items being removed from the locations list by choosing another item in the list (LP: #740948) - -- Ted Gould Tue, 12 Apr 2011 22:30:25 -0500 + -- Ted Gould Tue, 12 Apr 2011 22:33:45 -0500 indicator-datetime (0.2.2-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 0a0c90e66c9c5ad405b2d6f5c801a419f7e03a8d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 14 Apr 2011 14:51:24 -0500 Subject: releasing version 0.2.3-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aeefb49..d160c12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.3-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.3-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Use GTK directly for detecting when the menu appears and disappears @@ -8,7 +8,7 @@ indicator-datetime (0.2.3-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Check for resume in the service and update the label as well (LP: #759854) - -- Ted Gould Thu, 14 Apr 2011 14:48:55 -0500 + -- Ted Gould Thu, 14 Apr 2011 14:51:20 -0500 indicator-datetime (0.2.2-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From ae1d80c9a460c889ba14027d4530985ef1ee3de6 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 15 Apr 2011 10:19:18 -0400 Subject: releasing version 0.2.3-0ubuntu2 --- debian/changelog | 7 +++++++ debian/patches/lp_750671.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 debian/patches/lp_750671.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d0c522c..0b111a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.2.3-0ubuntu2) natty; urgency=low + + * debian/patches/lp_750671.patch + - ellipsize long appointment descriptions (LP: #750671) + + -- Ken VanDine Fri, 15 Apr 2011 10:00:41 -0400 + indicator-datetime (0.2.3-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/patches/lp_750671.patch b/debian/patches/lp_750671.patch new file mode 100644 index 0000000..676f4f1 --- /dev/null +++ b/debian/patches/lp_750671.patch @@ -0,0 +1,12 @@ +=== modified file 'src/indicator-datetime.c' +--- src/indicator-datetime.c 2011-04-13 19:32:18 +0000 ++++ src/indicator-datetime.c 2011-04-15 13:23:28 +0000 +@@ -1285,6 +1285,7 @@ + /* 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); ++ 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); + + -- cgit v1.2.3 From 548daa53dbb19ad5998001a67f56f31904519d4c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Apr 2011 09:32:45 -0500 Subject: releasing version 0.2.3-0ubuntu2~ppa1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f2a2537..0c384ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ 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:01:32 -0500 + -- Ted Gould Fri, 15 Apr 2011 09:32:43 -0500 indicator-datetime (0.2.3-0ubuntu1) natty; urgency=low -- cgit v1.2.3 From 5b1027bd6f7e193639a895c9c0d63462443d4566 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 18 Apr 2011 10:35:21 -0400 Subject: releasing version 0.2.3-0ubuntu3 --- debian/changelog | 9 +++++++++ debian/patches/lp_762976.patch | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 debian/patches/lp_762976.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b111a1..bd936c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 Mon, 18 Apr 2011 10:05:41 -0400 + indicator-datetime (0.2.3-0ubuntu2) natty; urgency=low * debian/patches/lp_750671.patch diff --git a/debian/patches/lp_762976.patch b/debian/patches/lp_762976.patch new file mode 100644 index 0000000..e62280a --- /dev/null +++ b/debian/patches/lp_762976.patch @@ -0,0 +1,18 @@ +=== modified file 'src/indicator-datetime.c' +--- src/indicator-datetime.c 2011-04-13 19:32:18 +0000 ++++ src/indicator-datetime.c 2011-04-18 09:59:43 +0000 +@@ -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, "GGGGGGGGGGGGGGG"); // 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); + + -- cgit v1.2.3 From 7c382b431db95888a76b9cbbfcd2263d34580fdb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jun 2011 14:26:32 -0500 Subject: - 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/changelog | 9 ++++++++- debian/patches/lp_750671.patch | 12 ------------ debian/patches/lp_762976.patch | 18 ------------------ 3 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 debian/patches/lp_750671.patch delete mode 100644 debian/patches/lp_762976.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b433c02..176a8b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ indicator-datetime (0.2.90-0ubuntu1) UNRELEASED; urgency=low * 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. - -- Ted Gould Tue, 21 Jun 2011 14:13:01 -0500 + -- Ted Gould Tue, 21 Jun 2011 14:24:41 -0500 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low diff --git a/debian/patches/lp_750671.patch b/debian/patches/lp_750671.patch deleted file mode 100644 index 676f4f1..0000000 --- a/debian/patches/lp_750671.patch +++ /dev/null @@ -1,12 +0,0 @@ -=== modified file 'src/indicator-datetime.c' ---- src/indicator-datetime.c 2011-04-13 19:32:18 +0000 -+++ src/indicator-datetime.c 2011-04-15 13:23:28 +0000 -@@ -1285,6 +1285,7 @@ - /* 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); -+ 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); - - diff --git a/debian/patches/lp_762976.patch b/debian/patches/lp_762976.patch deleted file mode 100644 index e62280a..0000000 --- a/debian/patches/lp_762976.patch +++ /dev/null @@ -1,18 +0,0 @@ -=== modified file 'src/indicator-datetime.c' ---- src/indicator-datetime.c 2011-04-13 19:32:18 +0000 -+++ src/indicator-datetime.c 2011-04-18 09:59:43 +0000 -@@ -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, "GGGGGGGGGGGGGGG"); // 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); - - -- cgit v1.2.3 From c17c99dea0e5b7c1655c92b27ff79edc60bf0e2a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jun 2011 14:28:34 -0500 Subject: debian/control: Switching dep to libedataserverui-3.0-dev --- debian/changelog | 5 +++-- debian/control | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 176a8b9..1d370eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.90-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.2.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. - Set minimum width for appointments to prevent continuous resizing @@ -8,8 +8,9 @@ indicator-datetime (0.2.90-0ubuntu1) UNRELEASED; urgency=low - 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 - -- Ted Gould Tue, 21 Jun 2011 14:24:41 -0500 + -- Ted Gould Tue, 21 Jun 2011 14:28:25 -0500 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low diff --git a/debian/control b/debian/control index ee66b3a..96e66ef 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: cdbs, libunique-dev, libpolkit-gtk-1-dev, libedataserver1.2-dev (>= 2.30), - libedataserverui1.2-dev (>= 2.30), + libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), dh-autoreconf Standards-Version: 3.9.1 -- cgit v1.2.3 From d84d6a67d0c63d270462cade09d33efc9d2b6de8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jun 2011 14:29:27 -0500 Subject: releasing version 0.2.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1d370eb..c949921 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. - Set minimum width for appointments to prevent continuous resizing @@ -10,7 +10,7 @@ indicator-datetime (0.2.90-0ubuntu1~ppa1) UNRELEASED; urgency=low as merged upstream. * debian/control: Switching dep to libedataserverui-3.0-dev - -- Ted Gould Tue, 21 Jun 2011 14:28:25 -0500 + -- Ted Gould Tue, 21 Jun 2011 14:29:24 -0500 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low -- cgit v1.2.3 From 4a2c7a22fa0d6c46327cd9be18ebc64057692769 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 22 Jun 2011 12:09:57 -0400 Subject: releasing version 0.2.90-0ubuntu1 --- debian/changelog | 16 ++++++++++++++-- debian/control | 23 +++++++++++++++++++---- debian/indicator-datetime-gtk2.install | 1 + debian/indicator-datetime.install | 1 + debian/rules | 25 +++++++++++++++++-------- 5 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 debian/indicator-datetime-gtk2.install create mode 100644 debian/indicator-datetime.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c949921..c1c6d23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low +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 @@ -10,7 +11,18 @@ indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low as merged upstream. * debian/control: Switching dep to libedataserverui-3.0-dev - -- Ted Gould Tue, 21 Jun 2011 14:29:24 -0500 + [ 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 Wed, 22 Jun 2011 11:46:55 -0400 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low diff --git a/debian/control b/debian/control index 47fc9c6..83819e0 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,11 @@ Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), intltool (>= 0.35.0), - libindicator-dev (>= 0.3.14), + libindicator-dev (>= 0.3.19), + libindicator3-dev (>= 0.3.19), libdbusmenu-glib-dev (>= 0.3.90), - libdbusmenu-gtk-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), @@ -16,6 +18,7 @@ Build-Depends: cdbs, 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, @@ -24,7 +27,7 @@ Build-Depends: cdbs, libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), dh-autoreconf -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-datetime Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu @@ -33,7 +36,19 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, geoclue-ubuntu-geoip | geoclue-provider +Recommends: indicator-applet | indicator-renderer, + indicator-datetime-gtk2 +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: A very, very simple clock +Description: Simple clock A simple clock appearing in the indicator bar 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/rules b/debian/rules index baf32ef..7950ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,23 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + 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 {} \; +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-binary-post-install-arch:: list-missing +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete -- cgit v1.2.3 From 5e9dc5469428fe05f7e70948980a0e79d193b857 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 28 Jun 2011 15:56:27 +0100 Subject: * 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 --- debian/changelog | 12 +++ debian/control | 3 +- debian/patches/fix-timezones.patch | 168 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fix-timezones.patch create mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c1c6d23..07cd704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +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 Tue, 28 Jun 2011 15:42:39 +0100 + indicator-datetime (0.2.90-0ubuntu1) oneiric; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 83819e0..66d7e0a 100644 --- a/debian/control +++ b/debian/control @@ -36,8 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, geoclue-ubuntu-geoip | geoclue-provider -Recommends: indicator-applet | indicator-renderer, - indicator-datetime-gtk2 +Recommends: indicator-applet | indicator-renderer Description: Simple clock A simple clock appearing in the indicator bar 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 index 7950ed1..dfd669b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ DEB_BUILDDIR = build DEB_MAKE_FLAVORS = gtk2 gtk3 +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -- cgit v1.2.3 From 33d9b7f27eed027e1986ba4197d14434bc6ce37b Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 28 Jun 2011 17:57:03 +0100 Subject: * No change rebuild to fix badly packaged diff.gz from last time * debian/rules, debian/control: - Arg, this wasn't source format 3.0, so add quilt so that the patch applies. --- debian/changelog | 14 ++++++++++++++ debian/control | 1 + debian/rules | 1 + 3 files changed, 16 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 07cd704..741fa90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low + + * No change rebuild to fix badly packaged diff.gz from last time + + -- Michael Terry 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 Tue, 28 Jun 2011 17:05:59 +0100 + indicator-datetime (0.2.90-0ubuntu2) oneiric; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 66d7e0a..b830e91 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), + quilt, intltool (>= 0.35.0), libindicator-dev (>= 0.3.19), libindicator3-dev (>= 0.3.19), diff --git a/debian/rules b/debian/rules index dfd669b..2ad101c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ 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 -- cgit v1.2.3 From 5061c7ab25d6d72b555a1d95f6142d93eb1be2aa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 16:24:47 -0500 Subject: Dropped debian/patches/fix-timezones.patch: merged upstream --- debian/changelog | 3 +- debian/patches/fix-timezones.patch | 168 ------------------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 170 deletions(-) delete mode 100644 debian/patches/fix-timezones.patch delete mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0ea9cf3..cb364d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ indicator-datetime (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * 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 - -- Ted Gould Thu, 07 Jul 2011 16:23:08 -0500 + -- Ted Gould Thu, 07 Jul 2011 16:24:21 -0500 indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low diff --git a/debian/patches/fix-timezones.patch b/debian/patches/fix-timezones.patch deleted file mode 100644 index 6e32d61..0000000 --- a/debian/patches/fix-timezones.patch +++ /dev/null @@ -1,168 +0,0 @@ -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 deleted file mode 100644 index a593ee2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-timezones.patch -- cgit v1.2.3 From af8dd7371a8743b02751fe2e71341f33de744fff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 16:26:14 -0500 Subject: releasing version 0.2.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cb364d3..8dfb783 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.91-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * libindicator 0.4 transition @@ -7,7 +7,7 @@ indicator-datetime (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fixing timezone setting with new gsd * Dropped debian/patches/fix-timezones.patch: merged upstream - -- Ted Gould Thu, 07 Jul 2011 16:24:21 -0500 + -- Ted Gould Thu, 07 Jul 2011 16:26:11 -0500 indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low -- cgit v1.2.3 From cae607b7f5cf4fc12055767069e8a205c1a95587 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 8 Jul 2011 09:55:29 -0400 Subject: releasing version 0.2.91-0ubuntu1 --- debian/changelog | 11 +++++++++-- debian/control | 8 +++++--- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8dfb783..53e3513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-datetime (0.2.91-0ubuntu1~ppa1) oneiric; urgency=low +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 @@ -7,7 +8,13 @@ indicator-datetime (0.2.91-0ubuntu1~ppa1) oneiric; urgency=low * Fixing timezone setting with new gsd * Dropped debian/patches/fix-timezones.patch: merged upstream - -- Ted Gould Thu, 07 Jul 2011 16:26:11 -0500 + [ 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 Fri, 08 Jul 2011 09:38:50 -0400 indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low diff --git a/debian/control b/debian/control index b830e91..5b210b1 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Build-Depends: cdbs, debhelper (>= 5), quilt, intltool (>= 0.35.0), - libindicator-dev (>= 0.3.19), - libindicator3-dev (>= 0.3.19), + 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), @@ -27,6 +27,7 @@ Build-Depends: cdbs, 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 @@ -36,6 +37,7 @@ Package: indicator-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + gnome-control-center, geoclue-ubuntu-geoip | geoclue-provider Recommends: indicator-applet | indicator-renderer Description: Simple clock @@ -46,9 +48,9 @@ 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 - -- cgit v1.2.3 From 6457fa332b5a76bdb996f153091191034c52c431 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 12 Jul 2011 14:09:49 -0400 Subject: releasing version 0.2.91-0ubuntu2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 53e3513..13c9645 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.2.91-0ubuntu2) oneiric; urgency=low + + * No change rebuild for evolution-data-server 3.1.3.1 + + -- Ken VanDine Tue, 12 Jul 2011 13:45:24 -0400 + indicator-datetime (0.2.91-0ubuntu1) oneiric; urgency=low [ Ted Gould ] -- cgit v1.2.3 From 5c578868c37e7d3d45fc598b95ca3facae46cb33 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Aug 2011 11:30:53 -0500 Subject: releasing version 0.2.92-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6438541..2388c11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.2.92-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.92-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Adding in a new greeter mode * Fixing autotools - -- Ted Gould Thu, 11 Aug 2011 11:28:17 -0500 + -- Ted Gould Thu, 11 Aug 2011 11:30:50 -0500 indicator-datetime (0.2.91-0ubuntu2) oneiric; urgency=low -- cgit v1.2.3 From 5e71d57cdb42e41ebcd71b25df915fa051dc189a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 12 Aug 2011 10:32:02 -0400 Subject: releasing version 0.2.91-0ubuntu3 --- debian/changelog | 7 +++++++ debian/rules | 1 + 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 13c9645..b1957b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.2.91-0ubuntu3) oneiric; urgency=low + + * debian/rules + - run intltool-update to update the translations template + + -- Ken VanDine 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 diff --git a/debian/rules b/debian/rules index 2ad101c..daa4979 100755 --- a/debian/rules +++ b/debian/rules @@ -23,3 +23,4 @@ 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 -- cgit v1.2.3 From 8b224a3afe8b206ad941dfc87b2c5a3b3e614613 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 16 Aug 2011 17:43:44 -0400 Subject: releasing version 0.2.92-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bc6afe4..78f6be5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.92-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (0.2.92-0ubuntu1) oneiric; urgency=low * New upstream release. * Adding in a new greeter mode -- cgit v1.2.3 From 9247ad1242410dc2361ef11dc2949e9254b7c0fc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Aug 2011 15:28:54 -0500 Subject: Adding a bug number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4fd39d9..b03b05e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ indicator-datetime (0.2.93-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. ∘ Use cleaner GDateTime API - ∘ Use locale preferred date format + ∘ Use locale preferred date format (LP: #729056) ∘ Use real ellipsis (LP: #621339) -- Ted Gould Thu, 18 Aug 2011 14:52:51 -0500 -- cgit v1.2.3 From 4cf539bab02a919d43dd5c370bdb0fab7a389a68 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Aug 2011 15:36:24 -0500 Subject: releasing version 0.2.93-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b03b05e..547c1a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (0.2.93-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.93-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. ∘ Use cleaner GDateTime API ∘ Use locale preferred date format (LP: #729056) ∘ Use real ellipsis (LP: #621339) - -- Ted Gould Thu, 18 Aug 2011 14:52:51 -0500 + -- Ted Gould Thu, 18 Aug 2011 15:36:21 -0500 indicator-datetime (0.2.92-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 08c0fb72bace0db629cc17152c4144271aea7b04 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 18 Aug 2011 16:46:58 -0400 Subject: releasing version 0.2.93-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 547c1a6..55fd4b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.93-0ubuntu1~ppa1) oneiric; urgency=low +indicator-datetime (0.2.93-0ubuntu1) oneiric; urgency=low * New upstream release. ∘ Use cleaner GDateTime API -- cgit v1.2.3 From ba160425599248b4df06a847c5f89bead8785e21 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 26 Aug 2011 10:45:12 -0400 Subject: releasing version 0.2.93-0ubuntu2 --- debian/changelog | 7 +++++++ debian/rules | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 55fd4b0..9c18fbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.2.93-0ubuntu2) oneiric; urgency=low + + * debian/rules + - dh_translations doesn't handle multibuilds, so manually add the domain + + -- Ken VanDine Fri, 26 Aug 2011 10:35:45 -0400 + indicator-datetime (0.2.93-0ubuntu1) oneiric; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index daa4979..6d5fdb5 100755 --- a/debian/rules +++ b/debian/rules @@ -24,3 +24,9 @@ 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; + -- cgit v1.2.3 From b2dfc107bf3ceef3c92828982f3238904378f6b1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 15 Sep 2011 10:45:59 -0500 Subject: releasing version 0.2.95-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 54b6879..42fe0d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.95-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.2.95-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Set default timezone on events without (LP: #837359) @@ -7,7 +7,7 @@ indicator-datetime (0.2.95-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fix gettext domain for builder files (LP: #845473) * Update date correctly when opening menu (LP: #793450) - -- Ted Gould Thu, 15 Sep 2011 10:43:27 -0500 + -- Ted Gould Thu, 15 Sep 2011 10:45:57 -0500 indicator-datetime (0.2.93-0ubuntu2) oneiric; urgency=low -- cgit v1.2.3 From c56d9e2efbad2bd43fb50d2293c16a2b764a95e7 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 15 Sep 2011 18:10:36 +0200 Subject: * debian/control: - bump the libglib build-dep --- debian/changelog | 5 +++++ debian/control | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 42fe0d1..4843eae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ indicator-datetime (0.2.95-0ubuntu1~ppa1) 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) @@ -7,6 +8,10 @@ indicator-datetime (0.2.95-0ubuntu1~ppa1) oneiric; urgency=low * 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 Thu, 15 Sep 2011 10:45:57 -0500 indicator-datetime (0.2.93-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index 5b210b1..8e11195 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: cdbs, libdbusmenu-glib-dev (>= 0.3.90), libdbusmenu-gtk-dev (>= 0.3.94), libdbusmenu-gtk3-dev (>= 0.3.94), - libglib2.0-dev (>= 2.25.0), + libglib2.0-dev (>= 2.29.19), libido-0.1-dev (>= 0.2.2), libido3-0.1-dev (>= 0.2.90), libunique-3.0-dev, -- cgit v1.2.3 From 1fc2f7a88518e283c0327e6cb9d4e52464f5343f Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 15 Sep 2011 18:10:44 +0200 Subject: releasing version 0.2.95-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4843eae..bce0042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.2.95-0ubuntu1~ppa1) oneiric; urgency=low +indicator-datetime (0.2.95-0ubuntu1) oneiric; urgency=low [ Ted Gould ] * New upstream release. -- cgit v1.2.3 From 95fcdc5a0e1e2d4184149e2354f0cb33d6755d48 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 29 Sep 2011 16:29:20 -0400 Subject: * debian/control - Added recommends for e-d-s --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bce0042..61c09be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.2.95-0ubuntu2) UNRELEASED; urgency=low + + * debian/control + - Added recommends for e-d-s + + -- Ken VanDine Thu, 29 Sep 2011 16:28:52 -0400 + indicator-datetime (0.2.95-0ubuntu1) oneiric; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 8e11195..64abb69 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-control-center, geoclue-ubuntu-geoip | geoclue-provider -Recommends: indicator-applet | indicator-renderer +Recommends: indicator-applet | indicator-renderer, evolution-data-server Description: Simple clock A simple clock appearing in the indicator bar -- cgit v1.2.3 From e569f3e9744146d5e9d3bfee21092def7350043b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 29 Sep 2011 15:39:44 -0500 Subject: releasing version 0.3.0-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1b67b31..237b7d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low [ Ken VanDine ] * debian/control @@ -11,7 +11,7 @@ indicator-datetime (0.3.0-0ubuntu1~ppa1) UNRELEASED; urgency=low * Free ECals when they have errors (LP: #774071) * Fix untranslated string (LP: #853130) - -- Ted Gould Thu, 29 Sep 2011 15:36:54 -0500 + -- Ted Gould Thu, 29 Sep 2011 15:39:41 -0500 indicator-datetime (0.2.95-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 2f51b432c65b7d766def319ff83c3e3fa2280afb Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 29 Sep 2011 16:47:26 -0400 Subject: releasing version 0.3.0-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 237b7d9..86a5e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low +indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low [ Ken VanDine ] * debian/control -- cgit v1.2.3 From e86b713958fdafa8c47bc2d83a12a25b66fcf40b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 5 Oct 2011 15:04:17 -0400 Subject: releasing version 0.3.0-0ubuntu2 --- debian/changelog | 7 +++++++ debian/patches/lp_844741.patch | 12 ++++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+) create mode 100644 debian/patches/lp_844741.patch create mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 86a5e42..c798325 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 Wed, 05 Oct 2011 11:59:21 -0400 + indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low [ Ken VanDine ] 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..9ebd065 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +lp_844741.patch -- cgit v1.2.3 From 10c82dbaf85cab9dbe380f1e5d73107dc4eefb26 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 13 Oct 2011 13:38:11 -0500 Subject: debian/control: Drop libunique requirements --- debian/changelog | 3 ++- debian/control | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8b6f00f..126187c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ indicator-datetime (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low * 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 - -- Ted Gould Thu, 13 Oct 2011 13:35:09 -0500 + -- Ted Gould Thu, 13 Oct 2011 13:37:40 -0500 indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low diff --git a/debian/control b/debian/control index 64abb69..a53c10a 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: cdbs, libglib2.0-dev (>= 2.29.19), 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), @@ -22,7 +21,6 @@ Build-Depends: cdbs, 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, -- cgit v1.2.3 From 9f5bd6e87a8c6ea411a2326e44814b686a501a55 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 13 Oct 2011 13:40:24 -0500 Subject: releasing version 0.3.1-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 126187c..3a5139d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.1-0ubuntu1~ppa1) oneiric; urgency=low * New upstream release. * Drop an unused icon (LP: #746176) @@ -6,7 +6,7 @@ indicator-datetime (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low * Remove check for libunique as it's unused * debian/control: Drop libunique requirements - -- Ted Gould Thu, 13 Oct 2011 13:37:40 -0500 + -- Ted Gould Thu, 13 Oct 2011 13:40:21 -0500 indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low -- cgit v1.2.3 From b2d902127e0597f924ba0ae8955c8c550d3077b5 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 13 Oct 2011 16:14:39 -0400 Subject: releasing version 0.3.0-0ubuntu3 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c798325..d6d936f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.3.0-0ubuntu3) oneiric; urgency=low + + * Reupload to oneiric final, the fix is safe and important enough. + + -- Martin Pitt Thu, 06 Oct 2011 06:50:30 +0200 + indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low * debian/patches/lp_844741.patch -- cgit v1.2.3 From d6920670c7d7f5fc3f4dfa4a169ad4ccdaf328ba Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 13 Oct 2011 17:06:47 -0400 Subject: releasing version 0.3.1-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a7128ec..5013f67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.1-0ubuntu1~ppa1) oneiric; urgency=low +indicator-datetime (0.3.1-0ubuntu1) oneiric-proposed; urgency=low * New upstream release. * Drop an unused icon (LP: #746176) -- cgit v1.2.3 From 2839a0288cf121e9de202a7938ac52b0238f9f12 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 28 Oct 2011 11:27:13 -0400 Subject: releasing version 0.3.1-0ubuntu2 --- debian/changelog | 7 +++++++ debian/patches/lp_802384.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/lp_802384.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5013f67..767d2ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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 Fri, 28 Oct 2011 11:20:55 -0400 + indicator-datetime (0.3.1-0ubuntu1) oneiric-proposed; urgency=low * New upstream release. 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/series b/debian/patches/series index 9ebd065..d70dbda 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ lp_844741.patch +lp_802384.patch -- cgit v1.2.3 From 91fead5245d4c8cecac084f1e4d2837a49b831c3 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 13 Jan 2012 00:03:36 +0100 Subject: * 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. --- debian/changelog | 8 ++++++++ debian/patches/gtk_box_api.patch | 41 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 50 insertions(+) create mode 100644 debian/patches/gtk_box_api.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 767d2ec..4c7d39b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-datetime (0.3.1-0ubuntu3) UNRELEASED; 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 Thu, 12 Jan 2012 23:23:36 +0100 + indicator-datetime (0.3.1-0ubuntu2) precise; urgency=low * debian/patches/lp_802384.patch 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 +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 + #include + #include ++#include + + /* Indicator Stuff */ + #include +@@ -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/series b/debian/patches/series index d70dbda..aa1e0b7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ lp_844741.patch lp_802384.patch +gtk_box_api.patch -- cgit v1.2.3 From d7f6dc74c8ef73f0a27a63c067e95a20954fe7f3 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 13 Jan 2012 00:19:30 +0100 Subject: releasing version 0.3.1-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4c7d39b..64b8e55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.3.1-0ubuntu3) UNRELEASED; urgency=low +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 Thu, 12 Jan 2012 23:23:36 +0100 + -- Mathieu Trudel-Lapierre Fri, 13 Jan 2012 00:03:40 +0100 indicator-datetime (0.3.1-0ubuntu2) precise; urgency=low -- cgit v1.2.3 From 666184e6d235e5d92f03bee9b559035f38d6f4e4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 23 Jan 2012 13:02:43 +0100 Subject: Migrate from libpolkit-gtk-1-dev to libpolkit-gobject-1-dev. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 64b8e55..55a29ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.3.1-0ubuntu4) UNRELEASED; urgency=low + + * Migrate from libpolkit-gtk-1-dev to libpolkit-gobject-1-dev. + + -- Andreas Moog Sat, 24 Dec 2011 21:07:57 +0100 + indicator-datetime (0.3.1-0ubuntu3) precise; urgency=low * Rebuild for the new e-d-s libraries. diff --git a/debian/control b/debian/control index a53c10a..3167f9e 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Build-Depends: cdbs, libgtk-3-dev (>= 3.1.4), libcairo2-dev (>= 1.10), libjson-glib-dev, - libpolkit-gtk-1-dev, + libpolkit-gobject-1-dev, libedataserver1.2-dev (>= 2.30), libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), -- cgit v1.2.3 From 6104c44c16a903741ddc34851fb948da0f21ec06 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 23 Jan 2012 13:07:14 +0100 Subject: Add disable_Werror.patch: Disable -Werror, causes build failures due to deprecated symbols. --- debian/changelog | 5 +++++ debian/patches/disable_Werror.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/disable_Werror.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 55a29ee..b69252a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ indicator-datetime (0.3.1-0ubuntu4) UNRELEASED; 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. + -- Andreas Moog Sat, 24 Dec 2011 21:07:57 +0100 indicator-datetime (0.3.1-0ubuntu3) precise; urgency=low 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 + +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/series b/debian/patches/series index aa1e0b7..ab309a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +disable_Werror.patch lp_844741.patch lp_802384.patch gtk_box_api.patch -- cgit v1.2.3 From 772115cbab9a01a210b54e4a3261a38df1df912c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 23 Jan 2012 13:09:14 +0100 Subject: releasing version 0.3.1-0ubuntu4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b69252a..e845a96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.1-0ubuntu4) UNRELEASED; urgency=low +indicator-datetime (0.3.1-0ubuntu4) precise; urgency=low [ Andreas Moog ] * Migrate from libpolkit-gtk-1-dev to libpolkit-gobject-1-dev. @@ -7,7 +7,7 @@ indicator-datetime (0.3.1-0ubuntu4) UNRELEASED; urgency=low * Add disable_Werror.patch: Disable -Werror, causes build failures due to deprecated symbols. - -- Andreas Moog Sat, 24 Dec 2011 21:07:57 +0100 + -- Martin Pitt Mon, 23 Jan 2012 13:09:08 +0100 indicator-datetime (0.3.1-0ubuntu3) precise; urgency=low -- cgit v1.2.3 From bf6cda68c9bd082b011c4a04158e36cf2b0b6f5d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 22:18:57 -0500 Subject: no change rebuild for libindicator7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e845a96..cdf782b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.3.1-0ubuntu5) UNRELEASED; urgency=low + + * no change rebuild for libindicator7 + + -- Ken VanDine Tue, 24 Jan 2012 12:58:32 -0500 + indicator-datetime (0.3.1-0ubuntu4) precise; urgency=low [ Andreas Moog ] -- cgit v1.2.3 From 4a2175798e434a4e33def2f30e15b49714eab33b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 25 Jan 2012 09:55:24 -0500 Subject: releasing version 0.3.1-0ubuntu5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cdf782b..f8aab12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -indicator-datetime (0.3.1-0ubuntu5) UNRELEASED; urgency=low +indicator-datetime (0.3.1-0ubuntu5) precise; urgency=low * no change rebuild for libindicator7 - -- Ken VanDine Tue, 24 Jan 2012 12:58:32 -0500 + -- Ken VanDine Wed, 25 Jan 2012 09:54:53 -0500 indicator-datetime (0.3.1-0ubuntu4) precise; urgency=low -- cgit v1.2.3 From b37ad74755c0f97b8b4883ca64dcb8b36329a6a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Feb 2012 16:22:17 -0600 Subject: * debian/control: * Bumping libdbusmenu requirement to 0.5.90 * Added dependency on libtimezonemap --- debian/changelog | 5 ++++- debian/control | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cbec1e7..28866b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ indicator-datetime (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Add a name hint on the indicator * Build fixes for updated dependencies * Fixing Geoclue support + * debian/control: + * Bumping libdbusmenu requirement to 0.5.90 + * Added dependency on libtimezonemap - -- Ted Gould Fri, 17 Feb 2012 16:16:23 -0600 + -- Ted Gould Fri, 17 Feb 2012 16:21:42 -0600 indicator-datetime (0.3.1-0ubuntu5) precise; urgency=low diff --git a/debian/control b/debian/control index 3167f9e..4aba64a 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,9 @@ Build-Depends: cdbs, 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), + libdbusmenu-glib-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), + libdbusmenu-gtk3-dev (>= 0.5.90), libglib2.0-dev (>= 2.29.19), libido-0.1-dev (>= 0.2.2), libido3-0.1-dev (>= 0.2.90), @@ -26,7 +26,8 @@ Build-Depends: cdbs, libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), libgnome-control-center-dev, - dh-autoreconf + dh-autoreconf, + libtimezonemap1-dev Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-datetime Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu -- cgit v1.2.3 From b55ef2ffd8339605743be2bcf0d39b1b14f6280d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Feb 2012 16:22:38 -0600 Subject: debian/patches: Removed, all upstream. --- debian/changelog | 3 ++- debian/patches/disable_Werror.patch | 31 ---------------------------- debian/patches/gtk_box_api.patch | 41 ------------------------------------- debian/patches/lp_802384.patch | 18 ---------------- debian/patches/lp_844741.patch | 12 ----------- debian/patches/series | 4 ---- 6 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 debian/patches/disable_Werror.patch delete mode 100644 debian/patches/gtk_box_api.patch delete mode 100644 debian/patches/lp_802384.patch delete mode 100644 debian/patches/lp_844741.patch delete mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 28866b4..fbf084b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ indicator-datetime (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * debian/control: * Bumping libdbusmenu requirement to 0.5.90 * Added dependency on libtimezonemap + * debian/patches: Removed, all upstream. - -- Ted Gould Fri, 17 Feb 2012 16:21:42 -0600 + -- Ted Gould Fri, 17 Feb 2012 16:22:25 -0600 indicator-datetime (0.3.1-0ubuntu5) precise; urgency=low diff --git a/debian/patches/disable_Werror.patch b/debian/patches/disable_Werror.patch deleted file mode 100644 index fc267ca..0000000 --- a/debian/patches/disable_Werror.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Disable -Werror, causes build failures due to deprecated symbols. -Author: Martin Pitt - -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 deleted file mode 100644 index 0dd28f0..0000000 --- a/debian/patches/gtk_box_api.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Mathieu Trudel-Lapierre -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 - #include - #include -+#include - - /* Indicator Stuff */ - #include -@@ -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 deleted file mode 100644 index 2c30c9f..0000000 --- a/debian/patches/lp_802384.patch +++ /dev/null @@ -1,18 +0,0 @@ -=== 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 deleted file mode 100644 index 459779d..0000000 --- a/debian/patches/lp_844741.patch +++ /dev/null @@ -1,12 +0,0 @@ -=== 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 deleted file mode 100644 index ab309a3..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -disable_Werror.patch -lp_844741.patch -lp_802384.patch -gtk_box_api.patch -- cgit v1.2.3 From ade1e121d41dd07ccc81a641862d81798e38b145 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Feb 2012 16:24:54 -0600 Subject: releasing version 0.3.90-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fbf084b..6976556 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.90-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Still need to distribute these files even if we're not building it @@ -14,7 +14,7 @@ indicator-datetime (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Added dependency on libtimezonemap * debian/patches: Removed, all upstream. - -- Ted Gould Fri, 17 Feb 2012 16:22:25 -0600 + -- Ted Gould Fri, 17 Feb 2012 16:24:51 -0600 indicator-datetime (0.3.1-0ubuntu5) precise; urgency=low -- cgit v1.2.3 From fa7f146fafa83e8e612365a5f74ba06ff438d36a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Mar 2012 16:58:32 -0600 Subject: releasing version 0.3.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7bb476f..79807bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.91-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Make GSettings readonly to fix DConf service starting on boot @@ -7,7 +7,7 @@ indicator-datetime (0.3.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Remove unused code (LP: #943746) * Fix timezone ordering in the menu (LP: #833325, LP: #833337) - -- Ted Gould Thu, 08 Mar 2012 16:50:23 -0600 + -- Ted Gould Thu, 08 Mar 2012 16:58:28 -0600 indicator-datetime (0.3.90-0ubuntu1~ppa1) precise; urgency=low -- cgit v1.2.3 From 60d841f8d6376e2127b4e022017d182dbc58c6e3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 21 Mar 2012 11:22:44 -0500 Subject: releasing version 0.3.92-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 619b9eb..fda5766 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.3.92-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.92-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix several memory leaks (LP: #772340, LP: #957320) - -- Charles Kerr Wed, 21 Mar 2012 11:17:15 -0500 + -- Charles Kerr Wed, 21 Mar 2012 11:22:20 -0500 indicator-datetime (0.3.91-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From 1ee82f0dfab7c8b0280a2d1adb62f5efd0261c87 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 21 Mar 2012 13:13:39 -0400 Subject: releasing version 0.3.92-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fda5766..5bafd8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.92-0ubuntu1~ppa1) precise; urgency=low +indicator-datetime (0.3.92-0ubuntu1) precise; urgency=low * New upstream release. * Fix several memory leaks (LP: #772340, LP: #957320) -- cgit v1.2.3 From 872720940a8607065bdd78cfc52141e8b931ec84 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 28 Mar 2012 16:11:08 -0700 Subject: releasing version 0.3.93-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7a6115b..932cea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-datetime (0.3.93-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.93-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix g-c-c crash caused by datetime's prefs panel (LP: #942450) * Fix several memory leaks in datetime's preferences page (LP: #965533) - -- Charles Kerr Wed, 28 Mar 2012 16:08:09 -0700 + -- Charles Kerr Wed, 28 Mar 2012 16:10:35 -0700 indicator-datetime (0.3.92-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From 903b02b9906cd4558eec1578de38c5a97aa43bfb Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 29 Mar 2012 10:55:54 -0400 Subject: releasing version 0.3.93-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 932cea8..40786d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.93-0ubuntu1~ppa1) precise; urgency=low +indicator-datetime (0.3.93-0ubuntu1) precise-proposed; urgency=low * New upstream release. * Fix g-c-c crash caused by datetime's prefs panel (LP: #942450) -- cgit v1.2.3 From 8f8841c38cea315af4bdaa17b80c5305ff8dae1f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 29 Mar 2012 11:44:39 -0400 Subject: releasing version 0.3.93-0ubuntu1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 40786d6..6931f1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.93-0ubuntu1) precise-proposed; urgency=low +indicator-datetime (0.3.93-0ubuntu1) precise; urgency=low * New upstream release. * Fix g-c-c crash caused by datetime's prefs panel (LP: #942450) -- cgit v1.2.3 From dd5e09950a514831fe7e9620bf32c9cab4e0be26 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 4 Apr 2012 16:53:30 -0500 Subject: releasing version 0.3.94-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2e8de1b..e3e56c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.3.94-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-datetime (0.3.94-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Fix location timezone sorting issue. @@ -6,7 +6,7 @@ indicator-datetime (0.3.94-0ubuntu1~ppa1) UNRELEASED; urgency=low Locations dialog. (LP: #947315) * Add gcov targets to autotools build for code-coverage reporting. - -- Charles Kerr Wed, 04 Apr 2012 16:23:11 -0500 + -- Charles Kerr Wed, 04 Apr 2012 16:53:20 -0500 indicator-datetime (0.3.93-0ubuntu1) precise; urgency=low -- cgit v1.2.3 From f08a6599ed7ea547f31cda5c70f457a26e4c167e Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Fri, 25 May 2012 20:29:32 -0400 Subject: releasing version 0.3.94-0ubuntu3 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dedf4da..9b984da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (0.3.94-0ubuntu3) quantal; urgency=low + + * Rebuild against evolution-data-server 3.4 + + -- Jeremy Bicha Fri, 25 May 2012 20:21:44 -0400 + indicator-datetime (0.3.94-0ubuntu2) precise; urgency=low * src/datetime-prefs-locations.c, src/datetime-prefs.c -- cgit v1.2.3 From d4f6a1eab91a05b6628022f95a3d47ff05061556 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 13 Jul 2012 17:08:22 +0200 Subject: releasing version 0.3.94-0ubuntu4 --- debian/changelog | 7 ++ debian/patches/port-eds-3.5.patch | 248 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 256 insertions(+) create mode 100644 debian/patches/port-eds-3.5.patch create mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9b984da..c39a126 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.3.94-0ubuntu4) quantal-proposed; urgency=low + + * debian/patches/port-eds-3.5.patch: update to build with the new EDS + 3.5 APIs. + + -- Mathieu Trudel-Lapierre Thu, 05 Jul 2012 17:11:31 -0400 + indicator-datetime (0.3.94-0ubuntu3) quantal; urgency=low * Rebuild against evolution-data-server 3.4 diff --git a/debian/patches/port-eds-3.5.patch b/debian/patches/port-eds-3.5.patch new file mode 100644 index 0000000..805855f --- /dev/null +++ b/debian/patches/port-eds-3.5.patch @@ -0,0 +1,248 @@ +From: Mathieu Trudel-Lapierre +Subject: Update to evolution-data-server 3.5 API. + +--- + src/datetime-service.c | 176 +++++++++++++++++++++++-------------------------- + 1 file changed, 84 insertions(+), 92 deletions(-) + +Index: b/src/datetime-service.c +=================================================================== +--- a/src/datetime-service.c ++++ b/src/datetime-service.c +@@ -40,11 +40,9 @@ with this program. If not, see + + #include +-#include ++#include + #include +-#include +-#include +-#include ++#include + // Other users of ecal seem to also include these, not sure why they should be included by the above + #include + #include +@@ -594,27 +592,6 @@ check_for_calendar (gpointer user_data) + return FALSE; + } + +-// Authentication function +-static gchar * +-auth_func (ECal *ecal, +- const gchar *prompt, +- const gchar *key, +- gpointer user_data) +-{ +- ESource *source = e_cal_get_source (ecal); +- gchar *auth_domain = e_source_get_duped_property (source, "auth-domain"); +- +- const gchar *component_name; +- if (auth_domain) component_name = auth_domain; +- else component_name = "Calendar"; +- +- gchar *password = e_passwords_get_password (component_name, key); +- +- g_free (auth_domain); +- +- return password; +-} +- + static gint + compare_comp_instances (gconstpointer ga, gconstpointer gb) + { +@@ -649,23 +626,53 @@ comp_instance_free (struct comp_instance + } + + static gboolean +-populate_appointment_instances (ECalComponent * comp, ++populate_appointment_instances (ECalClient * client, + time_t start, + time_t end, + gpointer data) + { +- g_debug("Appending item %p", comp); +- +- ECalComponentVType vtype = e_cal_component_get_vtype (comp); +- if (vtype != E_CAL_COMPONENT_EVENT && vtype != E_CAL_COMPONENT_TODO) return FALSE; +- +- icalproperty_status status; +- e_cal_component_get_status (comp, &status); +- if (status == ICAL_STATUS_COMPLETED || status == ICAL_STATUS_CANCELLED) return FALSE; ++ GSList *ecalcomps, *comp_item; + +- struct comp_instance *ci = comp_instance_new (comp, start, end, E_SOURCE(data)); +- comp_instances = g_list_append (comp_instances, ci); +- return TRUE; ++ if (e_cal_client_get_object_list_as_comps_sync (client, ++ NULL, ++ &ecalcomps, ++ NULL, NULL)) { ++ ++ for (comp_item = ecalcomps; comp_item; comp_item = g_slist_next(comp_item)) { ++ ECalComponent *comp = comp_item->data; ++ ++ g_debug("Appending item %p", e_cal_component_get_as_string(comp)); ++ ++ ECalComponentVType vtype = e_cal_component_get_vtype (comp); ++ if (vtype != E_CAL_COMPONENT_EVENT && vtype != E_CAL_COMPONENT_TODO) return FALSE; ++ ++ icalproperty_status status; ++ e_cal_component_get_status (comp, &status); ++ if (status == ICAL_STATUS_COMPLETED || status == ICAL_STATUS_CANCELLED) return FALSE; ++ ++ g_object_ref(comp); ++ ++ ECalComponentDateTime datetime; ++ icaltimezone *appointment_zone = NULL; ++ icaltimezone *current_zone = NULL; ++ ++ if (vtype == E_CAL_COMPONENT_EVENT) ++ e_cal_component_get_dtstart (comp, &datetime); ++ else ++ e_cal_component_get_due (comp, &datetime); ++ ++ appointment_zone = icaltimezone_get_builtin_timezone_from_tzid(datetime.tzid); ++ current_zone = icaltimezone_get_builtin_timezone_from_tzid(current_timezone); ++ if (!appointment_zone || datetime.value->is_date) { // If it's today put in the current timezone? ++ appointment_zone = current_zone; ++ } ++ ++ struct comp_instance *ci = comp_instance_new (comp, start, end, E_SOURCE(data)); ++ comp_instances = g_list_append (comp_instances, ci); ++ } ++ return TRUE; ++ } ++ return FALSE; + } + + /* Populate the menu with todays, next 5 appointments. +@@ -685,12 +692,12 @@ update_appointment_menu_items (gpointer + updating_appointments = TRUE; + + time_t curtime = 0, t1 = 0, t2 = 0; +- GList *l; +- GSList *g; ++ GList *l, *s; + GError *gerror = NULL; + gint i; + gint width = 0, height = 0; +- ESourceList * sources = NULL; ++ ESourceRegistry * src_registry = NULL; ++ GList * sources = NULL; + + // Get today & work out query times + time(&curtime); +@@ -730,67 +737,52 @@ update_appointment_menu_items (gpointer + highlightdays = highlightdays + 7; // Minimum of 7 days ahead + t2 = t1 + (time_t) (highlightdays * 24 * 60 * 60); + +- if (!e_cal_get_sources(&sources, E_CAL_SOURCE_TYPE_EVENT, &gerror)) { +- g_debug("Failed to get ecal sources\n"); +- g_clear_error (&gerror); +- return FALSE; +- } +- + // clear any previous comp_instances + g_list_free_full (comp_instances, (GDestroyNotify)comp_instance_free); + comp_instances = NULL; + +- GSList *cal_list = gconf_client_get_list(gconf, "/apps/evolution/calendar/display/selected_calendars", GCONF_VALUE_STRING, &gerror); +- if (gerror) { +- g_debug("Failed to get evolution preference for enabled calendars"); +- g_clear_error (&gerror); +- cal_list = NULL; +- } +- ++ src_registry = e_source_registry_new_sync (NULL, &gerror); ++ if (!src_registry) { ++ g_debug("Failed to get access to source registry: %s\n", gerror->message); ++ return FALSE; ++ } ++ ++ sources = e_source_registry_list_sources(src_registry, E_SOURCE_EXTENSION_CALENDAR); ++ + // Generate instances for all sources +- for (g = e_source_list_peek_groups (sources); g; g = g->next) { +- ESourceGroup *group = E_SOURCE_GROUP (g->data); +- GSList *s; +- +- for (s = e_source_group_peek_sources (group); s; s = s->next) { +- ESource *source = E_SOURCE (s->data); +- g_signal_connect (G_OBJECT(source), "changed", G_CALLBACK (update_appointment_menu_items), NULL); +- ECal *ecal = e_cal_new(source, E_CAL_SOURCE_TYPE_EVENT); +- e_cal_set_auth_func (ecal, (ECalAuthFunc) auth_func, NULL); +- +- icaltimezone* current_zone = icaltimezone_get_builtin_timezone(current_timezone); +- if (!current_zone) { +- // current_timezone may be a TZID? +- current_zone = icaltimezone_get_builtin_timezone_from_tzid(current_timezone); +- } +- if (current_zone && !e_cal_set_default_timezone(ecal, current_zone, &gerror)) { +- g_debug("Failed to set ecal default timezone %s", gerror->message); +- g_clear_error (&gerror); +- g_object_unref(ecal); +- continue; +- } +- +- if (!e_cal_open(ecal, FALSE, &gerror)) { +- g_debug("Failed to get ecal sources %s", gerror->message); +- g_clear_error (&gerror); +- g_object_unref(ecal); +- continue; +- } ++ for (s = g_list_first (sources); s; s = g_list_next (s)) { + +- const gchar *ecal_uid = e_source_peek_uid(source); +- g_debug("Checking ecal_uid is enabled: %s", ecal_uid); +- const gboolean in_list = g_slist_find_custom (cal_list, ecal_uid, (GCompareFunc)g_strcmp0) != NULL; +- if (!in_list) { ++ ESource *source = E_SOURCE (s->data); ++ g_signal_connect (G_OBJECT(source), "changed", G_CALLBACK (update_appointment_menu_items), NULL); ++ ECalClient *ecal = e_cal_client_new(source, E_CAL_CLIENT_SOURCE_TYPE_EVENTS, &gerror); ++ ++ icaltimezone* current_zone = icaltimezone_get_builtin_timezone(current_timezone); ++ if (!current_zone) { ++ // current_timezone may be a TZID? ++ current_zone = icaltimezone_get_builtin_timezone_from_tzid(current_timezone); ++ } ++ ++ e_cal_client_set_default_timezone (ecal, current_zone); ++ ++ g_debug("Checking if source %s is enabled", e_source_get_uid(source)); ++ if (e_source_get_enabled (source)) { ++ g_debug("source is enabled, generating instances"); ++ ++ if (!e_client_open_sync (E_CLIENT (ecal), TRUE, NULL, &gerror)) { ++ g_debug("Failed to open source: %s", gerror->message); ++ g_clear_error (&gerror); + g_object_unref(ecal); + continue; + } + +- g_debug("ecal_uid is enabled, generating instances"); +- e_cal_generate_instances (ecal, t1, t2, (ECalRecurInstanceFn) populate_appointment_instances, source); +- g_object_unref(ecal); +- } +- } +- g_slist_free_full (cal_list, g_free); ++ e_cal_client_generate_instances (ecal, t1, t2, NULL, ++ (ECalRecurInstanceFn) populate_appointment_instances, ++ (gpointer) source, ++ NULL); ++ } ++ g_object_unref(ecal); ++ } ++ g_list_free_full (sources, g_object_unref); + + g_debug("Number of ECalComponents returned: %d", g_list_length(comp_instances)); + GList *sorted_comp_instances = g_list_sort(comp_instances, compare_comp_instances); +@@ -942,7 +934,7 @@ update_appointment_menu_items (gpointer + G_CALLBACK(activate_cb), cmd, (GClosureNotify)g_free, 0); + g_free (ad); + +- const gchar *color_spec = e_source_peek_color_spec(ci->source); ++ const gchar *color_spec = e_source_selectable_get_color (e_source_get_extension (ci->source, E_SOURCE_EXTENSION_CALENDAR)); + g_debug("Colour to use: %s", color_spec); + + // Draw the correct icon for the appointment type and then tint it using mask fill. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d8f16a3 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +port-eds-3.5.patch -- cgit v1.2.3 From ed0feadc0e5db7e7326e3ee67b0d86fbbb0576f8 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 13 Jul 2012 17:56:40 +0200 Subject: * New upstream release: - Support EDS 3.6's API - Apply an 'en space' between the date and time strings. (LP #749847) - Sort locations as spec'ed by https://wiki.ubuntu.com/TimeAndDate - Fix a bug that caused location settings to be re-saved each 2 seconds * debian/patches/port-eds-3.5.patch: included in the new version --- debian/changelog | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b31ca2..3437fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,13 @@ indicator-datetime (12.10.0-0ubuntu1) UNRELEASED; urgency=low - * New upstream release. + * New upstream release: + - Support EDS 3.6's API + - Apply an 'en space' between the date and time strings. (LP #749847) + - Sort locations as spec'ed by https://wiki.ubuntu.com/TimeAndDate + - Fix a bug that caused location settings to be re-saved each 2 seconds * debian/control, debian/indicator-datetime.install, debian/rules: - drop GTK2 build it's deprecated - * debian/patches/port-eds-3.5.patch: - - dropped, the patch is in the new version + * debian/patches/port-eds-3.5.patch: included in the new version -- Sebastien Bacher Fri, 13 Jul 2012 17:09:26 +0200 -- cgit v1.2.3 From a393346e574570742334934cb3a015ab1bfe62d7 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 13 Jul 2012 17:56:54 +0200 Subject: releasing version 12.10.0-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3437fbe..260a3a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (12.10.0-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release: - Support EDS 3.6's API @@ -9,7 +9,7 @@ indicator-datetime (12.10.0-0ubuntu1) UNRELEASED; urgency=low - drop GTK2 build it's deprecated * debian/patches/port-eds-3.5.patch: included in the new version - -- Sebastien Bacher Fri, 13 Jul 2012 17:09:26 +0200 + -- Sebastien Bacher Fri, 13 Jul 2012 17:56:46 +0200 indicator-datetime (0.3.94-0ubuntu4) quantal-proposed; urgency=low -- cgit v1.2.3 From 9414aa3cdd59e3650a6e030880c3daa34bd9223c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 11 Sep 2012 15:38:40 -0400 Subject: releasing version 12.10.0-0ubuntu2 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 260a3a1..c088a64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-datetime (12.10.0-0ubuntu2) quantal; urgency=low + + * data/indicator-datetime-preferences.desktop.in + - Removed stray lines from the desktop file, it's causing duplicate + X-Ubuntu-Gettext-Domain to get added. (LP: #1048834) + + -- Ken VanDine Tue, 11 Sep 2012 15:38:10 -0400 + indicator-datetime (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release: -- cgit v1.2.3 From a0149aecbe7cccd5815b23e5aed76b51d9c8cd12 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 20 Sep 2012 18:36:36 +0200 Subject: - Gracefully handle clock skew (LP: #917236) - Raise the version number of our EDS dependency (LP: #1024437) - Fix X-Ubuntu-Gettext-Domain entries in the .desktop file (LP: #1048834) - Remove unnecessary watching for geoclue address provider changes --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a55479e..7348382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ indicator-datetime (12.10.1-0ubuntu1) UNRELEASED; urgency=low * New upstream release. + - Gracefully handle clock skew (LP: #917236) + - Raise the version number of our EDS dependency (LP: #1024437) + - Fix X-Ubuntu-Gettext-Domain entries in the .desktop file (LP: #1048834) + - Remove unnecessary watching for geoclue address provider changes * build-dep on newer libecal -- Didier Roche Thu, 20 Sep 2012 18:35:07 +0200 -- cgit v1.2.3 From 0dadc70d5795a15a4d3cc4c67730f0a13857d445 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 20 Sep 2012 18:51:33 +0200 Subject: build-dep on newer e-d-s stack --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7348382..14e7741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ indicator-datetime (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Raise the version number of our EDS dependency (LP: #1024437) - Fix X-Ubuntu-Gettext-Domain entries in the .desktop file (LP: #1048834) - Remove unnecessary watching for geoclue address provider changes - * build-dep on newer libecal + * build-dep on newer e-d-s stack -- Didier Roche Thu, 20 Sep 2012 18:35:07 +0200 diff --git a/debian/control b/debian/control index 0498c7a..e578a9c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: cdbs, libido3-0.1-dev (>= 0.2.90), libgeoclue-dev (>= 0.12.0), libecal1.2-dev (>= 3.5), - libical-dev (>= 0.44), + libical-dev (>= 0.48), libgtk-3-dev (>= 3.1.4), libcairo2-dev (>= 1.10), libjson-glib-dev, -- cgit v1.2.3 From d25d5903237eb4d4d7d1c6d5151b936175f28b59 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 20 Sep 2012 18:51:37 +0200 Subject: releasing version 12.10.1-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14e7741..820c022 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (12.10.1-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. - Gracefully handle clock skew (LP: #917236) @@ -7,7 +7,7 @@ indicator-datetime (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Remove unnecessary watching for geoclue address provider changes * build-dep on newer e-d-s stack - -- Didier Roche Thu, 20 Sep 2012 18:35:07 +0200 + -- Didier Roche Thu, 20 Sep 2012 18:51:34 +0200 indicator-datetime (12.10.0-0ubuntu2) quantal; urgency=low -- cgit v1.2.3 From 8e0e00ef2edf79ee39315a37ab60dc5d9ebc2aaf Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 4 Oct 2012 17:54:01 +0200 Subject: releasing version 12.10.2-0ubuntu1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 53165b8..00d64de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (12.10.2-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (12.10.2-0ubuntu1) quantal; urgency=low * New upstream release: - Fix 12.10.0 appointment calendar regression. (LP: #1060263) - -- Sebastien Bacher Thu, 04 Oct 2012 17:50:53 +0200 + -- Sebastien Bacher Thu, 04 Oct 2012 17:53:56 +0200 indicator-datetime (12.10.1-0ubuntu1) quantal; urgency=low -- cgit v1.2.3 From f7ba1888e002430df29a759dfcc7e0679234b0a5 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 5 Oct 2012 17:24:21 +0200 Subject: releasing version 12.10.2-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6d796b1..60462c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (12.10.2-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (12.10.2-0ubuntu2) quantal; urgency=low * Backport fix from Lars for a missing NULL check leading to segfault (lp: #1061867) - -- Sebastien Bacher Fri, 05 Oct 2012 17:23:38 +0200 + -- Sebastien Bacher Fri, 05 Oct 2012 17:24:16 +0200 indicator-datetime (12.10.2-0ubuntu1) quantal; urgency=low -- cgit v1.2.3 From 5e96f18045e9d3fbb98893da64ac329ec6b3daa4 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 9 Oct 2012 19:35:24 +0200 Subject: releasing version 12.10.2-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 24ad8ec..031b0c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (12.10.2-0ubuntu3) UNRELEASED; urgency=low +indicator-datetime (12.10.2-0ubuntu3) quantal; urgency=low * Backport "fix off-by-one error" leading to have the settings item run the calendar application rather than the control center (lp: #1064375) - -- Sebastien Bacher Tue, 09 Oct 2012 19:32:20 +0200 + -- Sebastien Bacher Tue, 09 Oct 2012 19:35:18 +0200 indicator-datetime (12.10.2-0ubuntu2) quantal; urgency=low -- cgit v1.2.3 From d332852b45ee3e1870877304477ede511d32c82e Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 5 Nov 2012 17:49:37 +0100 Subject: releasing version 12.10.2-0ubuntu4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b8d8742..7a97c79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -indicator-datetime (12.10.2-0ubuntu4) UNRELEASED; urgency=low +indicator-datetime (12.10.2-0ubuntu4) raring; urgency=low * Backported r192 and r193, fix: - "shows all-day events one day too early" (lp: #1000182) - "Bogus insensitive events after clicking on different date" (lp: #1069177) - -- Sebastien Bacher Mon, 05 Nov 2012 17:20:21 +0100 + -- Sebastien Bacher Mon, 05 Nov 2012 17:23:13 +0100 indicator-datetime (12.10.2-0ubuntu3) quantal; urgency=low -- cgit v1.2.3 From 89b3d7e2d057f656dc4fdc2b108cb65f53d9ece6 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:22:39 -0500 Subject: * debian/control: - Update to follow style like other indicator packages: use trailing commas at the end of lists. --- debian/changelog | 8 ++++++++ debian/control | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7a97c79..edb0f02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low + + * debian/control: + - Update to follow style like other indicator packages: use trailing commas + at the end of lists. + + -- Mathieu Trudel-Lapierre Fri, 16 Nov 2012 15:17:20 -0500 + indicator-datetime (12.10.2-0ubuntu4) raring; urgency=low * Backported r192 and r193, fix: diff --git a/debian/control b/debian/control index e578a9c..bec336b 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: cdbs, libgconf2-dev (>= 2.31), libgnome-control-center-dev, dh-autoreconf, - libtimezonemap1-dev + libtimezonemap1-dev, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-datetime Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu @@ -33,8 +33,9 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-control-center, - geoclue-ubuntu-geoip | geoclue-provider -Recommends: indicator-applet | indicator-renderer, evolution-data-server + geoclue-ubuntu-geoip | geoclue-provider, +Recommends: indicator-applet | indicator-renderer, + evolution-data-server, Description: Simple clock A simple clock appearing in the indicator bar -- cgit v1.2.3 From 28841f9a36ac6d05da94f0678889de669a4ca1e7 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:28:58 -0500 Subject: - Reorganize Build-Depends for clarity. - Drop Build-Depends on cdbs, bump debhelper to (>= 9). --- debian/changelog | 2 ++ debian/control | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index edb0f02..96da3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low * debian/control: - Update to follow style like other indicator packages: use trailing commas at the end of lists. + - Reorganize Build-Depends for clarity. + - Drop Build-Depends on cdbs, bump debhelper to (>= 9). -- Mathieu Trudel-Lapierre Fri, 16 Nov 2012 15:17:20 -0500 diff --git a/debian/control b/debian/control index bec336b..ca90877 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: indicator-datetime Section: misc Priority: optional Maintainer: Ubuntu Desktop Team -Build-Depends: cdbs, - debhelper (>= 5), +Build-Depends: debhelper (>= 9), quilt, + dh-autoreconf, intltool (>= 0.35.0), libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.5.90), @@ -22,7 +22,6 @@ Build-Depends: cdbs, libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), libgnome-control-center-dev, - dh-autoreconf, libtimezonemap1-dev, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-datetime -- cgit v1.2.3 From 6f6b91b8400e7c39c713d4d8b5ee7873a1f82da9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:32:42 -0500 Subject: Update Vcs-Bzr and Vcs-Browser, add a notice for uploaders. --- debian/changelog | 1 + debian/control | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 96da3ab..5e9ac02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low at the end of lists. - Reorganize Build-Depends for clarity. - Drop Build-Depends on cdbs, bump debhelper to (>= 9). + - Update Vcs-Bzr and Vcs-Browser, add a notice for uploaders. -- Mathieu Trudel-Lapierre Fri, 16 Nov 2012 15:17:20 -0500 diff --git a/debian/control b/debian/control index ca90877..dc3e8f9 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,11 @@ Build-Depends: debhelper (>= 9), libtimezonemap1-dev, Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-datetime -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu +# If you aren't a member of ~indicator-applet-developers but need to upload +# packaging changes, just go ahead. ~indicator-applet-developers will notice +# and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04 +Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-datetime/trunk.13.04/files Package: indicator-datetime Architecture: any -- cgit v1.2.3 From 346b8038538627d86cc653c2c24fbf54a7d569f0 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:34:51 -0500 Subject: debian/compat: bump compat level to 9. --- debian/changelog | 1 + debian/compat | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5e9ac02..fec6948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Reorganize Build-Depends for clarity. - Drop Build-Depends on cdbs, bump debhelper to (>= 9). - Update Vcs-Bzr and Vcs-Browser, add a notice for uploaders. + * debian/compat: bump compat level to 9. -- Mathieu Trudel-Lapierre Fri, 16 Nov 2012 15:17:20 -0500 diff --git a/debian/compat b/debian/compat index 7ed6ff8..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 -- cgit v1.2.3 From b3c1c09b14cd358f830dd8a486bfddaf17d014de Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:40:12 -0500 Subject: * debian/rules: - Switch to using the dh sequencer instead of cdbs rules, adjust targets accordingly. --- debian/changelog | 3 +++ debian/rules | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fec6948..7657555 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Drop Build-Depends on cdbs, bump debhelper to (>= 9). - Update Vcs-Bzr and Vcs-Browser, add a notice for uploaders. * debian/compat: bump compat level to 9. + * debian/rules: + - Switch to using the dh sequencer instead of cdbs rules, adjust targets + accordingly. -- Mathieu Trudel-Lapierre Fri, 16 Nov 2012 15:17:20 -0500 diff --git a/debian/rules b/debian/rules index 135786f..81726a1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,18 @@ #!/usr/bin/make -f -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 +LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_CONFIGURE_EXTRA_FLAGS = --disable-static +%: + dh $@ --with quilt,autoreconf -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +override_dh_auto_configure: + dh_auto_configure -- --disable-static -common-install-arch:: +override_dh_install: find debian/indicator-datetime -name \*.la -delete find debian/indicator-datetime -name \*.a -delete cd po; intltool-update --pot --verbose + dh_install --fail-missing # Language packs for d in $$(find debian/indicator-datetime -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \ sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \ -- cgit v1.2.3 From bf02832a7c5eaa39405cc59e7a89a8b8d73b2a84 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:41:16 -0500 Subject: Add gnome-common to Build-Depends. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7657555..531276c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Reorganize Build-Depends for clarity. - Drop Build-Depends on cdbs, bump debhelper to (>= 9). - Update Vcs-Bzr and Vcs-Browser, add a notice for uploaders. + - Add gnome-common to Build-Depends. * debian/compat: bump compat level to 9. * debian/rules: - Switch to using the dh sequencer instead of cdbs rules, adjust targets diff --git a/debian/control b/debian/control index dc3e8f9..190329f 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Build-Depends: debhelper (>= 9), quilt, dh-autoreconf, intltool (>= 0.35.0), + gnome-common, libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), -- cgit v1.2.3 From b562e8313bdff3b874a7aa3a32a3333da64b10fc Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 15:43:36 -0500 Subject: Override dh_autoreconf to make it use autogen.sh from upstream. --- debian/changelog | 1 + debian/rules | 3 +++ 2 files changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 531276c..619efd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low * debian/rules: - Switch to using the dh sequencer instead of cdbs rules, adjust targets accordingly. + - Override dh_autoreconf to make it use autogen.sh from upstream. -- Mathieu Trudel-Lapierre Fri, 16 Nov 2012 15:17:20 -0500 diff --git a/debian/rules b/debian/rules index 81726a1..f98cf93 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: dh $@ --with quilt,autoreconf +override_dh_autoreconf: + NOCONFIGURE=1 dh_autoreconf ./autogen.sh + override_dh_auto_configure: dh_auto_configure -- --disable-static -- cgit v1.2.3 From 233c3be5d119a4e58135b0a099901a93bc285c5d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 16 Nov 2012 16:51:29 -0500 Subject: Add libxorg-gtest-dev, libgtest-dev to Build-Depends. --- debian/changelog | 1 + debian/control | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 619efd7..fb4221e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ indicator-datetime (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Drop Build-Depends on cdbs, bump debhelper to (>= 9). - Update Vcs-Bzr and Vcs-Browser, add a notice for uploaders. - Add gnome-common to Build-Depends. + - Add libxorg-gtest-dev, libgtest-dev to Build-Depends. * debian/compat: bump compat level to 9. * debian/rules: - Switch to using the dh sequencer instead of cdbs rules, adjust targets diff --git a/debian/control b/debian/control index 190329f..723084a 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,8 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, intltool (>= 0.35.0), gnome-common, + libxorg-gtest-dev, + libgtest-dev, libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), -- cgit v1.2.3