Indicator Date and Time

Merge lp:~indicator-applet-developers/indicator-datetime/ubuntu into lp:~ubuntu-desktop/indicator-datetime/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 127
Proposed branch: lp:~indicator-applet-developers/indicator-datetime/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-datetime/ubuntu
Diff against target: 301 lines (+59/-27) (has conflicts)
8 files modified
ChangeLog (+32/-0)
configure (+10/-19)
configure.ac (+1/-2)
data/datetime-dialog.ui (+0/-1)
debian/changelog (+14/-0)
debian/control (+0/-2)
src/datetime-prefs.c (+0/-1)
src/datetime-service.c (+2/-2)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-datetime/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+79327@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-09-29 20:38:31 +0000
+++ ChangeLog 2011-10-13 18:44:23 +0000
@@ -1,5 +1,37 @@
1# Generated by Makefile. Do not edit.1# Generated by Makefile. Do not edit.
22
32011-10-13 Ted Gould <ted@gould.cx>
4
5 0.3.1
6
72011-10-13 Ted Gould <ted@gould.cx>
8
9 Removing unused libunique
10
112011-10-05 Javier Jardón <javier.jardon@codethink.co.uk>
12
13 Remove libunique dependency as Its not needed anymore
14
152011-10-13 Ted Gould <ted@gould.cx>
16
17 Checking to see if the timezones match
18
192011-10-12 Ted Gould <ted@gould.cx>
20
21 Check to see if we're in the same timezone as default
22
232011-10-11 Ted Gould <ted@gould.cx>
24
25 Removing icon from window.
26
272011-10-06 Javier Jardón <javier.jardon@codethink.co.uk>
28
29 Remove use of window icon
30
31 Its not showed by default anyway
32
33 Fixes https://bugs.launchpad.net/indicator-datetime/+bug/746176
34
32011-09-29 Ted Gould <ted@gould.cx>352011-09-29 Ted Gould <ted@gould.cx>
436
5 0.3.037 0.3.0
638
=== modified file 'configure'
--- configure 2011-09-29 20:38:31 +0000
+++ configure 2011-10-13 18:44:23 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.0.3# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.1.
4#4#
5# Report bugs to <http://bugs.launchpad.net/indicator-datetime>.5# Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
6#6#
@@ -572,8 +572,8 @@
572# Identity of this package.572# Identity of this package.
573PACKAGE_NAME='indicator-datetime'573PACKAGE_NAME='indicator-datetime'
574PACKAGE_TARNAME='indicator-datetime'574PACKAGE_TARNAME='indicator-datetime'
575PACKAGE_VERSION='0.3.0'575PACKAGE_VERSION='0.3.1'
576PACKAGE_STRING='indicator-datetime 0.3.0'576PACKAGE_STRING='indicator-datetime 0.3.1'
577PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'577PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
578PACKAGE_URL='http://launchpad.net/indicator-datetime'578PACKAGE_URL='http://launchpad.net/indicator-datetime'
579579
@@ -1375,7 +1375,7 @@
1375 # Omit some internal or obsolete options to make the list less imposing.1375 # Omit some internal or obsolete options to make the list less imposing.
1376 # This message is too long to be a string in the A/UX 3.1 sh.1376 # This message is too long to be a string in the A/UX 3.1 sh.
1377 cat <<_ACEOF1377 cat <<_ACEOF
1378\`configure' configures indicator-datetime 0.3.0 to adapt to many kinds of systems.1378\`configure' configures indicator-datetime 0.3.1 to adapt to many kinds of systems.
13791379
1380Usage: $0 [OPTION]... [VAR=VALUE]...1380Usage: $0 [OPTION]... [VAR=VALUE]...
13811381
@@ -1446,7 +1446,7 @@
14461446
1447if test -n "$ac_init_help"; then1447if test -n "$ac_init_help"; then
1448 case $ac_init_help in1448 case $ac_init_help in
1449 short | recursive ) echo "Configuration of indicator-datetime 0.3.0:";;1449 short | recursive ) echo "Configuration of indicator-datetime 0.3.1:";;
1450 esac1450 esac
1451 cat <<\_ACEOF1451 cat <<\_ACEOF
14521452
@@ -1578,7 +1578,7 @@
1578test -n "$ac_init_help" && exit $ac_status1578test -n "$ac_init_help" && exit $ac_status
1579if $ac_init_version; then1579if $ac_init_version; then
1580 cat <<\_ACEOF1580 cat <<\_ACEOF
1581indicator-datetime configure 0.3.01581indicator-datetime configure 0.3.1
1582generated by GNU Autoconf 2.681582generated by GNU Autoconf 2.68
15831583
1584Copyright (C) 2010 Free Software Foundation, Inc.1584Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1949,7 +1949,7 @@
1949This file contains any messages produced by compilers while1949This file contains any messages produced by compilers while
1950running configure, to aid debugging if configure makes a mistake.1950running configure, to aid debugging if configure makes a mistake.
19511951
1952It was created by indicator-datetime $as_me 0.3.0, which was1952It was created by indicator-datetime $as_me 0.3.1, which was
1953generated by GNU Autoconf 2.68. Invocation command line was1953generated by GNU Autoconf 2.68. Invocation command line was
19541954
1955 $ $0 $@1955 $ $0 $@
@@ -2773,7 +2773,7 @@
27732773
2774# Define the identity of the package.2774# Define the identity of the package.
2775 PACKAGE='indicator-datetime'2775 PACKAGE='indicator-datetime'
2776 VERSION='0.3.0'2776 VERSION='0.3.1'
27772777
27782778
2779cat >>confdefs.h <<_ACEOF2779cat >>confdefs.h <<_ACEOF
@@ -12282,13 +12282,11 @@
12282 if test -n "$PKG_CONFIG" && \12282 if test -n "$PKG_CONFIG" && \
12283 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION12283 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
12284 gtk+-3.0 >= \$GTK3_REQUIRED_VERSION12284 gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
12285 unique-3.0
12286 json-glib-1.012285 json-glib-1.0
12287 libgnome-control-center12286 libgnome-control-center
12288 polkit-gobject-1\""; } >&512287 polkit-gobject-1\""; } >&5
12289 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION12288 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
12290 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12289 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12291 unique-3.0
12292 json-glib-1.012290 json-glib-1.0
12293 libgnome-control-center12291 libgnome-control-center
12294 polkit-gobject-1") 2>&512292 polkit-gobject-1") 2>&5
@@ -12297,7 +12295,6 @@
12297 test $ac_status = 0; }; then12295 test $ac_status = 0; }; then
12298 pkg_cv_PREF_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION12296 pkg_cv_PREF_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
12299 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12297 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12300 unique-3.0
12301 json-glib-1.012298 json-glib-1.0
12302 libgnome-control-center12299 libgnome-control-center
12303 polkit-gobject-1" 2>/dev/null`12300 polkit-gobject-1" 2>/dev/null`
@@ -12314,13 +12311,11 @@
12314 if test -n "$PKG_CONFIG" && \12311 if test -n "$PKG_CONFIG" && \
12315 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION12312 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
12316 gtk+-3.0 >= \$GTK3_REQUIRED_VERSION12313 gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
12317 unique-3.0
12318 json-glib-1.012314 json-glib-1.0
12319 libgnome-control-center12315 libgnome-control-center
12320 polkit-gobject-1\""; } >&512316 polkit-gobject-1\""; } >&5
12321 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION12317 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
12322 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12318 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12323 unique-3.0
12324 json-glib-1.012319 json-glib-1.0
12325 libgnome-control-center12320 libgnome-control-center
12326 polkit-gobject-1") 2>&512321 polkit-gobject-1") 2>&5
@@ -12329,7 +12324,6 @@
12329 test $ac_status = 0; }; then12324 test $ac_status = 0; }; then
12330 pkg_cv_PREF_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION12325 pkg_cv_PREF_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
12331 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12326 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12332 unique-3.0
12333 json-glib-1.012327 json-glib-1.0
12334 libgnome-control-center12328 libgnome-control-center
12335 polkit-gobject-1" 2>/dev/null`12329 polkit-gobject-1" 2>/dev/null`
@@ -12355,14 +12349,12 @@
12355 if test $_pkg_short_errors_supported = yes; then12349 if test $_pkg_short_errors_supported = yes; then
12356 PREF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION12350 PREF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
12357 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12351 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12358 unique-3.0
12359 json-glib-1.012352 json-glib-1.0
12360 libgnome-control-center12353 libgnome-control-center
12361 polkit-gobject-1" 2>&1`12354 polkit-gobject-1" 2>&1`
12362 else12355 else
12363 PREF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION12356 PREF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
12364 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12357 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12365 unique-3.0
12366 json-glib-1.012358 json-glib-1.0
12367 libgnome-control-center12359 libgnome-control-center
12368 polkit-gobject-1" 2>&1`12360 polkit-gobject-1" 2>&1`
@@ -12372,7 +12364,6 @@
1237212364
12373 as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION12365 as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
12374 gtk+-3.0 >= $GTK3_REQUIRED_VERSION12366 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
12375 unique-3.0
12376 json-glib-1.012367 json-glib-1.0
12377 libgnome-control-center12368 libgnome-control-center
12378 polkit-gobject-1) were not met:12369 polkit-gobject-1) were not met:
@@ -14654,7 +14645,7 @@
14654# report actual input values of CONFIG_FILES etc. instead of their14645# report actual input values of CONFIG_FILES etc. instead of their
14655# values after options handling.14646# values after options handling.
14656ac_log="14647ac_log="
14657This file was extended by indicator-datetime $as_me 0.3.0, which was14648This file was extended by indicator-datetime $as_me 0.3.1, which was
14658generated by GNU Autoconf 2.68. Invocation command line was14649generated by GNU Autoconf 2.68. Invocation command line was
1465914650
14660 CONFIG_FILES = $CONFIG_FILES14651 CONFIG_FILES = $CONFIG_FILES
@@ -14721,7 +14712,7 @@
14721cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=114712cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
14722ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"14713ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
14723ac_cs_version="\\14714ac_cs_version="\\
14724indicator-datetime config.status 0.3.014715indicator-datetime config.status 0.3.1
14725configured by $0, generated by GNU Autoconf 2.68,14716configured by $0, generated by GNU Autoconf 2.68,
14726 with options \\"\$ac_cs_config\\"14717 with options \\"\$ac_cs_config\\"
1472714718
1472814719
=== modified file 'configure.ac'
--- configure.ac 2011-09-29 20:38:31 +0000
+++ configure.ac 2011-10-13 18:44:23 +0000
@@ -1,5 +1,5 @@
1AC_INIT([indicator-datetime],1AC_INIT([indicator-datetime],
2 [0.3.0],2 [0.3.1],
3 [http://bugs.launchpad.net/indicator-datetime],3 [http://bugs.launchpad.net/indicator-datetime],
4 [indicator-datetime],4 [indicator-datetime],
5 [http://launchpad.net/indicator-datetime])5 [http://launchpad.net/indicator-datetime])
@@ -105,7 +105,6 @@
105105
106PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION106PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION
107 gtk+-3.0 >= $GTK3_REQUIRED_VERSION107 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
108 unique-3.0
109 json-glib-1.0108 json-glib-1.0
110 libgnome-control-center109 libgnome-control-center
111 polkit-gobject-1)110 polkit-gobject-1)
112111
=== modified file 'data/datetime-dialog.ui'
--- data/datetime-dialog.ui 2011-08-17 19:30:53 +0000
+++ data/datetime-dialog.ui 2011-10-13 18:44:23 +0000
@@ -13,7 +13,6 @@
13 <property name="default_width">300</property>13 <property name="default_width">300</property>
14 <property name="default_height">200</property>14 <property name="default_height">200</property>
15 <property name="destroy_with_parent">True</property>15 <property name="destroy_with_parent">True</property>
16 <property name="icon_name">time-admin</property>
17 <child>16 <child>
18 <object class="GtkVBox" id="vbox1">17 <object class="GtkVBox" id="vbox1">
19 <property name="visible">True</property>18 <property name="visible">True</property>
2019
=== modified file 'debian/changelog'
--- debian/changelog 2011-10-05 19:04:17 +0000
+++ debian/changelog 2011-10-13 18:44:23 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low2indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low
23
3 * debian/patches/lp_844741.patch4 * debian/patches/lp_844741.patch
@@ -6,6 +7,19 @@
6 -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Oct 2011 11:59:21 -04007 -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Oct 2011 11:59:21 -0400
78
8indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low9indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low
10=======
11indicator-datetime (0.3.1-0ubuntu1~ppa1) oneiric; urgency=low
12
13 * New upstream release.
14 * Drop an unused icon (LP: #746176)
15 * Fix showing a timezone that we're currently set to (LP: #833337)
16 * Remove check for libunique as it's unused
17 * debian/control: Drop libunique requirements
18
19 -- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 13:40:21 -0500
20
21indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low
22>>>>>>> MERGE-SOURCE
923
10 [ Ken VanDine ]24 [ Ken VanDine ]
11 * debian/control25 * debian/control
1226
=== modified file 'debian/control'
--- debian/control 2011-09-29 20:29:20 +0000
+++ debian/control 2011-10-13 18:44:23 +0000
@@ -14,7 +14,6 @@
14 libglib2.0-dev (>= 2.29.19),14 libglib2.0-dev (>= 2.29.19),
15 libido-0.1-dev (>= 0.2.2),15 libido-0.1-dev (>= 0.2.2),
16 libido3-0.1-dev (>= 0.2.90),16 libido3-0.1-dev (>= 0.2.90),
17 libunique-3.0-dev,
18 libgeoclue-dev (>= 0.12.0),17 libgeoclue-dev (>= 0.12.0),
19 libecal1.2-dev (>= 2.30),18 libecal1.2-dev (>= 2.30),
20 libical-dev (>= 0.44),19 libical-dev (>= 0.44),
@@ -22,7 +21,6 @@
22 libgtk-3-dev (>= 3.1.4),21 libgtk-3-dev (>= 3.1.4),
23 libcairo2-dev (>= 1.10),22 libcairo2-dev (>= 1.10),
24 libjson-glib-dev,23 libjson-glib-dev,
25 libunique-dev,
26 libpolkit-gtk-1-dev,24 libpolkit-gtk-1-dev,
27 libedataserver1.2-dev (>= 2.30),25 libedataserver1.2-dev (>= 2.30),
28 libedataserverui-3.0-dev,26 libedataserverui-3.0-dev,
2927
=== modified file 'src/datetime-prefs.c'
--- src/datetime-prefs.c 2011-09-09 09:47:20 +0000
+++ src/datetime-prefs.c 2011-10-13 18:44:23 +0000
@@ -32,7 +32,6 @@
32#include <glib/gi18n-lib.h>32#include <glib/gi18n-lib.h>
33#include <gdk/gdkkeysyms.h>33#include <gdk/gdkkeysyms.h>
34#include <gtk/gtk.h>34#include <gtk/gtk.h>
35#include <unique/unique.h>
36#include <polkit/polkit.h>35#include <polkit/polkit.h>
37#include <libgnome-control-center/cc-panel.h>36#include <libgnome-control-center/cc-panel.h>
3837
3938
=== modified file 'src/datetime-service.c'
--- src/datetime-service.c 2011-09-29 20:38:31 +0000
+++ src/datetime-service.c 2011-10-13 18:44:23 +0000
@@ -581,8 +581,8 @@
581 offset = dbusmenu_menuitem_get_position (current_location, root)+1;581 offset = dbusmenu_menuitem_get_position (current_location, root)+1;
582 for (i = 0; i < len; i++) {582 for (i = 0; i < len; i++) {
583 // Iterate over configured places and add any which aren't already listed583 // Iterate over configured places and add any which aren't already listed
584 if (g_strcmp0(locations[i], current_timezone) != 0 &&584 if ((current_timezone == NULL || !g_str_has_prefix(locations[i], current_timezone)) &&
585 g_strcmp0(locations[i], geo_timezone) != 0) {585 (geo_timezone == NULL || !g_str_has_prefix(locations[i], geo_timezone))) {
586 g_debug("Adding timezone in update_timezones %s", locations[i]);586 g_debug("Adding timezone in update_timezones %s", locations[i]);
587 item = dbusmenu_menuitem_new();587 item = dbusmenu_menuitem_new();
588 dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, TIMEZONE_MENUITEM_TYPE);588 dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, TIMEZONE_MENUITEM_TYPE);

Subscribers

People subscribed via source and target branches