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

Proposed by Ted Gould on 2011-10-13
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 2011-10-13 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
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-09-29 20:38:31 +0000
3+++ ChangeLog 2011-10-13 18:44:23 +0000
4@@ -1,5 +1,37 @@
5 # Generated by Makefile. Do not edit.
6
7+2011-10-13 Ted Gould <ted@gould.cx>
8+
9+ 0.3.1
10+
11+2011-10-13 Ted Gould <ted@gould.cx>
12+
13+ Removing unused libunique
14+
15+2011-10-05 Javier Jardón <javier.jardon@codethink.co.uk>
16+
17+ Remove libunique dependency as Its not needed anymore
18+
19+2011-10-13 Ted Gould <ted@gould.cx>
20+
21+ Checking to see if the timezones match
22+
23+2011-10-12 Ted Gould <ted@gould.cx>
24+
25+ Check to see if we're in the same timezone as default
26+
27+2011-10-11 Ted Gould <ted@gould.cx>
28+
29+ Removing icon from window.
30+
31+2011-10-06 Javier Jardón <javier.jardon@codethink.co.uk>
32+
33+ Remove use of window icon
34+
35+ Its not showed by default anyway
36+
37+ Fixes https://bugs.launchpad.net/indicator-datetime/+bug/746176
38+
39 2011-09-29 Ted Gould <ted@gould.cx>
40
41 0.3.0
42
43=== modified file 'configure'
44--- configure 2011-09-29 20:38:31 +0000
45+++ configure 2011-10-13 18:44:23 +0000
46@@ -1,6 +1,6 @@
47 #! /bin/sh
48 # Guess values for system-dependent variables and create Makefiles.
49-# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.0.
50+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.1.
51 #
52 # Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
53 #
54@@ -572,8 +572,8 @@
55 # Identity of this package.
56 PACKAGE_NAME='indicator-datetime'
57 PACKAGE_TARNAME='indicator-datetime'
58-PACKAGE_VERSION='0.3.0'
59-PACKAGE_STRING='indicator-datetime 0.3.0'
60+PACKAGE_VERSION='0.3.1'
61+PACKAGE_STRING='indicator-datetime 0.3.1'
62 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
63 PACKAGE_URL='http://launchpad.net/indicator-datetime'
64
65@@ -1375,7 +1375,7 @@
66 # Omit some internal or obsolete options to make the list less imposing.
67 # This message is too long to be a string in the A/UX 3.1 sh.
68 cat <<_ACEOF
69-\`configure' configures indicator-datetime 0.3.0 to adapt to many kinds of systems.
70+\`configure' configures indicator-datetime 0.3.1 to adapt to many kinds of systems.
71
72 Usage: $0 [OPTION]... [VAR=VALUE]...
73
74@@ -1446,7 +1446,7 @@
75
76 if test -n "$ac_init_help"; then
77 case $ac_init_help in
78- short | recursive ) echo "Configuration of indicator-datetime 0.3.0:";;
79+ short | recursive ) echo "Configuration of indicator-datetime 0.3.1:";;
80 esac
81 cat <<\_ACEOF
82
83@@ -1578,7 +1578,7 @@
84 test -n "$ac_init_help" && exit $ac_status
85 if $ac_init_version; then
86 cat <<\_ACEOF
87-indicator-datetime configure 0.3.0
88+indicator-datetime configure 0.3.1
89 generated by GNU Autoconf 2.68
90
91 Copyright (C) 2010 Free Software Foundation, Inc.
92@@ -1949,7 +1949,7 @@
93 This file contains any messages produced by compilers while
94 running configure, to aid debugging if configure makes a mistake.
95
96-It was created by indicator-datetime $as_me 0.3.0, which was
97+It was created by indicator-datetime $as_me 0.3.1, which was
98 generated by GNU Autoconf 2.68. Invocation command line was
99
100 $ $0 $@
101@@ -2773,7 +2773,7 @@
102
103 # Define the identity of the package.
104 PACKAGE='indicator-datetime'
105- VERSION='0.3.0'
106+ VERSION='0.3.1'
107
108
109 cat >>confdefs.h <<_ACEOF
110@@ -12282,13 +12282,11 @@
111 if test -n "$PKG_CONFIG" && \
112 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
113 gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
114- unique-3.0
115 json-glib-1.0
116 libgnome-control-center
117 polkit-gobject-1\""; } >&5
118 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
119 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
120- unique-3.0
121 json-glib-1.0
122 libgnome-control-center
123 polkit-gobject-1") 2>&5
124@@ -12297,7 +12295,6 @@
125 test $ac_status = 0; }; then
126 pkg_cv_PREF_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED_VERSION
127 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
128- unique-3.0
129 json-glib-1.0
130 libgnome-control-center
131 polkit-gobject-1" 2>/dev/null`
132@@ -12314,13 +12311,11 @@
133 if test -n "$PKG_CONFIG" && \
134 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED_VERSION
135 gtk+-3.0 >= \$GTK3_REQUIRED_VERSION
136- unique-3.0
137 json-glib-1.0
138 libgnome-control-center
139 polkit-gobject-1\""; } >&5
140 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED_VERSION
141 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
142- unique-3.0
143 json-glib-1.0
144 libgnome-control-center
145 polkit-gobject-1") 2>&5
146@@ -12329,7 +12324,6 @@
147 test $ac_status = 0; }; then
148 pkg_cv_PREF_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
149 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
150- unique-3.0
151 json-glib-1.0
152 libgnome-control-center
153 polkit-gobject-1" 2>/dev/null`
154@@ -12355,14 +12349,12 @@
155 if test $_pkg_short_errors_supported = yes; then
156 PREF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
157 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
158- unique-3.0
159 json-glib-1.0
160 libgnome-control-center
161 polkit-gobject-1" 2>&1`
162 else
163 PREF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= $GIO_REQUIRED_VERSION
164 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
165- unique-3.0
166 json-glib-1.0
167 libgnome-control-center
168 polkit-gobject-1" 2>&1`
169@@ -12372,7 +12364,6 @@
170
171 as_fn_error $? "Package requirements (gio-2.0 >= $GIO_REQUIRED_VERSION
172 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
173- unique-3.0
174 json-glib-1.0
175 libgnome-control-center
176 polkit-gobject-1) were not met:
177@@ -14654,7 +14645,7 @@
178 # report actual input values of CONFIG_FILES etc. instead of their
179 # values after options handling.
180 ac_log="
181-This file was extended by indicator-datetime $as_me 0.3.0, which was
182+This file was extended by indicator-datetime $as_me 0.3.1, which was
183 generated by GNU Autoconf 2.68. Invocation command line was
184
185 CONFIG_FILES = $CONFIG_FILES
186@@ -14721,7 +14712,7 @@
187 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
188 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
189 ac_cs_version="\\
190-indicator-datetime config.status 0.3.0
191+indicator-datetime config.status 0.3.1
192 configured by $0, generated by GNU Autoconf 2.68,
193 with options \\"\$ac_cs_config\\"
194
195
196=== modified file 'configure.ac'
197--- configure.ac 2011-09-29 20:38:31 +0000
198+++ configure.ac 2011-10-13 18:44:23 +0000
199@@ -1,5 +1,5 @@
200 AC_INIT([indicator-datetime],
201- [0.3.0],
202+ [0.3.1],
203 [http://bugs.launchpad.net/indicator-datetime],
204 [indicator-datetime],
205 [http://launchpad.net/indicator-datetime])
206@@ -105,7 +105,6 @@
207
208 PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION
209 gtk+-3.0 >= $GTK3_REQUIRED_VERSION
210- unique-3.0
211 json-glib-1.0
212 libgnome-control-center
213 polkit-gobject-1)
214
215=== modified file 'data/datetime-dialog.ui'
216--- data/datetime-dialog.ui 2011-08-17 19:30:53 +0000
217+++ data/datetime-dialog.ui 2011-10-13 18:44:23 +0000
218@@ -13,7 +13,6 @@
219 <property name="default_width">300</property>
220 <property name="default_height">200</property>
221 <property name="destroy_with_parent">True</property>
222- <property name="icon_name">time-admin</property>
223 <child>
224 <object class="GtkVBox" id="vbox1">
225 <property name="visible">True</property>
226
227=== modified file 'debian/changelog'
228--- debian/changelog 2011-10-05 19:04:17 +0000
229+++ debian/changelog 2011-10-13 18:44:23 +0000
230@@ -1,3 +1,4 @@
231+<<<<<<< TREE
232 indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low
233
234 * debian/patches/lp_844741.patch
235@@ -6,6 +7,19 @@
236 -- Ken VanDine <ken.vandine@canonical.com> Wed, 05 Oct 2011 11:59:21 -0400
237
238 indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low
239+=======
240+indicator-datetime (0.3.1-0ubuntu1~ppa1) oneiric; urgency=low
241+
242+ * New upstream release.
243+ * Drop an unused icon (LP: #746176)
244+ * Fix showing a timezone that we're currently set to (LP: #833337)
245+ * Remove check for libunique as it's unused
246+ * debian/control: Drop libunique requirements
247+
248+ -- Ted Gould <ted@ubuntu.com> Thu, 13 Oct 2011 13:40:21 -0500
249+
250+indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low
251+>>>>>>> MERGE-SOURCE
252
253 [ Ken VanDine ]
254 * debian/control
255
256=== modified file 'debian/control'
257--- debian/control 2011-09-29 20:29:20 +0000
258+++ debian/control 2011-10-13 18:44:23 +0000
259@@ -14,7 +14,6 @@
260 libglib2.0-dev (>= 2.29.19),
261 libido-0.1-dev (>= 0.2.2),
262 libido3-0.1-dev (>= 0.2.90),
263- libunique-3.0-dev,
264 libgeoclue-dev (>= 0.12.0),
265 libecal1.2-dev (>= 2.30),
266 libical-dev (>= 0.44),
267@@ -22,7 +21,6 @@
268 libgtk-3-dev (>= 3.1.4),
269 libcairo2-dev (>= 1.10),
270 libjson-glib-dev,
271- libunique-dev,
272 libpolkit-gtk-1-dev,
273 libedataserver1.2-dev (>= 2.30),
274 libedataserverui-3.0-dev,
275
276=== modified file 'src/datetime-prefs.c'
277--- src/datetime-prefs.c 2011-09-09 09:47:20 +0000
278+++ src/datetime-prefs.c 2011-10-13 18:44:23 +0000
279@@ -32,7 +32,6 @@
280 #include <glib/gi18n-lib.h>
281 #include <gdk/gdkkeysyms.h>
282 #include <gtk/gtk.h>
283-#include <unique/unique.h>
284 #include <polkit/polkit.h>
285 #include <libgnome-control-center/cc-panel.h>
286
287
288=== modified file 'src/datetime-service.c'
289--- src/datetime-service.c 2011-09-29 20:38:31 +0000
290+++ src/datetime-service.c 2011-10-13 18:44:23 +0000
291@@ -581,8 +581,8 @@
292 offset = dbusmenu_menuitem_get_position (current_location, root)+1;
293 for (i = 0; i < len; i++) {
294 // Iterate over configured places and add any which aren't already listed
295- if (g_strcmp0(locations[i], current_timezone) != 0 &&
296- g_strcmp0(locations[i], geo_timezone) != 0) {
297+ if ((current_timezone == NULL || !g_str_has_prefix(locations[i], current_timezone)) &&
298+ (geo_timezone == NULL || !g_str_has_prefix(locations[i], geo_timezone))) {
299 g_debug("Adding timezone in update_timezones %s", locations[i]);
300 item = dbusmenu_menuitem_new();
301 dbusmenu_menuitem_property_set (item, DBUSMENU_MENUITEM_PROP_TYPE, TIMEZONE_MENUITEM_TYPE);

Subscribers

People subscribed via source and target branches

to all changes: