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

Proposed by Charles Kerr on 2012-04-04
Status: Merged
Merged at revision: 144
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/indicator-datetime/upstream
Merge into: lp:~ubuntu-desktop/indicator-datetime/ubuntu
Diff against target: 777 lines (+263/-171)
13 files modified
ChangeLog (+28/-0)
Makefile.am (+1/-35)
Makefile.am.coverage (+48/-0)
Makefile.in (+47/-41)
configure (+100/-64)
configure.ac (+4/-2)
data/Makefile.in (+0/-1)
debian/changelog (+10/-0)
m4/gcov.m4 (+13/-10)
src/Makefile.in (+0/-1)
src/datetime-prefs.c (+1/-8)
src/datetime-service.c (+11/-8)
tests/Makefile.in (+0/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-datetime/upstream
Reviewer Review Type Date Requested Status
Ken VanDine 2012-04-04 Pending
Review via email: mp+100886@code.launchpad.net

Description of the change

indicator-datetime (0.3.94-0ubuntu1~ppa1) precise; urgency=low

  * New upstream release.
    * Fix location timezone sorting issue.
    * Clicking the systems settings window shouldn't close the
      Locations dialog. (LP: #947315)
    * Add gcov targets to autotools build for code-coverage reporting.

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 2012-03-28 23:09:07 +0000
3+++ ChangeLog 2012-04-04 22:01:22 +0000
4@@ -1,5 +1,33 @@
5 # Generated by Makefile. Do not edit.
6
7+2012-04-04 Charles Kerr <charles.kerr@canonical.com>
8+
9+ 0.3.94
10+
11+2012-04-03 Charles Kerr <charles.kerr@canonical.com>
12+
13+ merge lp:~allanlesage/indicator-datetime/TDD to remove a dependency on gcovr, move gcov targets to their own makefile, and clean up .gcno files.
14+
15+2012-03-27 Allan LeSage <allanlesage@gmail.com>
16+
17+ Removed gcovr dependency, moved coverage targets to own makefile, cleaning up *.gcno.
18+
19+2012-04-02 Charles Kerr <charles.kerr@canonical.com>
20+
21+ merge lp:~charlesk/indicator-datetime/fiz-tz-offset to fix a timezone sorting issue reported by seb128 and diagnosed by desrt.
22+
23+2012-04-02 Charles Kerr <charles.kerr@canonical.com>
24+
25+ fix timezone sorting issue reported by seb128 and diagnosed by desrt
26+
27+2012-04-02 Charles Kerr <charles.kerr@canonical.com>
28+
29+ clicking the systems settings window shouldn't close the Locations dialog.
30+
31+2012-03-29 Charles Kerr <charles.kerr@canonical.com>
32+
33+ clicking the systems settings window shouldn't close the 'Locations' dialog.
34+
35 2012-03-28 Charles Kerr <charles.kerr@canonical.com>
36
37 0.3.93
38
39=== modified file 'Makefile.am'
40--- Makefile.am 2012-02-17 22:15:25 +0000
41+++ Makefile.am 2012-04-04 22:01:22 +0000
42@@ -36,38 +36,4 @@
43 echo Failed to generate AUTHORS: not a branch >&2; \
44 fi
45
46-
47-# Coverage targets
48-
49-.PHONY: clean-gcda
50-clean-gcda:
51- @echo Removing old coverage results
52- -find -name '*.gcda' -print | xargs -r rm
53-
54-.PHONY: coverage-html generate-coverage-html clean-coverage-html
55-coverage-html: clean-gcda
56- -$(MAKE) $(AM_MAKEFLAGS) -k check
57- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
58-
59-generate-coverage-html:
60- @echo Collecting coverage data
61- $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
62- LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
63-
64-clean-coverage-html: clean-gcda
65- -$(LCOV) --directory $(top_builddir) -z
66- -rm -rf coverage.info coveragereport
67-
68-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
69-coverage-xml: clean-gcda
70- -$(MAKE) $(AM_MAKEFLAGS) -k check
71- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
72-
73-generate-coverage-xml:
74- @echo Generating coverage XML report
75- $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
76-
77-clean-coverage-xml: clean-gcda
78- -rm -rf $(top_builddir)/coverage.xml
79-
80-clean-local: clean-coverage-html clean-coverage-xml
81+include $(top_srcdir)/Makefile.am.coverage
82
83=== added file 'Makefile.am.coverage'
84--- Makefile.am.coverage 1970-01-01 00:00:00 +0000
85+++ Makefile.am.coverage 2012-04-04 22:01:22 +0000
86@@ -0,0 +1,48 @@
87+
88+# Coverage targets
89+
90+.PHONY: clean-gcno clean-gcda \
91+ coverage-html generate-coverage-html clean-coverage-html \
92+ coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
93+
94+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
95+
96+if HAVE_GCOV
97+
98+clean-gcno:
99+ @echo Removing old coverage instrumentation
100+ -find -name '*.gcno' -print | xargs -r rm
101+
102+clean-gcda:
103+ @echo Removing old coverage results
104+ -find -name '*.gcda' -print | xargs -r rm
105+
106+coverage-html: clean-gcda
107+ -$(MAKE) $(AM_MAKEFLAGS) -k check
108+ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
109+
110+generate-coverage-html:
111+ @echo Collecting coverage data
112+ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
113+ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
114+
115+clean-coverage-html: clean-gcda
116+ -$(LCOV) --directory $(top_builddir) -z
117+ -rm -rf coverage.info coveragereport
118+
119+if HAVE_GCOVR
120+
121+coverage-gcovr: clean-gcda
122+ -$(MAKE) $(AM_MAKEFLAGS) -k check
123+ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
124+
125+generate-coverage-gcovr:
126+ @echo Generating coverage GCOVR report
127+ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
128+
129+clean-coverage-gcovr: clean-gcda
130+ -rm -rf $(top_builddir)/coverage.xml
131+
132+endif # HAVE_GCOVR
133+
134+endif # HAVE_GCOV
135
136=== modified file 'Makefile.in'
137--- Makefile.in 2012-02-17 22:18:45 +0000
138+++ Makefile.in 2012-04-04 22:01:22 +0000
139@@ -14,6 +14,8 @@
140 # PARTICULAR PURPOSE.
141
142 @SET_MAKE@
143+
144+# Coverage targets
145 VPATH = @srcdir@
146 pkgdatadir = $(datadir)/@PACKAGE@
147 pkgincludedir = $(includedir)/@PACKAGE@
148@@ -33,13 +35,14 @@
149 POST_UNINSTALL = :
150 build_triplet = @build@
151 host_triplet = @host@
152-subdir = .
153 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
154 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
155- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
156- build-aux/compile build-aux/config.guess build-aux/config.sub \
157- build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
158- build-aux/missing build-aux/mkinstalldirs
159+ $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \
160+ AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \
161+ build-aux/config.guess build-aux/config.sub build-aux/depcomp \
162+ build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
163+ build-aux/mkinstalldirs
164+subdir = .
165 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
166 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
167 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
168@@ -133,7 +136,6 @@
169 CCPANELDIR = @CCPANELDIR@
170 CFLAGS = @CFLAGS@
171 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
172-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
173 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
174 CPP = @CPP@
175 CPPFLAGS = @CPPFLAGS@
176@@ -304,7 +306,7 @@
177 .SUFFIXES:
178 am--refresh: Makefile
179 @:
180-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
181+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps)
182 @for dep in $?; do \
183 case '$(am__configure_deps)' in \
184 *$$dep*) \
185@@ -327,6 +329,7 @@
186 echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
187 cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
188 esac;
189+$(top_srcdir)/Makefile.am.coverage:
190
191 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
192 $(SHELL) ./config.status --recheck
193@@ -841,40 +844,43 @@
194 echo Failed to generate AUTHORS: not a branch >&2; \
195 fi
196
197-# Coverage targets
198-
199-.PHONY: clean-gcda
200-clean-gcda:
201- @echo Removing old coverage results
202- -find -name '*.gcda' -print | xargs -r rm
203-
204-.PHONY: coverage-html generate-coverage-html clean-coverage-html
205-coverage-html: clean-gcda
206- -$(MAKE) $(AM_MAKEFLAGS) -k check
207- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
208-
209-generate-coverage-html:
210- @echo Collecting coverage data
211- $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
212- LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
213-
214-clean-coverage-html: clean-gcda
215- -$(LCOV) --directory $(top_builddir) -z
216- -rm -rf coverage.info coveragereport
217-
218-.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
219-coverage-xml: clean-gcda
220- -$(MAKE) $(AM_MAKEFLAGS) -k check
221- $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
222-
223-generate-coverage-xml:
224- @echo Generating coverage XML report
225- $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
226-
227-clean-coverage-xml: clean-gcda
228- -rm -rf $(top_builddir)/coverage.xml
229-
230-clean-local: clean-coverage-html clean-coverage-xml
231+.PHONY: clean-gcno clean-gcda \
232+ coverage-html generate-coverage-html clean-coverage-html \
233+ coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
234+
235+clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
236+
237+@HAVE_GCOV_TRUE@clean-gcno:
238+@HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation
239+@HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm
240+
241+@HAVE_GCOV_TRUE@clean-gcda:
242+@HAVE_GCOV_TRUE@ @echo Removing old coverage results
243+@HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm
244+
245+@HAVE_GCOV_TRUE@coverage-html: clean-gcda
246+@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check
247+@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
248+
249+@HAVE_GCOV_TRUE@generate-coverage-html:
250+@HAVE_GCOV_TRUE@ @echo Collecting coverage data
251+@HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
252+@HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
253+
254+@HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda
255+@HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z
256+@HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport
257+
258+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda
259+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check
260+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
261+
262+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr:
263+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report
264+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
265+
266+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda
267+@HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml
268
269 # Tell versions [3.59,3.63) of GNU make to not export all variables.
270 # Otherwise a system limit (for SysV at least) may be exceeded.
271
272=== modified file 'configure'
273--- configure 2012-03-28 23:09:07 +0000
274+++ configure 2012-04-04 22:01:22 +0000
275@@ -1,6 +1,6 @@
276 #! /bin/sh
277 # Guess values for system-dependent variables and create Makefiles.
278-# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.93.
279+# Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.94.
280 #
281 # Report bugs to <http://bugs.launchpad.net/indicator-datetime>.
282 #
283@@ -572,8 +572,8 @@
284 # Identity of this package.
285 PACKAGE_NAME='indicator-datetime'
286 PACKAGE_TARNAME='indicator-datetime'
287-PACKAGE_VERSION='0.3.93'
288-PACKAGE_STRING='indicator-datetime 0.3.93'
289+PACKAGE_VERSION='0.3.94'
290+PACKAGE_STRING='indicator-datetime 0.3.94'
291 PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime'
292 PACKAGE_URL='http://launchpad.net/indicator-datetime'
293
294@@ -672,8 +672,13 @@
295 INDICATORICONSDIR
296 INDICATORDIR
297 COVERAGE_LDFLAGS
298-COVERAGE_CXXFLAGS
299 COVERAGE_CFLAGS
300+HAVE_GCOVR_FALSE
301+HAVE_GCOVR_TRUE
302+HAVE_LCOV_FALSE
303+HAVE_LCOV_TRUE
304+HAVE_GCOV_FALSE
305+HAVE_GCOV_TRUE
306 GCOVR
307 GENHTML
308 LCOV
309@@ -1395,7 +1400,7 @@
310 # Omit some internal or obsolete options to make the list less imposing.
311 # This message is too long to be a string in the A/UX 3.1 sh.
312 cat <<_ACEOF
313-\`configure' configures indicator-datetime 0.3.93 to adapt to many kinds of systems.
314+\`configure' configures indicator-datetime 0.3.94 to adapt to many kinds of systems.
315
316 Usage: $0 [OPTION]... [VAR=VALUE]...
317
318@@ -1466,7 +1471,7 @@
319
320 if test -n "$ac_init_help"; then
321 case $ac_init_help in
322- short | recursive ) echo "Configuration of indicator-datetime 0.3.93:";;
323+ short | recursive ) echo "Configuration of indicator-datetime 0.3.94:";;
324 esac
325 cat <<\_ACEOF
326
327@@ -1600,7 +1605,7 @@
328 test -n "$ac_init_help" && exit $ac_status
329 if $ac_init_version; then
330 cat <<\_ACEOF
331-indicator-datetime configure 0.3.93
332+indicator-datetime configure 0.3.94
333 generated by GNU Autoconf 2.68
334
335 Copyright (C) 2010 Free Software Foundation, Inc.
336@@ -1971,7 +1976,7 @@
337 This file contains any messages produced by compilers while
338 running configure, to aid debugging if configure makes a mistake.
339
340-It was created by indicator-datetime $as_me 0.3.93, which was
341+It was created by indicator-datetime $as_me 0.3.94, which was
342 generated by GNU Autoconf 2.68. Invocation command line was
343
344 $ $0 $@
345@@ -2795,7 +2800,7 @@
346
347 # Define the identity of the package.
348 PACKAGE='indicator-datetime'
349- VERSION='0.3.93'
350+ VERSION='0.3.94'
351
352
353 cat >>confdefs.h <<_ACEOF
354@@ -12864,13 +12869,7 @@
355 # AC_TDD_GCOV
356
357
358-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5
359-$as_echo_n "checking whether code coverage tools are available... " >&6; }
360-if ${ac_cv_check_gcov+:} false; then :
361- $as_echo_n "(cached) " >&6
362-else
363-
364-# Check whether --enable-gcov was given.
365+ # Check whether --enable-gcov was given.
366 if test "${enable_gcov+set}" = set; then :
367 enableval=$enable_gcov; use_gcov=$enableval
368 else
369@@ -13006,43 +13005,6 @@
370 fi
371
372
373- # Extract the first word of "gcovr", so it can be a program name with args.
374-set dummy gcovr; ac_word=$2
375-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
376-$as_echo_n "checking for $ac_word... " >&6; }
377-if ${ac_cv_prog_GCOVR+:} false; then :
378- $as_echo_n "(cached) " >&6
379-else
380- if test -n "$GCOVR"; then
381- ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
382-else
383-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
384-for as_dir in $PATH
385-do
386- IFS=$as_save_IFS
387- test -z "$as_dir" && as_dir=.
388- for ac_exec_ext in '' $ac_executable_extensions; do
389- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
390- ac_cv_prog_GCOVR="gcovr"
391- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
392- break 2
393- fi
394-done
395- done
396-IFS=$as_save_IFS
397-
398-fi
399-fi
400-GCOVR=$ac_cv_prog_GCOVR
401-if test -n "$GCOVR"; then
402- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
403-$as_echo "$GCOVR" >&6; }
404-else
405- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
406-$as_echo "no" >&6; }
407-fi
408-
409-
410
411 if test "$LCOV"; then
412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5
413@@ -13079,10 +13041,8 @@
414 as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5
415 fi
416
417- if test -z "$GCOVR"; then
418- as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5
419- fi
420-
421+ ac_cv_check_gcov=yes
422+ ac_cv_check_lcov=yes
423
424 # Remove all optimization flags from CFLAGS
425
426@@ -13094,11 +13054,75 @@
427 COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
428 COVERAGE_LDFLAGS="-lgcov"
429
430-fi
431-
432-fi
433-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5
434-$as_echo "$ac_cv_check_gcov" >&6; }
435+ # Check availability of gcovr
436+ # Extract the first word of "gcovr", so it can be a program name with args.
437+set dummy gcovr; ac_word=$2
438+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
439+$as_echo_n "checking for $ac_word... " >&6; }
440+if ${ac_cv_prog_GCOVR+:} false; then :
441+ $as_echo_n "(cached) " >&6
442+else
443+ if test -n "$GCOVR"; then
444+ ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test.
445+else
446+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
447+for as_dir in $PATH
448+do
449+ IFS=$as_save_IFS
450+ test -z "$as_dir" && as_dir=.
451+ for ac_exec_ext in '' $ac_executable_extensions; do
452+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
453+ ac_cv_prog_GCOVR="gcovr"
454+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
455+ break 2
456+ fi
457+done
458+ done
459+IFS=$as_save_IFS
460+
461+fi
462+fi
463+GCOVR=$ac_cv_prog_GCOVR
464+if test -n "$GCOVR"; then
465+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5
466+$as_echo "$GCOVR" >&6; }
467+else
468+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
469+$as_echo "no" >&6; }
470+fi
471+
472+
473+ if test -z "$GCOVR"; then
474+ ac_cv_check_gcovr=no
475+ else
476+ ac_cv_check_gcovr=yes
477+ fi
478+
479+fi
480+
481+ if test "x$ac_cv_check_gcov" = xyes; then
482+ HAVE_GCOV_TRUE=
483+ HAVE_GCOV_FALSE='#'
484+else
485+ HAVE_GCOV_TRUE='#'
486+ HAVE_GCOV_FALSE=
487+fi
488+
489+ if test "x$ac_cv_check_lcov" = xyes; then
490+ HAVE_LCOV_TRUE=
491+ HAVE_LCOV_FALSE='#'
492+else
493+ HAVE_LCOV_TRUE='#'
494+ HAVE_LCOV_FALSE=
495+fi
496+
497+ if test "x$ac_cv_check_gcovr" = xyes; then
498+ HAVE_GCOVR_TRUE=
499+ HAVE_GCOVR_FALSE='#'
500+else
501+ HAVE_GCOVR_TRUE='#'
502+ HAVE_GCOVR_FALSE=
503+fi
504
505
506
507@@ -14630,6 +14654,18 @@
508 as_fn_error $? "conditional \"BUILD_CCPANEL\" was never defined.
509 Usually this means the macro was only invoked conditionally." "$LINENO" 5
510 fi
511+if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then
512+ as_fn_error $? "conditional \"HAVE_GCOV\" was never defined.
513+Usually this means the macro was only invoked conditionally." "$LINENO" 5
514+fi
515+if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then
516+ as_fn_error $? "conditional \"HAVE_LCOV\" was never defined.
517+Usually this means the macro was only invoked conditionally." "$LINENO" 5
518+fi
519+if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then
520+ as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined.
521+Usually this means the macro was only invoked conditionally." "$LINENO" 5
522+fi
523
524 ac_config_commands="$ac_config_commands po/stamp-it"
525
526@@ -15043,7 +15079,7 @@
527 # report actual input values of CONFIG_FILES etc. instead of their
528 # values after options handling.
529 ac_log="
530-This file was extended by indicator-datetime $as_me 0.3.93, which was
531+This file was extended by indicator-datetime $as_me 0.3.94, which was
532 generated by GNU Autoconf 2.68. Invocation command line was
533
534 CONFIG_FILES = $CONFIG_FILES
535@@ -15110,7 +15146,7 @@
536 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
537 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
538 ac_cs_version="\\
539-indicator-datetime config.status 0.3.93
540+indicator-datetime config.status 0.3.94
541 configured by $0, generated by GNU Autoconf 2.68,
542 with options \\"\$ac_cs_config\\"
543
544
545=== modified file 'configure.ac'
546--- configure.ac 2012-03-28 23:09:07 +0000
547+++ configure.ac 2012-04-04 22:01:22 +0000
548@@ -1,5 +1,5 @@
549 AC_INIT([indicator-datetime],
550- [0.3.93],
551+ [0.3.94],
552 [http://bugs.launchpad.net/indicator-datetime],
553 [indicator-datetime],
554 [http://launchpad.net/indicator-datetime])
555@@ -145,8 +145,10 @@
556
557 m4_include([m4/gcov.m4])
558 AC_TDD_GCOV
559+AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
560+AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
561+AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
562 AC_SUBST(COVERAGE_CFLAGS)
563-AC_SUBST(COVERAGE_CXXFLAGS)
564 AC_SUBST(COVERAGE_LDFLAGS)
565
566 ###########################
567
568=== modified file 'data/Makefile.in'
569--- data/Makefile.in 2012-02-17 22:18:45 +0000
570+++ data/Makefile.in 2012-04-04 22:01:22 +0000
571@@ -109,7 +109,6 @@
572 CCPANELDIR = @CCPANELDIR@
573 CFLAGS = @CFLAGS@
574 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
575-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
576 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
577 CPP = @CPP@
578 CPPFLAGS = @CPPFLAGS@
579
580=== modified file 'debian/changelog'
581--- debian/changelog 2012-03-29 15:44:39 +0000
582+++ debian/changelog 2012-04-04 22:01:22 +0000
583@@ -1,3 +1,13 @@
584+indicator-datetime (0.3.94-0ubuntu1~ppa1) precise; urgency=low
585+
586+ * New upstream release.
587+ * Fix location timezone sorting issue.
588+ * Clicking the systems settings window shouldn't close the
589+ Locations dialog. (LP: #947315)
590+ * Add gcov targets to autotools build for code-coverage reporting.
591+
592+ -- Charles Kerr <charles.kerr@canonical.com> Wed, 04 Apr 2012 16:53:20 -0500
593+
594 indicator-datetime (0.3.93-0ubuntu1) precise; urgency=low
595
596 * New upstream release.
597
598=== modified file 'm4/gcov.m4'
599--- m4/gcov.m4 2011-12-07 00:43:35 +0000
600+++ m4/gcov.m4 2012-04-04 22:01:22 +0000
601@@ -5,11 +5,10 @@
602 # * gcovr
603 #
604 # Sets ac_cv_check_gcov to yes if tooling is present
605-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
606+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
607 AC_DEFUN([AC_TDD_GCOV],
608-[AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov,
609 [
610-AC_ARG_ENABLE(gcov,
611+ AC_ARG_ENABLE(gcov,
612 AS_HELP_STRING([--enable-gcov],
613 [enable coverage testing with gcov]),
614 [use_gcov=$enableval], [use_gcov=no])
615@@ -34,7 +33,6 @@
616 lcov_version_list="1.6 1.7 1.8 1.9"
617 AC_CHECK_PROG(LCOV, lcov, lcov)
618 AC_CHECK_PROG(GENHTML, genhtml, genhtml)
619- AC_CHECK_PROG(GCOVR, gcovr, gcovr)
620
621 if test "$LCOV"; then
622 AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
623@@ -63,10 +61,8 @@
624 AC_MSG_ERROR([Could not find genhtml from the lcov package])
625 fi
626
627- if test -z "$GCOVR"; then
628- AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr])
629- fi
630-
631+ ac_cv_check_gcov=yes
632+ ac_cv_check_lcov=yes
633
634 # Remove all optimization flags from CFLAGS
635 changequote({,})
636@@ -78,6 +74,13 @@
637 COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
638 COVERAGE_LDFLAGS="-lgcov"
639
640+ # Check availability of gcovr
641+ AC_CHECK_PROG(GCOVR, gcovr, gcovr)
642+ if test -z "$GCOVR"; then
643+ ac_cv_check_gcovr=no
644+ else
645+ ac_cv_check_gcovr=yes
646+ fi
647+
648 fi
649-])]) # AC_TDD_GCOV
650-
651+]) # AC_TDD_GCOV
652
653=== modified file 'src/Makefile.in'
654--- src/Makefile.in 2012-02-17 22:18:45 +0000
655+++ src/Makefile.in 2012-04-04 22:01:22 +0000
656@@ -172,7 +172,6 @@
657 CCPANELDIR = @CCPANELDIR@
658 CFLAGS = @CFLAGS@
659 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
660-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
661 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
662 CPP = @CPP@
663 CPPFLAGS = @CPPFLAGS@
664
665=== modified file 'src/datetime-prefs.c'
666--- src/datetime-prefs.c 2012-03-28 06:14:07 +0000
667+++ src/datetime-prefs.c 2012-04-04 22:01:22 +0000
668@@ -577,21 +577,14 @@
669 }
670
671 static void
672-hide_locations (IndicatorDatetimePanel * self)
673-{
674- if (self->priv->loc_dlg != NULL)
675- gtk_widget_destroy (self->priv->loc_dlg);
676-}
677-
678-static void
679 show_locations (IndicatorDatetimePanel * self)
680 {
681 if (self->priv->loc_dlg == NULL) {
682 self->priv->loc_dlg = datetime_setup_locations_dialog (self->priv->tzmap);
683 GtkWidget * dlg = gtk_widget_get_toplevel (GTK_WIDGET (self));
684+ gtk_window_set_type_hint (GTK_WINDOW(self->priv->loc_dlg), GDK_WINDOW_TYPE_HINT_DIALOG);
685 gtk_window_set_transient_for (GTK_WINDOW (self->priv->loc_dlg), GTK_WINDOW (dlg));
686 g_signal_connect (self->priv->loc_dlg, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->priv->loc_dlg);
687- g_signal_connect_swapped (dlg, "focus-in-event", G_CALLBACK (hide_locations), self);
688 gtk_widget_show_all (self->priv->loc_dlg);
689 }
690 else {
691
692=== modified file 'src/datetime-service.c'
693--- src/datetime-service.c 2012-03-28 23:09:07 +0000
694+++ src/datetime-service.c 2012-04-04 22:01:22 +0000
695@@ -108,7 +108,7 @@
696 };
697
698 /**
699- * A temp struct used by update_location_menu_items() for pruning duplicates.
700+ * A temp struct used by update_location_menu_items() for pruning duplicates and sorting.
701 */
702 struct TimeLocation
703 {
704@@ -124,14 +124,16 @@
705 g_free (loc);
706 }
707 static struct TimeLocation*
708-time_location_new (const char * zone, const char * name)
709+time_location_new (const char * zone, const char * name, time_t now)
710 {
711 struct TimeLocation * loc = g_new (struct TimeLocation, 1);
712 GTimeZone * tz = g_time_zone_new (zone);
713- loc->offset = g_time_zone_get_offset (tz, 0);
714+ gint interval = g_time_zone_find_interval (tz, G_TIME_TYPE_UNIVERSAL, now);
715+ loc->offset = g_time_zone_get_offset (tz, interval);
716 loc->zone = g_strdup (zone);
717 loc->name = g_strdup (name);
718 g_time_zone_unref (tz);
719+ g_debug ("%s zone '%s' name '%s' offset is %d", G_STRLOC, zone, name, (int)loc->offset);
720 return loc;
721 }
722 static int
723@@ -146,9 +148,9 @@
724 return ret;
725 }
726 static GSList*
727-locations_add (GSList * locations, const char * zone, const char * name)
728+locations_add (GSList * locations, const char * zone, const char * name, time_t now)
729 {
730- struct TimeLocation * loc = time_location_new (zone, name);
731+ struct TimeLocation * loc = time_location_new (zone, name, now);
732
733 if (g_slist_find_custom (locations, loc, (GCompareFunc)time_location_compare) == NULL) {
734 g_debug ("%s Adding zone '%s', name '%s'", G_STRLOC, zone, name);
735@@ -182,18 +184,19 @@
736 ***/
737
738 GSList * locations = NULL;
739+ const time_t now = time(NULL);
740
741 /* maybe add geo_timezone */
742 if (geo_timezone != NULL) {
743 gchar * name = get_current_zone_name (geo_timezone);
744- locations = locations_add (locations, geo_timezone, name);
745+ locations = locations_add (locations, geo_timezone, name, now);
746 g_free (name);
747 }
748
749 /* maybe add current_timezone */
750 if (current_timezone != NULL) {
751 gchar * name = get_current_zone_name (current_timezone);
752- locations = locations_add (locations, current_timezone, name);
753+ locations = locations_add (locations, current_timezone, name, now);
754 g_free (name);
755 }
756
757@@ -207,7 +210,7 @@
758 gchar * zone;
759 gchar * name;
760 split_settings_location (user_locations[i], &zone, &name);
761- locations = locations_add (locations, zone, name);
762+ locations = locations_add (locations, zone, name, now);
763 g_free (name);
764 g_free (zone);
765 }
766
767=== modified file 'tests/Makefile.in'
768--- tests/Makefile.in 2012-02-17 22:18:45 +0000
769+++ tests/Makefile.in 2012-04-04 22:01:22 +0000
770@@ -72,7 +72,6 @@
771 CCPANELDIR = @CCPANELDIR@
772 CFLAGS = @CFLAGS@
773 COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
774-COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@
775 COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
776 CPP = @CPP@
777 CPPFLAGS = @CPPFLAGS@

Subscribers

People subscribed via source and target branches