Merge lp:~indicator-applet-developers/evolution-indicator/ubuntu into lp:~ubuntu-desktop/evolution-indicator/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 76 | ||||
Proposed branch: | lp:~indicator-applet-developers/evolution-indicator/ubuntu | ||||
Merge into: | lp:~ubuntu-desktop/evolution-indicator/ubuntu | ||||
Diff against target: |
646 lines (+147/-114) 6 files modified
ChangeLog (+16/-0) config.guess (+90/-59) config.sub (+13/-34) configure (+19/-19) configure.ac (+2/-2) debian/changelog (+7/-0) |
||||
To merge this branch: | bzr merge lp:~indicator-applet-developers/evolution-indicator/ubuntu | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
Review via email: mp+46335@code.launchpad.net |
Commit message
Description of the change
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 2010-11-23 13:50:52 +0000 |
3 | +++ ChangeLog 2011-01-14 20:54:00 +0000 |
4 | @@ -1,5 +1,21 @@ |
5 | # Generated by Makefile. Do not edit. |
6 | |
7 | +2011-01-14 Ted Gould <ted@gould.cx> |
8 | + |
9 | + 0.2.14 |
10 | + |
11 | +2011-01-14 Ted Gould <ted@gould.cx> |
12 | + |
13 | + Updating to new libindicate |
14 | + |
15 | +2011-01-14 Ken VanDine <ken.vandine@canonical.com> |
16 | + |
17 | + Change pkgconfig check for indicate to indicate-0.5 and require 0.4.91 |
18 | + |
19 | +2010-11-23 Didier Roche <didier.roche@canonical.com> |
20 | + |
21 | + build with new evolution |
22 | + |
23 | 2010-11-23 Didier Roche <didier.roche@canonical.com> |
24 | |
25 | new upstream release |
26 | |
27 | === modified file 'config.guess' |
28 | --- config.guess 2010-06-22 13:17:26 +0000 |
29 | +++ config.guess 2011-01-14 20:54:00 +0000 |
30 | @@ -1,10 +1,10 @@ |
31 | #! /bin/sh |
32 | # Attempt to guess a canonical system name. |
33 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
34 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
35 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
36 | # Free Software Foundation, Inc. |
37 | |
38 | -timestamp='2009-12-30' |
39 | +timestamp='2009-06-10' |
40 | |
41 | # This file is free software; you can redistribute it and/or modify it |
42 | # under the terms of the GNU General Public License as published by |
43 | @@ -27,16 +27,16 @@ |
44 | # the same distribution terms that you use for the rest of that program. |
45 | |
46 | |
47 | -# Originally written by Per Bothner. Please send patches (context |
48 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
49 | -# entry. |
50 | +# Originally written by Per Bothner <per@bothner.com>. |
51 | +# Please send patches to <config-patches@gnu.org>. Submit a context |
52 | +# diff and a properly formatted ChangeLog entry. |
53 | # |
54 | # This script attempts to guess a canonical system name similar to |
55 | # config.sub. If it succeeds, it prints the system name on stdout, and |
56 | # exits with 0. Otherwise, it exits with 1. |
57 | # |
58 | -# You can get the latest version of this script from: |
59 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
60 | +# The plan is that this can be called by configure scripts if you |
61 | +# don't specify an explicit build system type. |
62 | |
63 | me=`echo "$0" | sed -e 's,.*/,,'` |
64 | |
65 | @@ -56,9 +56,8 @@ |
66 | GNU config.guess ($timestamp) |
67 | |
68 | Originally written by Per Bothner. |
69 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
70 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
71 | -Software Foundation, Inc. |
72 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
73 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
74 | |
75 | This is free software; see the source for copying conditions. There is NO |
76 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
77 | @@ -334,9 +333,6 @@ |
78 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
79 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
80 | exit ;; |
81 | - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
82 | - echo i386-pc-auroraux${UNAME_RELEASE} |
83 | - exit ;; |
84 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
85 | eval $set_cc_for_build |
86 | SUN_ARCH="i386" |
87 | @@ -811,12 +807,12 @@ |
88 | i*:PW*:*) |
89 | echo ${UNAME_MACHINE}-pc-pw32 |
90 | exit ;; |
91 | - *:Interix*:*) |
92 | + *:Interix*:[3456]*) |
93 | case ${UNAME_MACHINE} in |
94 | x86) |
95 | echo i586-pc-interix${UNAME_RELEASE} |
96 | exit ;; |
97 | - authenticamd | genuineintel | EM64T) |
98 | + EM64T | authenticamd | genuineintel) |
99 | echo x86_64-unknown-interix${UNAME_RELEASE} |
100 | exit ;; |
101 | IA64) |
102 | @@ -858,20 +854,6 @@ |
103 | i*86:Minix:*:*) |
104 | echo ${UNAME_MACHINE}-pc-minix |
105 | exit ;; |
106 | - alpha:Linux:*:*) |
107 | - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
108 | - EV5) UNAME_MACHINE=alphaev5 ;; |
109 | - EV56) UNAME_MACHINE=alphaev56 ;; |
110 | - PCA56) UNAME_MACHINE=alphapca56 ;; |
111 | - PCA57) UNAME_MACHINE=alphapca56 ;; |
112 | - EV6) UNAME_MACHINE=alphaev6 ;; |
113 | - EV67) UNAME_MACHINE=alphaev67 ;; |
114 | - EV68*) UNAME_MACHINE=alphaev68 ;; |
115 | - esac |
116 | - objdump --private-headers /bin/sh | grep -q ld.so.1 |
117 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
118 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
119 | - exit ;; |
120 | arm*:Linux:*:*) |
121 | eval $set_cc_for_build |
122 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
123 | @@ -894,17 +876,6 @@ |
124 | frv:Linux:*:*) |
125 | echo frv-unknown-linux-gnu |
126 | exit ;; |
127 | - i*86:Linux:*:*) |
128 | - LIBC=gnu |
129 | - eval $set_cc_for_build |
130 | - sed 's/^ //' << EOF >$dummy.c |
131 | - #ifdef __dietlibc__ |
132 | - LIBC=dietlibc |
133 | - #endif |
134 | -EOF |
135 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
136 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
137 | - exit ;; |
138 | ia64:Linux:*:*) |
139 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
140 | exit ;; |
141 | @@ -930,18 +901,39 @@ |
142 | #endif |
143 | #endif |
144 | EOF |
145 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
146 | + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
147 | + /^CPU/{ |
148 | + s: ::g |
149 | + p |
150 | + }'`" |
151 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
152 | ;; |
153 | or32:Linux:*:*) |
154 | echo or32-unknown-linux-gnu |
155 | exit ;; |
156 | + ppc:Linux:*:*) |
157 | + echo powerpc-unknown-linux-gnu |
158 | + exit ;; |
159 | + ppc64:Linux:*:*) |
160 | + echo powerpc64-unknown-linux-gnu |
161 | + exit ;; |
162 | + alpha:Linux:*:*) |
163 | + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
164 | + EV5) UNAME_MACHINE=alphaev5 ;; |
165 | + EV56) UNAME_MACHINE=alphaev56 ;; |
166 | + PCA56) UNAME_MACHINE=alphapca56 ;; |
167 | + PCA57) UNAME_MACHINE=alphapca56 ;; |
168 | + EV6) UNAME_MACHINE=alphaev6 ;; |
169 | + EV67) UNAME_MACHINE=alphaev67 ;; |
170 | + EV68*) UNAME_MACHINE=alphaev68 ;; |
171 | + esac |
172 | + objdump --private-headers /bin/sh | grep -q ld.so.1 |
173 | + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
174 | + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
175 | + exit ;; |
176 | padre:Linux:*:*) |
177 | echo sparc-unknown-linux-gnu |
178 | exit ;; |
179 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
180 | - echo hppa64-unknown-linux-gnu |
181 | - exit ;; |
182 | parisc:Linux:*:* | hppa:Linux:*:*) |
183 | # Look for CPU level |
184 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
185 | @@ -950,11 +942,8 @@ |
186 | *) echo hppa-unknown-linux-gnu ;; |
187 | esac |
188 | exit ;; |
189 | - ppc64:Linux:*:*) |
190 | - echo powerpc64-unknown-linux-gnu |
191 | - exit ;; |
192 | - ppc:Linux:*:*) |
193 | - echo powerpc-unknown-linux-gnu |
194 | + parisc64:Linux:*:* | hppa64:Linux:*:*) |
195 | + echo hppa64-unknown-linux-gnu |
196 | exit ;; |
197 | s390:Linux:*:* | s390x:Linux:*:*) |
198 | echo ${UNAME_MACHINE}-ibm-linux |
199 | @@ -977,6 +966,58 @@ |
200 | xtensa*:Linux:*:*) |
201 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
202 | exit ;; |
203 | + i*86:Linux:*:*) |
204 | + # The BFD linker knows what the default object file format is, so |
205 | + # first see if it will tell us. cd to the root directory to prevent |
206 | + # problems with other programs or directories called `ld' in the path. |
207 | + # Set LC_ALL=C to ensure ld outputs messages in English. |
208 | + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ |
209 | + | sed -ne '/supported targets:/!d |
210 | + s/[ ][ ]*/ /g |
211 | + s/.*supported targets: *// |
212 | + s/ .*// |
213 | + p'` |
214 | + case "$ld_supported_targets" in |
215 | + elf32-i386) |
216 | + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
217 | + ;; |
218 | + esac |
219 | + # Determine whether the default compiler is a.out or elf |
220 | + eval $set_cc_for_build |
221 | + sed 's/^ //' << EOF >$dummy.c |
222 | + #include <features.h> |
223 | + #ifdef __ELF__ |
224 | + # ifdef __GLIBC__ |
225 | + # if __GLIBC__ >= 2 |
226 | + LIBC=gnu |
227 | + # else |
228 | + LIBC=gnulibc1 |
229 | + # endif |
230 | + # else |
231 | + LIBC=gnulibc1 |
232 | + # endif |
233 | + #else |
234 | + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) |
235 | + LIBC=gnu |
236 | + #else |
237 | + LIBC=gnuaout |
238 | + #endif |
239 | + #endif |
240 | + #ifdef __dietlibc__ |
241 | + LIBC=dietlibc |
242 | + #endif |
243 | +EOF |
244 | + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
245 | + /^LIBC/{ |
246 | + s: ::g |
247 | + p |
248 | + }'`" |
249 | + test x"${LIBC}" != x && { |
250 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
251 | + exit |
252 | + } |
253 | + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } |
254 | + ;; |
255 | i*86:DYNIX/ptx:4*:*) |
256 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
257 | # earlier versions are messed up and put the nodename in both |
258 | @@ -1206,16 +1247,6 @@ |
259 | *:Darwin:*:*) |
260 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
261 | case $UNAME_PROCESSOR in |
262 | - i386) |
263 | - eval $set_cc_for_build |
264 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
265 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
266 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
267 | - grep IS_64BIT_ARCH >/dev/null |
268 | - then |
269 | - UNAME_PROCESSOR="x86_64" |
270 | - fi |
271 | - fi ;; |
272 | unknown) UNAME_PROCESSOR=powerpc ;; |
273 | esac |
274 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
275 | |
276 | === modified file 'config.sub' |
277 | --- config.sub 2010-06-22 13:17:26 +0000 |
278 | +++ config.sub 2011-01-14 20:54:00 +0000 |
279 | @@ -1,10 +1,10 @@ |
280 | #! /bin/sh |
281 | # Configuration validation subroutine script. |
282 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
283 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
284 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
285 | # Free Software Foundation, Inc. |
286 | |
287 | -timestamp='2010-01-22' |
288 | +timestamp='2009-06-11' |
289 | |
290 | # This file is (in principle) common to ALL GNU software. |
291 | # The presence of a machine in this file suggests that SOME GNU software |
292 | @@ -32,16 +32,13 @@ |
293 | |
294 | |
295 | # Please send patches to <config-patches@gnu.org>. Submit a context |
296 | -# diff and a properly formatted GNU ChangeLog entry. |
297 | +# diff and a properly formatted ChangeLog entry. |
298 | # |
299 | # Configuration subroutine to validate and canonicalize a configuration type. |
300 | # Supply the specified configuration type as an argument. |
301 | # If it is invalid, we print an error message on stderr and exit with code 1. |
302 | # Otherwise, we print the canonical config type on stdout and succeed. |
303 | |
304 | -# You can get the latest version of this script from: |
305 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
306 | - |
307 | # This file is supposed to be the same for all GNU packages |
308 | # and recognize all the CPU types, system types and aliases |
309 | # that are meaningful with *any* GNU software. |
310 | @@ -75,9 +72,8 @@ |
311 | version="\ |
312 | GNU config.sub ($timestamp) |
313 | |
314 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
315 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
316 | -Software Foundation, Inc. |
317 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
318 | +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
319 | |
320 | This is free software; see the source for copying conditions. There is NO |
321 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
322 | @@ -153,7 +149,7 @@ |
323 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
324 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
325 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
326 | - -apple | -axis | -knuth | -cray | -microblaze) |
327 | + -apple | -axis | -knuth | -cray) |
328 | os= |
329 | basic_machine=$1 |
330 | ;; |
331 | @@ -288,7 +284,6 @@ |
332 | | pdp10 | pdp11 | pj | pjl \ |
333 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
334 | | pyramid \ |
335 | - | rx \ |
336 | | score \ |
337 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
338 | | sh64 | sh64le \ |
339 | @@ -296,14 +291,13 @@ |
340 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
341 | | spu | strongarm \ |
342 | | tahoe | thumb | tic4x | tic80 | tron \ |
343 | - | ubicom32 \ |
344 | | v850 | v850e \ |
345 | | we32k \ |
346 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
347 | | z8k | z80) |
348 | basic_machine=$basic_machine-unknown |
349 | ;; |
350 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
351 | + m6811 | m68hc11 | m6812 | m68hc12) |
352 | # Motorola 68HC11/12. |
353 | basic_machine=$basic_machine-unknown |
354 | os=-none |
355 | @@ -346,7 +340,7 @@ |
356 | | lm32-* \ |
357 | | m32c-* | m32r-* | m32rle-* \ |
358 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
359 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
360 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
361 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
362 | | mips16-* \ |
363 | | mips64-* | mips64el-* \ |
364 | @@ -374,17 +368,15 @@ |
365 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
366 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
367 | | pyramid-* \ |
368 | - | romp-* | rs6000-* | rx-* \ |
369 | + | romp-* | rs6000-* \ |
370 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
371 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
372 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
373 | | sparclite-* \ |
374 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
375 | | tahoe-* | thumb-* \ |
376 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
377 | - | tile-* | tilegx-* \ |
378 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
379 | | tron-* \ |
380 | - | ubicom32-* \ |
381 | | v850-* | v850e-* | vax-* \ |
382 | | we32k-* \ |
383 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
384 | @@ -734,9 +726,6 @@ |
385 | basic_machine=ns32k-utek |
386 | os=-sysv |
387 | ;; |
388 | - microblaze) |
389 | - basic_machine=microblaze-xilinx |
390 | - ;; |
391 | mingw32) |
392 | basic_machine=i386-pc |
393 | os=-mingw32 |
394 | @@ -1087,11 +1076,6 @@ |
395 | basic_machine=tic6x-unknown |
396 | os=-coff |
397 | ;; |
398 | - # This must be matched before tile*. |
399 | - tilegx*) |
400 | - basic_machine=tilegx-unknown |
401 | - os=-linux-gnu |
402 | - ;; |
403 | tile*) |
404 | basic_machine=tile-unknown |
405 | os=-linux-gnu |
406 | @@ -1263,9 +1247,6 @@ |
407 | # First match some system type aliases |
408 | # that might get confused with valid system types. |
409 | # -solaris* is a basic system type, with this one exception. |
410 | - -auroraux) |
411 | - os=-auroraux |
412 | - ;; |
413 | -solaris1 | -solaris1.*) |
414 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
415 | ;; |
416 | @@ -1287,8 +1268,8 @@ |
417 | # -sysv* is not here because it comes later, after sysvr4. |
418 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
419 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
420 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
421 | - | -sym* | -kopensolaris* \ |
422 | + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
423 | + | -kopensolaris* \ |
424 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
425 | | -aos* | -aros* \ |
426 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
427 | @@ -1309,7 +1290,7 @@ |
428 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
429 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
430 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
431 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
432 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
433 | # Remember, each alternative MUST END IN *, to match a version number. |
434 | ;; |
435 | -qnx*) |
436 | @@ -1442,8 +1423,6 @@ |
437 | -dicos*) |
438 | os=-dicos |
439 | ;; |
440 | - -nacl*) |
441 | - ;; |
442 | -none) |
443 | ;; |
444 | *) |
445 | |
446 | === modified file 'configure' |
447 | --- configure 2010-11-23 13:50:52 +0000 |
448 | +++ configure 2011-01-14 20:54:00 +0000 |
449 | @@ -1,6 +1,6 @@ |
450 | #! /bin/sh |
451 | # Guess values for system-dependent variables and create Makefiles. |
452 | -# Generated by GNU Autoconf 2.67 for evolution-indicator 0.2.12. |
453 | +# Generated by GNU Autoconf 2.67 for evolution-indicator 0.2.14. |
454 | # |
455 | # |
456 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
457 | @@ -698,8 +698,8 @@ |
458 | # Identity of this package. |
459 | PACKAGE_NAME='evolution-indicator' |
460 | PACKAGE_TARNAME='evolution-indicator' |
461 | -PACKAGE_VERSION='0.2.12' |
462 | -PACKAGE_STRING='evolution-indicator 0.2.12' |
463 | +PACKAGE_VERSION='0.2.14' |
464 | +PACKAGE_STRING='evolution-indicator 0.2.14' |
465 | PACKAGE_BUGREPORT='' |
466 | PACKAGE_URL='' |
467 | |
468 | @@ -1484,7 +1484,7 @@ |
469 | # Omit some internal or obsolete options to make the list less imposing. |
470 | # This message is too long to be a string in the A/UX 3.1 sh. |
471 | cat <<_ACEOF |
472 | -\`configure' configures evolution-indicator 0.2.12 to adapt to many kinds of systems. |
473 | +\`configure' configures evolution-indicator 0.2.14 to adapt to many kinds of systems. |
474 | |
475 | Usage: $0 [OPTION]... [VAR=VALUE]... |
476 | |
477 | @@ -1555,7 +1555,7 @@ |
478 | |
479 | if test -n "$ac_init_help"; then |
480 | case $ac_init_help in |
481 | - short | recursive ) echo "Configuration of evolution-indicator 0.2.12:";; |
482 | + short | recursive ) echo "Configuration of evolution-indicator 0.2.14:";; |
483 | esac |
484 | cat <<\_ACEOF |
485 | |
486 | @@ -1675,7 +1675,7 @@ |
487 | test -n "$ac_init_help" && exit $ac_status |
488 | if $ac_init_version; then |
489 | cat <<\_ACEOF |
490 | -evolution-indicator configure 0.2.12 |
491 | +evolution-indicator configure 0.2.14 |
492 | generated by GNU Autoconf 2.67 |
493 | |
494 | Copyright (C) 2010 Free Software Foundation, Inc. |
495 | @@ -2040,7 +2040,7 @@ |
496 | This file contains any messages produced by compilers while |
497 | running configure, to aid debugging if configure makes a mistake. |
498 | |
499 | -It was created by evolution-indicator $as_me 0.2.12, which was |
500 | +It was created by evolution-indicator $as_me 0.2.14, which was |
501 | generated by GNU Autoconf 2.67. Invocation command line was |
502 | |
503 | $ $0 $@ |
504 | @@ -2855,7 +2855,7 @@ |
505 | |
506 | # Define the identity of the package. |
507 | PACKAGE='evolution-indicator' |
508 | - VERSION='0.2.12' |
509 | + VERSION='0.2.14' |
510 | |
511 | |
512 | cat >>confdefs.h <<_ACEOF |
513 | @@ -12789,7 +12789,7 @@ |
514 | pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" |
515 | elif test -n "$PKG_CONFIG"; then |
516 | if test -n "$PKG_CONFIG" && \ |
517 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate >= 0.3.0 |
518 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.5 >= 0.4.91 |
519 | evolution-plugin |
520 | dbus-1 |
521 | dbus-glib-1 |
522 | @@ -12797,7 +12797,7 @@ |
523 | libcanberra |
524 | gtkhtml-editor-3.14 |
525 | \""; } >&5 |
526 | - ($PKG_CONFIG --exists --print-errors "indicate >= 0.3.0 |
527 | + ($PKG_CONFIG --exists --print-errors "indicate-0.5 >= 0.4.91 |
528 | evolution-plugin |
529 | dbus-1 |
530 | dbus-glib-1 |
531 | @@ -12808,7 +12808,7 @@ |
532 | ac_status=$? |
533 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
534 | test $ac_status = 0; }; then |
535 | - pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "indicate >= 0.3.0 |
536 | + pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "indicate-0.5 >= 0.4.91 |
537 | evolution-plugin |
538 | dbus-1 |
539 | dbus-glib-1 |
540 | @@ -12826,7 +12826,7 @@ |
541 | pkg_cv_DEPS_LIBS="$DEPS_LIBS" |
542 | elif test -n "$PKG_CONFIG"; then |
543 | if test -n "$PKG_CONFIG" && \ |
544 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate >= 0.3.0 |
545 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.5 >= 0.4.91 |
546 | evolution-plugin |
547 | dbus-1 |
548 | dbus-glib-1 |
549 | @@ -12834,7 +12834,7 @@ |
550 | libcanberra |
551 | gtkhtml-editor-3.14 |
552 | \""; } >&5 |
553 | - ($PKG_CONFIG --exists --print-errors "indicate >= 0.3.0 |
554 | + ($PKG_CONFIG --exists --print-errors "indicate-0.5 >= 0.4.91 |
555 | evolution-plugin |
556 | dbus-1 |
557 | dbus-glib-1 |
558 | @@ -12845,7 +12845,7 @@ |
559 | ac_status=$? |
560 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
561 | test $ac_status = 0; }; then |
562 | - pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "indicate >= 0.3.0 |
563 | + pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "indicate-0.5 >= 0.4.91 |
564 | evolution-plugin |
565 | dbus-1 |
566 | dbus-glib-1 |
567 | @@ -12872,7 +12872,7 @@ |
568 | _pkg_short_errors_supported=no |
569 | fi |
570 | if test $_pkg_short_errors_supported = yes; then |
571 | - DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicate >= 0.3.0 |
572 | + DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicate-0.5 >= 0.4.91 |
573 | evolution-plugin |
574 | dbus-1 |
575 | dbus-glib-1 |
576 | @@ -12881,7 +12881,7 @@ |
577 | gtkhtml-editor-3.14 |
578 | " 2>&1` |
579 | else |
580 | - DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicate >= 0.3.0 |
581 | + DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicate-0.5 >= 0.4.91 |
582 | evolution-plugin |
583 | dbus-1 |
584 | dbus-glib-1 |
585 | @@ -12893,7 +12893,7 @@ |
586 | # Put the nasty error message in config.log where it belongs |
587 | echo "$DEPS_PKG_ERRORS" >&5 |
588 | |
589 | - as_fn_error $? "Package requirements (indicate >= 0.3.0 |
590 | + as_fn_error $? "Package requirements (indicate-0.5 >= 0.4.91 |
591 | evolution-plugin |
592 | dbus-1 |
593 | dbus-glib-1 |
594 | @@ -13475,7 +13475,7 @@ |
595 | # report actual input values of CONFIG_FILES etc. instead of their |
596 | # values after options handling. |
597 | ac_log=" |
598 | -This file was extended by evolution-indicator $as_me 0.2.12, which was |
599 | +This file was extended by evolution-indicator $as_me 0.2.14, which was |
600 | generated by GNU Autoconf 2.67. Invocation command line was |
601 | |
602 | CONFIG_FILES = $CONFIG_FILES |
603 | @@ -13541,7 +13541,7 @@ |
604 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
605 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
606 | ac_cs_version="\\ |
607 | -evolution-indicator config.status 0.2.12 |
608 | +evolution-indicator config.status 0.2.14 |
609 | configured by $0, generated by GNU Autoconf 2.67, |
610 | with options \\"\$ac_cs_config\\" |
611 | |
612 | |
613 | === modified file 'configure.ac' |
614 | --- configure.ac 2010-11-23 13:50:52 +0000 |
615 | +++ configure.ac 2011-01-14 20:54:00 +0000 |
616 | @@ -1,5 +1,5 @@ |
617 | AC_PREREQ(2.53) |
618 | -AC_INIT(evolution-indicator, 0.2.12, []) |
619 | +AC_INIT(evolution-indicator, 0.2.14, []) |
620 | AM_INIT_AUTOMAKE() |
621 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
622 | AC_CONFIG_SRCDIR(src/evolution-indicator.c) |
623 | @@ -59,7 +59,7 @@ |
624 | AC_SUBST(GCC_FLAGS) |
625 | |
626 | PKG_CHECK_MODULES(DEPS, |
627 | - indicate >= 0.3.0 |
628 | + indicate-0.5 >= 0.4.91 |
629 | evolution-plugin |
630 | dbus-1 |
631 | dbus-glib-1 |
632 | |
633 | === modified file 'debian/changelog' |
634 | --- debian/changelog 2010-11-23 14:30:49 +0000 |
635 | +++ debian/changelog 2011-01-14 20:54:00 +0000 |
636 | @@ -1,3 +1,10 @@ |
637 | +evolution-indicator (0.2.14-0ubuntu1~ppa1) natty; urgency=low |
638 | + |
639 | + * New upstream release. |
640 | + * Port to new libindicate |
641 | + |
642 | + -- Ted Gould <ted@ubuntu.com> Fri, 14 Jan 2011 14:44:52 -0600 |
643 | + |
644 | evolution-indicator (0.2.12-0ubuntu1) natty; urgency=low |
645 | |
646 | * New upstream release: |
Approve