Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-datetime/upstream into lp:~ubuntu-desktop/indicator-datetime/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Charles Kerr
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 | ||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+100886@code.launchpad.net |
Commit message
Description of the change
indicator-datetime (0.3.94-
* 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 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
6 | 2 | 2 | ||
7 | 3 | 2012-04-04 Charles Kerr <charles.kerr@canonical.com> | ||
8 | 4 | |||
9 | 5 | 0.3.94 | ||
10 | 6 | |||
11 | 7 | 2012-04-03 Charles Kerr <charles.kerr@canonical.com> | ||
12 | 8 | |||
13 | 9 | 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 | 10 | |||
15 | 11 | 2012-03-27 Allan LeSage <allanlesage@gmail.com> | ||
16 | 12 | |||
17 | 13 | Removed gcovr dependency, moved coverage targets to own makefile, cleaning up *.gcno. | ||
18 | 14 | |||
19 | 15 | 2012-04-02 Charles Kerr <charles.kerr@canonical.com> | ||
20 | 16 | |||
21 | 17 | merge lp:~charlesk/indicator-datetime/fiz-tz-offset to fix a timezone sorting issue reported by seb128 and diagnosed by desrt. | ||
22 | 18 | |||
23 | 19 | 2012-04-02 Charles Kerr <charles.kerr@canonical.com> | ||
24 | 20 | |||
25 | 21 | fix timezone sorting issue reported by seb128 and diagnosed by desrt | ||
26 | 22 | |||
27 | 23 | 2012-04-02 Charles Kerr <charles.kerr@canonical.com> | ||
28 | 24 | |||
29 | 25 | clicking the systems settings window shouldn't close the Locations dialog. | ||
30 | 26 | |||
31 | 27 | 2012-03-29 Charles Kerr <charles.kerr@canonical.com> | ||
32 | 28 | |||
33 | 29 | clicking the systems settings window shouldn't close the 'Locations' dialog. | ||
34 | 30 | |||
35 | 3 | 2012-03-28 Charles Kerr <charles.kerr@canonical.com> | 31 | 2012-03-28 Charles Kerr <charles.kerr@canonical.com> |
36 | 4 | 32 | ||
37 | 5 | 0.3.93 | 33 | 0.3.93 |
38 | 6 | 34 | ||
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 | 36 | echo Failed to generate AUTHORS: not a branch >&2; \ | 36 | echo Failed to generate AUTHORS: not a branch >&2; \ |
44 | 37 | fi | 37 | fi |
45 | 38 | 38 | ||
81 | 39 | 39 | include $(top_srcdir)/Makefile.am.coverage | |
47 | 40 | # Coverage targets | ||
48 | 41 | |||
49 | 42 | .PHONY: clean-gcda | ||
50 | 43 | clean-gcda: | ||
51 | 44 | @echo Removing old coverage results | ||
52 | 45 | -find -name '*.gcda' -print | xargs -r rm | ||
53 | 46 | |||
54 | 47 | .PHONY: coverage-html generate-coverage-html clean-coverage-html | ||
55 | 48 | coverage-html: clean-gcda | ||
56 | 49 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
57 | 50 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
58 | 51 | |||
59 | 52 | generate-coverage-html: | ||
60 | 53 | @echo Collecting coverage data | ||
61 | 54 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
62 | 55 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
63 | 56 | |||
64 | 57 | clean-coverage-html: clean-gcda | ||
65 | 58 | -$(LCOV) --directory $(top_builddir) -z | ||
66 | 59 | -rm -rf coverage.info coveragereport | ||
67 | 60 | |||
68 | 61 | .PHONY: coverage-xml generate-coverage-xml clean-coverage-xml | ||
69 | 62 | coverage-xml: clean-gcda | ||
70 | 63 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
71 | 64 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml | ||
72 | 65 | |||
73 | 66 | generate-coverage-xml: | ||
74 | 67 | @echo Generating coverage XML report | ||
75 | 68 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
76 | 69 | |||
77 | 70 | clean-coverage-xml: clean-gcda | ||
78 | 71 | -rm -rf $(top_builddir)/coverage.xml | ||
79 | 72 | |||
80 | 73 | clean-local: clean-coverage-html clean-coverage-xml | ||
82 | 74 | 40 | ||
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 | 1 | |||
88 | 2 | # Coverage targets | ||
89 | 3 | |||
90 | 4 | .PHONY: clean-gcno clean-gcda \ | ||
91 | 5 | coverage-html generate-coverage-html clean-coverage-html \ | ||
92 | 6 | coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr | ||
93 | 7 | |||
94 | 8 | clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr | ||
95 | 9 | |||
96 | 10 | if HAVE_GCOV | ||
97 | 11 | |||
98 | 12 | clean-gcno: | ||
99 | 13 | @echo Removing old coverage instrumentation | ||
100 | 14 | -find -name '*.gcno' -print | xargs -r rm | ||
101 | 15 | |||
102 | 16 | clean-gcda: | ||
103 | 17 | @echo Removing old coverage results | ||
104 | 18 | -find -name '*.gcda' -print | xargs -r rm | ||
105 | 19 | |||
106 | 20 | coverage-html: clean-gcda | ||
107 | 21 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
108 | 22 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | ||
109 | 23 | |||
110 | 24 | generate-coverage-html: | ||
111 | 25 | @echo Collecting coverage data | ||
112 | 26 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | ||
113 | 27 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | ||
114 | 28 | |||
115 | 29 | clean-coverage-html: clean-gcda | ||
116 | 30 | -$(LCOV) --directory $(top_builddir) -z | ||
117 | 31 | -rm -rf coverage.info coveragereport | ||
118 | 32 | |||
119 | 33 | if HAVE_GCOVR | ||
120 | 34 | |||
121 | 35 | coverage-gcovr: clean-gcda | ||
122 | 36 | -$(MAKE) $(AM_MAKEFLAGS) -k check | ||
123 | 37 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr | ||
124 | 38 | |||
125 | 39 | generate-coverage-gcovr: | ||
126 | 40 | @echo Generating coverage GCOVR report | ||
127 | 41 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | ||
128 | 42 | |||
129 | 43 | clean-coverage-gcovr: clean-gcda | ||
130 | 44 | -rm -rf $(top_builddir)/coverage.xml | ||
131 | 45 | |||
132 | 46 | endif # HAVE_GCOVR | ||
133 | 47 | |||
134 | 48 | endif # HAVE_GCOV | ||
135 | 0 | 49 | ||
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 | 14 | # PARTICULAR PURPOSE. | 14 | # PARTICULAR PURPOSE. |
141 | 15 | 15 | ||
142 | 16 | @SET_MAKE@ | 16 | @SET_MAKE@ |
143 | 17 | |||
144 | 18 | # Coverage targets | ||
145 | 17 | VPATH = @srcdir@ | 19 | VPATH = @srcdir@ |
146 | 18 | pkgdatadir = $(datadir)/@PACKAGE@ | 20 | pkgdatadir = $(datadir)/@PACKAGE@ |
147 | 19 | pkgincludedir = $(includedir)/@PACKAGE@ | 21 | pkgincludedir = $(includedir)/@PACKAGE@ |
148 | @@ -33,13 +35,14 @@ | |||
149 | 33 | POST_UNINSTALL = : | 35 | POST_UNINSTALL = : |
150 | 34 | build_triplet = @build@ | 36 | build_triplet = @build@ |
151 | 35 | host_triplet = @host@ | 37 | host_triplet = @host@ |
152 | 36 | subdir = . | ||
153 | 37 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | 38 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
154 | 38 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 39 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
159 | 39 | $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ | 40 | $(top_srcdir)/Makefile.am.coverage $(top_srcdir)/configure \ |
160 | 40 | build-aux/compile build-aux/config.guess build-aux/config.sub \ | 41 | AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \ |
161 | 41 | build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ | 42 | build-aux/config.guess build-aux/config.sub build-aux/depcomp \ |
162 | 42 | build-aux/missing build-aux/mkinstalldirs | 43 | build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ |
163 | 44 | build-aux/mkinstalldirs | ||
164 | 45 | subdir = . | ||
165 | 43 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 46 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
166 | 44 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ | 47 | am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
167 | 45 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ | 48 | $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
168 | @@ -133,7 +136,6 @@ | |||
169 | 133 | CCPANELDIR = @CCPANELDIR@ | 136 | CCPANELDIR = @CCPANELDIR@ |
170 | 134 | CFLAGS = @CFLAGS@ | 137 | CFLAGS = @CFLAGS@ |
171 | 135 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | 138 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
172 | 136 | COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ | ||
173 | 137 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | 139 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
174 | 138 | CPP = @CPP@ | 140 | CPP = @CPP@ |
175 | 139 | CPPFLAGS = @CPPFLAGS@ | 141 | CPPFLAGS = @CPPFLAGS@ |
176 | @@ -304,7 +306,7 @@ | |||
177 | 304 | .SUFFIXES: | 306 | .SUFFIXES: |
178 | 305 | am--refresh: Makefile | 307 | am--refresh: Makefile |
179 | 306 | @: | 308 | @: |
181 | 307 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 309 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.coverage $(am__configure_deps) |
182 | 308 | @for dep in $?; do \ | 310 | @for dep in $?; do \ |
183 | 309 | case '$(am__configure_deps)' in \ | 311 | case '$(am__configure_deps)' in \ |
184 | 310 | *$$dep*) \ | 312 | *$$dep*) \ |
185 | @@ -327,6 +329,7 @@ | |||
186 | 327 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ | 329 | echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
187 | 328 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ | 330 | cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
188 | 329 | esac; | 331 | esac; |
189 | 332 | $(top_srcdir)/Makefile.am.coverage: | ||
190 | 330 | 333 | ||
191 | 331 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 334 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
192 | 332 | $(SHELL) ./config.status --recheck | 335 | $(SHELL) ./config.status --recheck |
193 | @@ -841,40 +844,43 @@ | |||
194 | 841 | echo Failed to generate AUTHORS: not a branch >&2; \ | 844 | echo Failed to generate AUTHORS: not a branch >&2; \ |
195 | 842 | fi | 845 | fi |
196 | 843 | 846 | ||
231 | 844 | # Coverage targets | 847 | .PHONY: clean-gcno clean-gcda \ |
232 | 845 | 848 | coverage-html generate-coverage-html clean-coverage-html \ | |
233 | 846 | .PHONY: clean-gcda | 849 | coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr |
234 | 847 | clean-gcda: | 850 | |
235 | 848 | @echo Removing old coverage results | 851 | clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr |
236 | 849 | -find -name '*.gcda' -print | xargs -r rm | 852 | |
237 | 850 | 853 | @HAVE_GCOV_TRUE@clean-gcno: | |
238 | 851 | .PHONY: coverage-html generate-coverage-html clean-coverage-html | 854 | @HAVE_GCOV_TRUE@ @echo Removing old coverage instrumentation |
239 | 852 | coverage-html: clean-gcda | 855 | @HAVE_GCOV_TRUE@ -find -name '*.gcno' -print | xargs -r rm |
240 | 853 | -$(MAKE) $(AM_MAKEFLAGS) -k check | 856 | |
241 | 854 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | 857 | @HAVE_GCOV_TRUE@clean-gcda: |
242 | 855 | 858 | @HAVE_GCOV_TRUE@ @echo Removing old coverage results | |
243 | 856 | generate-coverage-html: | 859 | @HAVE_GCOV_TRUE@ -find -name '*.gcda' -print | xargs -r rm |
244 | 857 | @echo Collecting coverage data | 860 | |
245 | 858 | $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | 861 | @HAVE_GCOV_TRUE@coverage-html: clean-gcda |
246 | 859 | LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info | 862 | @HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check |
247 | 860 | 863 | @HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html | |
248 | 861 | clean-coverage-html: clean-gcda | 864 | |
249 | 862 | -$(LCOV) --directory $(top_builddir) -z | 865 | @HAVE_GCOV_TRUE@generate-coverage-html: |
250 | 863 | -rm -rf coverage.info coveragereport | 866 | @HAVE_GCOV_TRUE@ @echo Collecting coverage data |
251 | 864 | 867 | @HAVE_GCOV_TRUE@ $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool | |
252 | 865 | .PHONY: coverage-xml generate-coverage-xml clean-coverage-xml | 868 | @HAVE_GCOV_TRUE@ LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info |
253 | 866 | coverage-xml: clean-gcda | 869 | |
254 | 867 | -$(MAKE) $(AM_MAKEFLAGS) -k check | 870 | @HAVE_GCOV_TRUE@clean-coverage-html: clean-gcda |
255 | 868 | $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml | 871 | @HAVE_GCOV_TRUE@ -$(LCOV) --directory $(top_builddir) -z |
256 | 869 | 872 | @HAVE_GCOV_TRUE@ -rm -rf coverage.info coveragereport | |
257 | 870 | generate-coverage-xml: | 873 | |
258 | 871 | @echo Generating coverage XML report | 874 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@coverage-gcovr: clean-gcda |
259 | 872 | $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml | 875 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -$(MAKE) $(AM_MAKEFLAGS) -k check |
260 | 873 | 876 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr | |
261 | 874 | clean-coverage-xml: clean-gcda | 877 | |
262 | 875 | -rm -rf $(top_builddir)/coverage.xml | 878 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@generate-coverage-gcovr: |
263 | 876 | 879 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ @echo Generating coverage GCOVR report | |
264 | 877 | clean-local: clean-coverage-html clean-coverage-xml | 880 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml |
265 | 881 | |||
266 | 882 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@clean-coverage-gcovr: clean-gcda | ||
267 | 883 | @HAVE_GCOVR_TRUE@@HAVE_GCOV_TRUE@ -rm -rf $(top_builddir)/coverage.xml | ||
268 | 878 | 884 | ||
269 | 879 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 885 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
270 | 880 | # Otherwise a system limit (for SysV at least) may be exceeded. | 886 | # Otherwise a system limit (for SysV at least) may be exceeded. |
271 | 881 | 887 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
277 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
279 | 3 | # Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.93. | 3 | # Generated by GNU Autoconf 2.68 for indicator-datetime 0.3.94. |
280 | 4 | # | 4 | # |
281 | 5 | # Report bugs to <http://bugs.launchpad.net/indicator-datetime>. | 5 | # Report bugs to <http://bugs.launchpad.net/indicator-datetime>. |
282 | 6 | # | 6 | # |
283 | @@ -572,8 +572,8 @@ | |||
284 | 572 | # Identity of this package. | 572 | # Identity of this package. |
285 | 573 | PACKAGE_NAME='indicator-datetime' | 573 | PACKAGE_NAME='indicator-datetime' |
286 | 574 | PACKAGE_TARNAME='indicator-datetime' | 574 | PACKAGE_TARNAME='indicator-datetime' |
289 | 575 | PACKAGE_VERSION='0.3.93' | 575 | PACKAGE_VERSION='0.3.94' |
290 | 576 | PACKAGE_STRING='indicator-datetime 0.3.93' | 576 | PACKAGE_STRING='indicator-datetime 0.3.94' |
291 | 577 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime' | 577 | PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-datetime' |
292 | 578 | PACKAGE_URL='http://launchpad.net/indicator-datetime' | 578 | PACKAGE_URL='http://launchpad.net/indicator-datetime' |
293 | 579 | 579 | ||
294 | @@ -672,8 +672,13 @@ | |||
295 | 672 | INDICATORICONSDIR | 672 | INDICATORICONSDIR |
296 | 673 | INDICATORDIR | 673 | INDICATORDIR |
297 | 674 | COVERAGE_LDFLAGS | 674 | COVERAGE_LDFLAGS |
298 | 675 | COVERAGE_CXXFLAGS | ||
299 | 676 | COVERAGE_CFLAGS | 675 | COVERAGE_CFLAGS |
300 | 676 | HAVE_GCOVR_FALSE | ||
301 | 677 | HAVE_GCOVR_TRUE | ||
302 | 678 | HAVE_LCOV_FALSE | ||
303 | 679 | HAVE_LCOV_TRUE | ||
304 | 680 | HAVE_GCOV_FALSE | ||
305 | 681 | HAVE_GCOV_TRUE | ||
306 | 677 | GCOVR | 682 | GCOVR |
307 | 678 | GENHTML | 683 | GENHTML |
308 | 679 | LCOV | 684 | LCOV |
309 | @@ -1395,7 +1400,7 @@ | |||
310 | 1395 | # Omit some internal or obsolete options to make the list less imposing. | 1400 | # Omit some internal or obsolete options to make the list less imposing. |
311 | 1396 | # This message is too long to be a string in the A/UX 3.1 sh. | 1401 | # This message is too long to be a string in the A/UX 3.1 sh. |
312 | 1397 | cat <<_ACEOF | 1402 | cat <<_ACEOF |
314 | 1398 | \`configure' configures indicator-datetime 0.3.93 to adapt to many kinds of systems. | 1403 | \`configure' configures indicator-datetime 0.3.94 to adapt to many kinds of systems. |
315 | 1399 | 1404 | ||
316 | 1400 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1405 | Usage: $0 [OPTION]... [VAR=VALUE]... |
317 | 1401 | 1406 | ||
318 | @@ -1466,7 +1471,7 @@ | |||
319 | 1466 | 1471 | ||
320 | 1467 | if test -n "$ac_init_help"; then | 1472 | if test -n "$ac_init_help"; then |
321 | 1468 | case $ac_init_help in | 1473 | case $ac_init_help in |
323 | 1469 | short | recursive ) echo "Configuration of indicator-datetime 0.3.93:";; | 1474 | short | recursive ) echo "Configuration of indicator-datetime 0.3.94:";; |
324 | 1470 | esac | 1475 | esac |
325 | 1471 | cat <<\_ACEOF | 1476 | cat <<\_ACEOF |
326 | 1472 | 1477 | ||
327 | @@ -1600,7 +1605,7 @@ | |||
328 | 1600 | test -n "$ac_init_help" && exit $ac_status | 1605 | test -n "$ac_init_help" && exit $ac_status |
329 | 1601 | if $ac_init_version; then | 1606 | if $ac_init_version; then |
330 | 1602 | cat <<\_ACEOF | 1607 | cat <<\_ACEOF |
332 | 1603 | indicator-datetime configure 0.3.93 | 1608 | indicator-datetime configure 0.3.94 |
333 | 1604 | generated by GNU Autoconf 2.68 | 1609 | generated by GNU Autoconf 2.68 |
334 | 1605 | 1610 | ||
335 | 1606 | Copyright (C) 2010 Free Software Foundation, Inc. | 1611 | Copyright (C) 2010 Free Software Foundation, Inc. |
336 | @@ -1971,7 +1976,7 @@ | |||
337 | 1971 | This file contains any messages produced by compilers while | 1976 | This file contains any messages produced by compilers while |
338 | 1972 | running configure, to aid debugging if configure makes a mistake. | 1977 | running configure, to aid debugging if configure makes a mistake. |
339 | 1973 | 1978 | ||
341 | 1974 | It was created by indicator-datetime $as_me 0.3.93, which was | 1979 | It was created by indicator-datetime $as_me 0.3.94, which was |
342 | 1975 | generated by GNU Autoconf 2.68. Invocation command line was | 1980 | generated by GNU Autoconf 2.68. Invocation command line was |
343 | 1976 | 1981 | ||
344 | 1977 | $ $0 $@ | 1982 | $ $0 $@ |
345 | @@ -2795,7 +2800,7 @@ | |||
346 | 2795 | 2800 | ||
347 | 2796 | # Define the identity of the package. | 2801 | # Define the identity of the package. |
348 | 2797 | PACKAGE='indicator-datetime' | 2802 | PACKAGE='indicator-datetime' |
350 | 2798 | VERSION='0.3.93' | 2803 | VERSION='0.3.94' |
351 | 2799 | 2804 | ||
352 | 2800 | 2805 | ||
353 | 2801 | cat >>confdefs.h <<_ACEOF | 2806 | cat >>confdefs.h <<_ACEOF |
354 | @@ -12864,13 +12869,7 @@ | |||
355 | 12864 | # AC_TDD_GCOV | 12869 | # AC_TDD_GCOV |
356 | 12865 | 12870 | ||
357 | 12866 | 12871 | ||
365 | 12867 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether code coverage tools are available" >&5 | 12872 | # Check whether --enable-gcov was given. |
359 | 12868 | $as_echo_n "checking whether code coverage tools are available... " >&6; } | ||
360 | 12869 | if ${ac_cv_check_gcov+:} false; then : | ||
361 | 12870 | $as_echo_n "(cached) " >&6 | ||
362 | 12871 | else | ||
363 | 12872 | |||
364 | 12873 | # Check whether --enable-gcov was given. | ||
366 | 12874 | if test "${enable_gcov+set}" = set; then : | 12873 | if test "${enable_gcov+set}" = set; then : |
367 | 12875 | enableval=$enable_gcov; use_gcov=$enableval | 12874 | enableval=$enable_gcov; use_gcov=$enableval |
368 | 12876 | else | 12875 | else |
369 | @@ -13006,43 +13005,6 @@ | |||
370 | 13006 | fi | 13005 | fi |
371 | 13007 | 13006 | ||
372 | 13008 | 13007 | ||
373 | 13009 | # Extract the first word of "gcovr", so it can be a program name with args. | ||
374 | 13010 | set dummy gcovr; ac_word=$2 | ||
375 | 13011 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
376 | 13012 | $as_echo_n "checking for $ac_word... " >&6; } | ||
377 | 13013 | if ${ac_cv_prog_GCOVR+:} false; then : | ||
378 | 13014 | $as_echo_n "(cached) " >&6 | ||
379 | 13015 | else | ||
380 | 13016 | if test -n "$GCOVR"; then | ||
381 | 13017 | ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. | ||
382 | 13018 | else | ||
383 | 13019 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
384 | 13020 | for as_dir in $PATH | ||
385 | 13021 | do | ||
386 | 13022 | IFS=$as_save_IFS | ||
387 | 13023 | test -z "$as_dir" && as_dir=. | ||
388 | 13024 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
389 | 13025 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
390 | 13026 | ac_cv_prog_GCOVR="gcovr" | ||
391 | 13027 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
392 | 13028 | break 2 | ||
393 | 13029 | fi | ||
394 | 13030 | done | ||
395 | 13031 | done | ||
396 | 13032 | IFS=$as_save_IFS | ||
397 | 13033 | |||
398 | 13034 | fi | ||
399 | 13035 | fi | ||
400 | 13036 | GCOVR=$ac_cv_prog_GCOVR | ||
401 | 13037 | if test -n "$GCOVR"; then | ||
402 | 13038 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 | ||
403 | 13039 | $as_echo "$GCOVR" >&6; } | ||
404 | 13040 | else | ||
405 | 13041 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
406 | 13042 | $as_echo "no" >&6; } | ||
407 | 13043 | fi | ||
408 | 13044 | |||
409 | 13045 | |||
410 | 13046 | 13008 | ||
411 | 13047 | if test "$LCOV"; then | 13009 | if test "$LCOV"; then |
412 | 13048 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 | 13010 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 |
413 | @@ -13079,10 +13041,8 @@ | |||
414 | 13079 | as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 | 13041 | as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 |
415 | 13080 | fi | 13042 | fi |
416 | 13081 | 13043 | ||
421 | 13082 | if test -z "$GCOVR"; then | 13044 | ac_cv_check_gcov=yes |
422 | 13083 | as_fn_error $? "Could not find gcovr; easy_install (or pip) gcovr" "$LINENO" 5 | 13045 | ac_cv_check_lcov=yes |
419 | 13084 | fi | ||
420 | 13085 | |||
423 | 13086 | 13046 | ||
424 | 13087 | # Remove all optimization flags from CFLAGS | 13047 | # Remove all optimization flags from CFLAGS |
425 | 13088 | 13048 | ||
426 | @@ -13094,11 +13054,75 @@ | |||
427 | 13094 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | 13054 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
428 | 13095 | COVERAGE_LDFLAGS="-lgcov" | 13055 | COVERAGE_LDFLAGS="-lgcov" |
429 | 13096 | 13056 | ||
435 | 13097 | fi | 13057 | # Check availability of gcovr |
436 | 13098 | 13058 | # Extract the first word of "gcovr", so it can be a program name with args. | |
437 | 13099 | fi | 13059 | set dummy gcovr; ac_word=$2 |
438 | 13100 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_check_gcov" >&5 | 13060 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
439 | 13101 | $as_echo "$ac_cv_check_gcov" >&6; } | 13061 | $as_echo_n "checking for $ac_word... " >&6; } |
440 | 13062 | if ${ac_cv_prog_GCOVR+:} false; then : | ||
441 | 13063 | $as_echo_n "(cached) " >&6 | ||
442 | 13064 | else | ||
443 | 13065 | if test -n "$GCOVR"; then | ||
444 | 13066 | ac_cv_prog_GCOVR="$GCOVR" # Let the user override the test. | ||
445 | 13067 | else | ||
446 | 13068 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
447 | 13069 | for as_dir in $PATH | ||
448 | 13070 | do | ||
449 | 13071 | IFS=$as_save_IFS | ||
450 | 13072 | test -z "$as_dir" && as_dir=. | ||
451 | 13073 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
452 | 13074 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
453 | 13075 | ac_cv_prog_GCOVR="gcovr" | ||
454 | 13076 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
455 | 13077 | break 2 | ||
456 | 13078 | fi | ||
457 | 13079 | done | ||
458 | 13080 | done | ||
459 | 13081 | IFS=$as_save_IFS | ||
460 | 13082 | |||
461 | 13083 | fi | ||
462 | 13084 | fi | ||
463 | 13085 | GCOVR=$ac_cv_prog_GCOVR | ||
464 | 13086 | if test -n "$GCOVR"; then | ||
465 | 13087 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOVR" >&5 | ||
466 | 13088 | $as_echo "$GCOVR" >&6; } | ||
467 | 13089 | else | ||
468 | 13090 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
469 | 13091 | $as_echo "no" >&6; } | ||
470 | 13092 | fi | ||
471 | 13093 | |||
472 | 13094 | |||
473 | 13095 | if test -z "$GCOVR"; then | ||
474 | 13096 | ac_cv_check_gcovr=no | ||
475 | 13097 | else | ||
476 | 13098 | ac_cv_check_gcovr=yes | ||
477 | 13099 | fi | ||
478 | 13100 | |||
479 | 13101 | fi | ||
480 | 13102 | |||
481 | 13103 | if test "x$ac_cv_check_gcov" = xyes; then | ||
482 | 13104 | HAVE_GCOV_TRUE= | ||
483 | 13105 | HAVE_GCOV_FALSE='#' | ||
484 | 13106 | else | ||
485 | 13107 | HAVE_GCOV_TRUE='#' | ||
486 | 13108 | HAVE_GCOV_FALSE= | ||
487 | 13109 | fi | ||
488 | 13110 | |||
489 | 13111 | if test "x$ac_cv_check_lcov" = xyes; then | ||
490 | 13112 | HAVE_LCOV_TRUE= | ||
491 | 13113 | HAVE_LCOV_FALSE='#' | ||
492 | 13114 | else | ||
493 | 13115 | HAVE_LCOV_TRUE='#' | ||
494 | 13116 | HAVE_LCOV_FALSE= | ||
495 | 13117 | fi | ||
496 | 13118 | |||
497 | 13119 | if test "x$ac_cv_check_gcovr" = xyes; then | ||
498 | 13120 | HAVE_GCOVR_TRUE= | ||
499 | 13121 | HAVE_GCOVR_FALSE='#' | ||
500 | 13122 | else | ||
501 | 13123 | HAVE_GCOVR_TRUE='#' | ||
502 | 13124 | HAVE_GCOVR_FALSE= | ||
503 | 13125 | fi | ||
504 | 13102 | 13126 | ||
505 | 13103 | 13127 | ||
506 | 13104 | 13128 | ||
507 | @@ -14630,6 +14654,18 @@ | |||
508 | 14630 | as_fn_error $? "conditional \"BUILD_CCPANEL\" was never defined. | 14654 | as_fn_error $? "conditional \"BUILD_CCPANEL\" was never defined. |
509 | 14631 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 14655 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
510 | 14632 | fi | 14656 | fi |
511 | 14657 | if test -z "${HAVE_GCOV_TRUE}" && test -z "${HAVE_GCOV_FALSE}"; then | ||
512 | 14658 | as_fn_error $? "conditional \"HAVE_GCOV\" was never defined. | ||
513 | 14659 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
514 | 14660 | fi | ||
515 | 14661 | if test -z "${HAVE_LCOV_TRUE}" && test -z "${HAVE_LCOV_FALSE}"; then | ||
516 | 14662 | as_fn_error $? "conditional \"HAVE_LCOV\" was never defined. | ||
517 | 14663 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
518 | 14664 | fi | ||
519 | 14665 | if test -z "${HAVE_GCOVR_TRUE}" && test -z "${HAVE_GCOVR_FALSE}"; then | ||
520 | 14666 | as_fn_error $? "conditional \"HAVE_GCOVR\" was never defined. | ||
521 | 14667 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
522 | 14668 | fi | ||
523 | 14633 | 14669 | ||
524 | 14634 | ac_config_commands="$ac_config_commands po/stamp-it" | 14670 | ac_config_commands="$ac_config_commands po/stamp-it" |
525 | 14635 | 14671 | ||
526 | @@ -15043,7 +15079,7 @@ | |||
527 | 15043 | # report actual input values of CONFIG_FILES etc. instead of their | 15079 | # report actual input values of CONFIG_FILES etc. instead of their |
528 | 15044 | # values after options handling. | 15080 | # values after options handling. |
529 | 15045 | ac_log=" | 15081 | ac_log=" |
531 | 15046 | This file was extended by indicator-datetime $as_me 0.3.93, which was | 15082 | This file was extended by indicator-datetime $as_me 0.3.94, which was |
532 | 15047 | generated by GNU Autoconf 2.68. Invocation command line was | 15083 | generated by GNU Autoconf 2.68. Invocation command line was |
533 | 15048 | 15084 | ||
534 | 15049 | CONFIG_FILES = $CONFIG_FILES | 15085 | CONFIG_FILES = $CONFIG_FILES |
535 | @@ -15110,7 +15146,7 @@ | |||
536 | 15110 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 15146 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
537 | 15111 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 15147 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
538 | 15112 | ac_cs_version="\\ | 15148 | ac_cs_version="\\ |
540 | 15113 | indicator-datetime config.status 0.3.93 | 15149 | indicator-datetime config.status 0.3.94 |
541 | 15114 | configured by $0, generated by GNU Autoconf 2.68, | 15150 | configured by $0, generated by GNU Autoconf 2.68, |
542 | 15115 | with options \\"\$ac_cs_config\\" | 15151 | with options \\"\$ac_cs_config\\" |
543 | 15116 | 15152 | ||
544 | 15117 | 15153 | ||
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 | 1 | AC_INIT([indicator-datetime], | 1 | AC_INIT([indicator-datetime], |
551 | 2 | [0.3.93], | 2 | [0.3.94], |
552 | 3 | [http://bugs.launchpad.net/indicator-datetime], | 3 | [http://bugs.launchpad.net/indicator-datetime], |
553 | 4 | [indicator-datetime], | 4 | [indicator-datetime], |
554 | 5 | [http://launchpad.net/indicator-datetime]) | 5 | [http://launchpad.net/indicator-datetime]) |
555 | @@ -145,8 +145,10 @@ | |||
556 | 145 | 145 | ||
557 | 146 | m4_include([m4/gcov.m4]) | 146 | m4_include([m4/gcov.m4]) |
558 | 147 | AC_TDD_GCOV | 147 | AC_TDD_GCOV |
559 | 148 | AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) | ||
560 | 149 | AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) | ||
561 | 150 | AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) | ||
562 | 148 | AC_SUBST(COVERAGE_CFLAGS) | 151 | AC_SUBST(COVERAGE_CFLAGS) |
563 | 149 | AC_SUBST(COVERAGE_CXXFLAGS) | ||
564 | 150 | AC_SUBST(COVERAGE_LDFLAGS) | 152 | AC_SUBST(COVERAGE_LDFLAGS) |
565 | 151 | 153 | ||
566 | 152 | ########################### | 154 | ########################### |
567 | 153 | 155 | ||
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 | 109 | CCPANELDIR = @CCPANELDIR@ | 109 | CCPANELDIR = @CCPANELDIR@ |
573 | 110 | CFLAGS = @CFLAGS@ | 110 | CFLAGS = @CFLAGS@ |
574 | 111 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | 111 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
575 | 112 | COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ | ||
576 | 113 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | 112 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
577 | 114 | CPP = @CPP@ | 113 | CPP = @CPP@ |
578 | 115 | CPPFLAGS = @CPPFLAGS@ | 114 | CPPFLAGS = @CPPFLAGS@ |
579 | 116 | 115 | ||
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 | 1 | indicator-datetime (0.3.94-0ubuntu1~ppa1) precise; urgency=low | ||
585 | 2 | |||
586 | 3 | * New upstream release. | ||
587 | 4 | * Fix location timezone sorting issue. | ||
588 | 5 | * Clicking the systems settings window shouldn't close the | ||
589 | 6 | Locations dialog. (LP: #947315) | ||
590 | 7 | * Add gcov targets to autotools build for code-coverage reporting. | ||
591 | 8 | |||
592 | 9 | -- Charles Kerr <charles.kerr@canonical.com> Wed, 04 Apr 2012 16:53:20 -0500 | ||
593 | 10 | |||
594 | 1 | indicator-datetime (0.3.93-0ubuntu1) precise; urgency=low | 11 | indicator-datetime (0.3.93-0ubuntu1) precise; urgency=low |
595 | 2 | 12 | ||
596 | 3 | * New upstream release. | 13 | * New upstream release. |
597 | 4 | 14 | ||
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 | 5 | # * gcovr | 5 | # * gcovr |
603 | 6 | # | 6 | # |
604 | 7 | # Sets ac_cv_check_gcov to yes if tooling is present | 7 | # Sets ac_cv_check_gcov to yes if tooling is present |
606 | 8 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. | 8 | # and reports the executables to the variables LCOV, GCOVR and GENHTML. |
607 | 9 | AC_DEFUN([AC_TDD_GCOV], | 9 | AC_DEFUN([AC_TDD_GCOV], |
608 | 10 | [AC_CACHE_CHECK([whether code coverage tools are available], ac_cv_check_gcov, | ||
609 | 11 | [ | 10 | [ |
611 | 12 | AC_ARG_ENABLE(gcov, | 11 | AC_ARG_ENABLE(gcov, |
612 | 13 | AS_HELP_STRING([--enable-gcov], | 12 | AS_HELP_STRING([--enable-gcov], |
613 | 14 | [enable coverage testing with gcov]), | 13 | [enable coverage testing with gcov]), |
614 | 15 | [use_gcov=$enableval], [use_gcov=no]) | 14 | [use_gcov=$enableval], [use_gcov=no]) |
615 | @@ -34,7 +33,6 @@ | |||
616 | 34 | lcov_version_list="1.6 1.7 1.8 1.9" | 33 | lcov_version_list="1.6 1.7 1.8 1.9" |
617 | 35 | AC_CHECK_PROG(LCOV, lcov, lcov) | 34 | AC_CHECK_PROG(LCOV, lcov, lcov) |
618 | 36 | AC_CHECK_PROG(GENHTML, genhtml, genhtml) | 35 | AC_CHECK_PROG(GENHTML, genhtml, genhtml) |
619 | 37 | AC_CHECK_PROG(GCOVR, gcovr, gcovr) | ||
620 | 38 | 36 | ||
621 | 39 | if test "$LCOV"; then | 37 | if test "$LCOV"; then |
622 | 40 | AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ | 38 | AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ |
623 | @@ -63,10 +61,8 @@ | |||
624 | 63 | AC_MSG_ERROR([Could not find genhtml from the lcov package]) | 61 | AC_MSG_ERROR([Could not find genhtml from the lcov package]) |
625 | 64 | fi | 62 | fi |
626 | 65 | 63 | ||
631 | 66 | if test -z "$GCOVR"; then | 64 | ac_cv_check_gcov=yes |
632 | 67 | AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr]) | 65 | ac_cv_check_lcov=yes |
629 | 68 | fi | ||
630 | 69 | |||
633 | 70 | 66 | ||
634 | 71 | # Remove all optimization flags from CFLAGS | 67 | # Remove all optimization flags from CFLAGS |
635 | 72 | changequote({,}) | 68 | changequote({,}) |
636 | @@ -78,6 +74,13 @@ | |||
637 | 78 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" | 74 | COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage" |
638 | 79 | COVERAGE_LDFLAGS="-lgcov" | 75 | COVERAGE_LDFLAGS="-lgcov" |
639 | 80 | 76 | ||
640 | 77 | # Check availability of gcovr | ||
641 | 78 | AC_CHECK_PROG(GCOVR, gcovr, gcovr) | ||
642 | 79 | if test -z "$GCOVR"; then | ||
643 | 80 | ac_cv_check_gcovr=no | ||
644 | 81 | else | ||
645 | 82 | ac_cv_check_gcovr=yes | ||
646 | 83 | fi | ||
647 | 84 | |||
648 | 81 | fi | 85 | fi |
651 | 82 | ])]) # AC_TDD_GCOV | 86 | ]) # AC_TDD_GCOV |
650 | 83 | |||
652 | 84 | 87 | ||
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 | 172 | CCPANELDIR = @CCPANELDIR@ | 172 | CCPANELDIR = @CCPANELDIR@ |
658 | 173 | CFLAGS = @CFLAGS@ | 173 | CFLAGS = @CFLAGS@ |
659 | 174 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | 174 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
660 | 175 | COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ | ||
661 | 176 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | 175 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
662 | 177 | CPP = @CPP@ | 176 | CPP = @CPP@ |
663 | 178 | CPPFLAGS = @CPPFLAGS@ | 177 | CPPFLAGS = @CPPFLAGS@ |
664 | 179 | 178 | ||
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 | 577 | } | 577 | } |
670 | 578 | 578 | ||
671 | 579 | static void | 579 | static void |
672 | 580 | hide_locations (IndicatorDatetimePanel * self) | ||
673 | 581 | { | ||
674 | 582 | if (self->priv->loc_dlg != NULL) | ||
675 | 583 | gtk_widget_destroy (self->priv->loc_dlg); | ||
676 | 584 | } | ||
677 | 585 | |||
678 | 586 | static void | ||
679 | 587 | show_locations (IndicatorDatetimePanel * self) | 580 | show_locations (IndicatorDatetimePanel * self) |
680 | 588 | { | 581 | { |
681 | 589 | if (self->priv->loc_dlg == NULL) { | 582 | if (self->priv->loc_dlg == NULL) { |
682 | 590 | self->priv->loc_dlg = datetime_setup_locations_dialog (self->priv->tzmap); | 583 | self->priv->loc_dlg = datetime_setup_locations_dialog (self->priv->tzmap); |
683 | 591 | GtkWidget * dlg = gtk_widget_get_toplevel (GTK_WIDGET (self)); | 584 | GtkWidget * dlg = gtk_widget_get_toplevel (GTK_WIDGET (self)); |
684 | 585 | gtk_window_set_type_hint (GTK_WINDOW(self->priv->loc_dlg), GDK_WINDOW_TYPE_HINT_DIALOG); | ||
685 | 592 | gtk_window_set_transient_for (GTK_WINDOW (self->priv->loc_dlg), GTK_WINDOW (dlg)); | 586 | gtk_window_set_transient_for (GTK_WINDOW (self->priv->loc_dlg), GTK_WINDOW (dlg)); |
686 | 593 | g_signal_connect (self->priv->loc_dlg, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->priv->loc_dlg); | 587 | g_signal_connect (self->priv->loc_dlg, "destroy", G_CALLBACK (gtk_widget_destroyed), &self->priv->loc_dlg); |
687 | 594 | g_signal_connect_swapped (dlg, "focus-in-event", G_CALLBACK (hide_locations), self); | ||
688 | 595 | gtk_widget_show_all (self->priv->loc_dlg); | 588 | gtk_widget_show_all (self->priv->loc_dlg); |
689 | 596 | } | 589 | } |
690 | 597 | else { | 590 | else { |
691 | 598 | 591 | ||
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 | 108 | }; | 108 | }; |
697 | 109 | 109 | ||
698 | 110 | /** | 110 | /** |
700 | 111 | * A temp struct used by update_location_menu_items() for pruning duplicates. | 111 | * A temp struct used by update_location_menu_items() for pruning duplicates and sorting. |
701 | 112 | */ | 112 | */ |
702 | 113 | struct TimeLocation | 113 | struct TimeLocation |
703 | 114 | { | 114 | { |
704 | @@ -124,14 +124,16 @@ | |||
705 | 124 | g_free (loc); | 124 | g_free (loc); |
706 | 125 | } | 125 | } |
707 | 126 | static struct TimeLocation* | 126 | static struct TimeLocation* |
709 | 127 | time_location_new (const char * zone, const char * name) | 127 | time_location_new (const char * zone, const char * name, time_t now) |
710 | 128 | { | 128 | { |
711 | 129 | struct TimeLocation * loc = g_new (struct TimeLocation, 1); | 129 | struct TimeLocation * loc = g_new (struct TimeLocation, 1); |
712 | 130 | GTimeZone * tz = g_time_zone_new (zone); | 130 | GTimeZone * tz = g_time_zone_new (zone); |
714 | 131 | loc->offset = g_time_zone_get_offset (tz, 0); | 131 | gint interval = g_time_zone_find_interval (tz, G_TIME_TYPE_UNIVERSAL, now); |
715 | 132 | loc->offset = g_time_zone_get_offset (tz, interval); | ||
716 | 132 | loc->zone = g_strdup (zone); | 133 | loc->zone = g_strdup (zone); |
717 | 133 | loc->name = g_strdup (name); | 134 | loc->name = g_strdup (name); |
718 | 134 | g_time_zone_unref (tz); | 135 | g_time_zone_unref (tz); |
719 | 136 | g_debug ("%s zone '%s' name '%s' offset is %d", G_STRLOC, zone, name, (int)loc->offset); | ||
720 | 135 | return loc; | 137 | return loc; |
721 | 136 | } | 138 | } |
722 | 137 | static int | 139 | static int |
723 | @@ -146,9 +148,9 @@ | |||
724 | 146 | return ret; | 148 | return ret; |
725 | 147 | } | 149 | } |
726 | 148 | static GSList* | 150 | static GSList* |
728 | 149 | locations_add (GSList * locations, const char * zone, const char * name) | 151 | locations_add (GSList * locations, const char * zone, const char * name, time_t now) |
729 | 150 | { | 152 | { |
731 | 151 | struct TimeLocation * loc = time_location_new (zone, name); | 153 | struct TimeLocation * loc = time_location_new (zone, name, now); |
732 | 152 | 154 | ||
733 | 153 | if (g_slist_find_custom (locations, loc, (GCompareFunc)time_location_compare) == NULL) { | 155 | if (g_slist_find_custom (locations, loc, (GCompareFunc)time_location_compare) == NULL) { |
734 | 154 | g_debug ("%s Adding zone '%s', name '%s'", G_STRLOC, zone, name); | 156 | g_debug ("%s Adding zone '%s', name '%s'", G_STRLOC, zone, name); |
735 | @@ -182,18 +184,19 @@ | |||
736 | 182 | ***/ | 184 | ***/ |
737 | 183 | 185 | ||
738 | 184 | GSList * locations = NULL; | 186 | GSList * locations = NULL; |
739 | 187 | const time_t now = time(NULL); | ||
740 | 185 | 188 | ||
741 | 186 | /* maybe add geo_timezone */ | 189 | /* maybe add geo_timezone */ |
742 | 187 | if (geo_timezone != NULL) { | 190 | if (geo_timezone != NULL) { |
743 | 188 | gchar * name = get_current_zone_name (geo_timezone); | 191 | gchar * name = get_current_zone_name (geo_timezone); |
745 | 189 | locations = locations_add (locations, geo_timezone, name); | 192 | locations = locations_add (locations, geo_timezone, name, now); |
746 | 190 | g_free (name); | 193 | g_free (name); |
747 | 191 | } | 194 | } |
748 | 192 | 195 | ||
749 | 193 | /* maybe add current_timezone */ | 196 | /* maybe add current_timezone */ |
750 | 194 | if (current_timezone != NULL) { | 197 | if (current_timezone != NULL) { |
751 | 195 | gchar * name = get_current_zone_name (current_timezone); | 198 | gchar * name = get_current_zone_name (current_timezone); |
753 | 196 | locations = locations_add (locations, current_timezone, name); | 199 | locations = locations_add (locations, current_timezone, name, now); |
754 | 197 | g_free (name); | 200 | g_free (name); |
755 | 198 | } | 201 | } |
756 | 199 | 202 | ||
757 | @@ -207,7 +210,7 @@ | |||
758 | 207 | gchar * zone; | 210 | gchar * zone; |
759 | 208 | gchar * name; | 211 | gchar * name; |
760 | 209 | split_settings_location (user_locations[i], &zone, &name); | 212 | split_settings_location (user_locations[i], &zone, &name); |
762 | 210 | locations = locations_add (locations, zone, name); | 213 | locations = locations_add (locations, zone, name, now); |
763 | 211 | g_free (name); | 214 | g_free (name); |
764 | 212 | g_free (zone); | 215 | g_free (zone); |
765 | 213 | } | 216 | } |
766 | 214 | 217 | ||
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 | 72 | CCPANELDIR = @CCPANELDIR@ | 72 | CCPANELDIR = @CCPANELDIR@ |
772 | 73 | CFLAGS = @CFLAGS@ | 73 | CFLAGS = @CFLAGS@ |
773 | 74 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ | 74 | COVERAGE_CFLAGS = @COVERAGE_CFLAGS@ |
774 | 75 | COVERAGE_CXXFLAGS = @COVERAGE_CXXFLAGS@ | ||
775 | 76 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ | 75 | COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@ |
776 | 77 | CPP = @CPP@ | 76 | CPP = @CPP@ |
777 | 78 | CPPFLAGS = @CPPFLAGS@ | 77 | CPPFLAGS = @CPPFLAGS@ |