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:
|
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 | 1 | # Generated by Makefile. Do not edit. | 1 | # Generated by Makefile. Do not edit. |
6 | 2 | 2 | ||
7 | 3 | 2011-01-14 Ted Gould <ted@gould.cx> | ||
8 | 4 | |||
9 | 5 | 0.2.14 | ||
10 | 6 | |||
11 | 7 | 2011-01-14 Ted Gould <ted@gould.cx> | ||
12 | 8 | |||
13 | 9 | Updating to new libindicate | ||
14 | 10 | |||
15 | 11 | 2011-01-14 Ken VanDine <ken.vandine@canonical.com> | ||
16 | 12 | |||
17 | 13 | Change pkgconfig check for indicate to indicate-0.5 and require 0.4.91 | ||
18 | 14 | |||
19 | 15 | 2010-11-23 Didier Roche <didier.roche@canonical.com> | ||
20 | 16 | |||
21 | 17 | build with new evolution | ||
22 | 18 | |||
23 | 3 | 2010-11-23 Didier Roche <didier.roche@canonical.com> | 19 | 2010-11-23 Didier Roche <didier.roche@canonical.com> |
24 | 4 | 20 | ||
25 | 5 | new upstream release | 21 | new upstream release |
26 | 6 | 22 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
32 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
33 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
35 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
36 | 5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
37 | 6 | 6 | ||
39 | 7 | timestamp='2009-12-30' | 7 | timestamp='2009-06-10' |
40 | 8 | 8 | ||
41 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
42 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
43 | @@ -27,16 +27,16 @@ | |||
44 | 27 | # the same distribution terms that you use for the rest of that program. | 27 | # the same distribution terms that you use for the rest of that program. |
45 | 28 | 28 | ||
46 | 29 | 29 | ||
50 | 30 | # Originally written by Per Bothner. Please send patches (context | 30 | # Originally written by Per Bothner <per@bothner.com>. |
51 | 31 | # diff format) to <config-patches@gnu.org> and include a ChangeLog | 31 | # Please send patches to <config-patches@gnu.org>. Submit a context |
52 | 32 | # entry. | 32 | # diff and a properly formatted ChangeLog entry. |
53 | 33 | # | 33 | # |
54 | 34 | # This script attempts to guess a canonical system name similar to | 34 | # This script attempts to guess a canonical system name similar to |
55 | 35 | # config.sub. If it succeeds, it prints the system name on stdout, and | 35 | # config.sub. If it succeeds, it prints the system name on stdout, and |
56 | 36 | # exits with 0. Otherwise, it exits with 1. | 36 | # exits with 0. Otherwise, it exits with 1. |
57 | 37 | # | 37 | # |
60 | 38 | # You can get the latest version of this script from: | 38 | # The plan is that this can be called by configure scripts if you |
61 | 39 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD | 39 | # don't specify an explicit build system type. |
62 | 40 | 40 | ||
63 | 41 | me=`echo "$0" | sed -e 's,.*/,,'` | 41 | me=`echo "$0" | sed -e 's,.*/,,'` |
64 | 42 | 42 | ||
65 | @@ -56,9 +56,8 @@ | |||
66 | 56 | GNU config.guess ($timestamp) | 56 | GNU config.guess ($timestamp) |
67 | 57 | 57 | ||
68 | 58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
72 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
73 | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 60 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
71 | 61 | Software Foundation, Inc. | ||
74 | 62 | 61 | ||
75 | 63 | This is free software; see the source for copying conditions. There is NO | 62 | This is free software; see the source for copying conditions. There is NO |
76 | 64 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
77 | @@ -334,9 +333,6 @@ | |||
78 | 334 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 333 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
79 | 335 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 334 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
80 | 336 | exit ;; | 335 | exit ;; |
81 | 337 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | ||
82 | 338 | echo i386-pc-auroraux${UNAME_RELEASE} | ||
83 | 339 | exit ;; | ||
84 | 340 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 336 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
85 | 341 | eval $set_cc_for_build | 337 | eval $set_cc_for_build |
86 | 342 | SUN_ARCH="i386" | 338 | SUN_ARCH="i386" |
87 | @@ -811,12 +807,12 @@ | |||
88 | 811 | i*:PW*:*) | 807 | i*:PW*:*) |
89 | 812 | echo ${UNAME_MACHINE}-pc-pw32 | 808 | echo ${UNAME_MACHINE}-pc-pw32 |
90 | 813 | exit ;; | 809 | exit ;; |
92 | 814 | *:Interix*:*) | 810 | *:Interix*:[3456]*) |
93 | 815 | case ${UNAME_MACHINE} in | 811 | case ${UNAME_MACHINE} in |
94 | 816 | x86) | 812 | x86) |
95 | 817 | echo i586-pc-interix${UNAME_RELEASE} | 813 | echo i586-pc-interix${UNAME_RELEASE} |
96 | 818 | exit ;; | 814 | exit ;; |
98 | 819 | authenticamd | genuineintel | EM64T) | 815 | EM64T | authenticamd | genuineintel) |
99 | 820 | echo x86_64-unknown-interix${UNAME_RELEASE} | 816 | echo x86_64-unknown-interix${UNAME_RELEASE} |
100 | 821 | exit ;; | 817 | exit ;; |
101 | 822 | IA64) | 818 | IA64) |
102 | @@ -858,20 +854,6 @@ | |||
103 | 858 | i*86:Minix:*:*) | 854 | i*86:Minix:*:*) |
104 | 859 | echo ${UNAME_MACHINE}-pc-minix | 855 | echo ${UNAME_MACHINE}-pc-minix |
105 | 860 | exit ;; | 856 | exit ;; |
106 | 861 | alpha:Linux:*:*) | ||
107 | 862 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
108 | 863 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
109 | 864 | EV56) UNAME_MACHINE=alphaev56 ;; | ||
110 | 865 | PCA56) UNAME_MACHINE=alphapca56 ;; | ||
111 | 866 | PCA57) UNAME_MACHINE=alphapca56 ;; | ||
112 | 867 | EV6) UNAME_MACHINE=alphaev6 ;; | ||
113 | 868 | EV67) UNAME_MACHINE=alphaev67 ;; | ||
114 | 869 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
115 | 870 | esac | ||
116 | 871 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
117 | 872 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
118 | 873 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
119 | 874 | exit ;; | ||
120 | 875 | arm*:Linux:*:*) | 857 | arm*:Linux:*:*) |
121 | 876 | eval $set_cc_for_build | 858 | eval $set_cc_for_build |
122 | 877 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 859 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
123 | @@ -894,17 +876,6 @@ | |||
124 | 894 | frv:Linux:*:*) | 876 | frv:Linux:*:*) |
125 | 895 | echo frv-unknown-linux-gnu | 877 | echo frv-unknown-linux-gnu |
126 | 896 | exit ;; | 878 | exit ;; |
127 | 897 | i*86:Linux:*:*) | ||
128 | 898 | LIBC=gnu | ||
129 | 899 | eval $set_cc_for_build | ||
130 | 900 | sed 's/^ //' << EOF >$dummy.c | ||
131 | 901 | #ifdef __dietlibc__ | ||
132 | 902 | LIBC=dietlibc | ||
133 | 903 | #endif | ||
134 | 904 | EOF | ||
135 | 905 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` | ||
136 | 906 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
137 | 907 | exit ;; | ||
138 | 908 | ia64:Linux:*:*) | 879 | ia64:Linux:*:*) |
139 | 909 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 880 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
140 | 910 | exit ;; | 881 | exit ;; |
141 | @@ -930,18 +901,39 @@ | |||
142 | 930 | #endif | 901 | #endif |
143 | 931 | #endif | 902 | #endif |
144 | 932 | EOF | 903 | EOF |
146 | 933 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` | 904 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
147 | 905 | /^CPU/{ | ||
148 | 906 | s: ::g | ||
149 | 907 | p | ||
150 | 908 | }'`" | ||
151 | 934 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 909 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
152 | 935 | ;; | 910 | ;; |
153 | 936 | or32:Linux:*:*) | 911 | or32:Linux:*:*) |
154 | 937 | echo or32-unknown-linux-gnu | 912 | echo or32-unknown-linux-gnu |
155 | 938 | exit ;; | 913 | exit ;; |
156 | 914 | ppc:Linux:*:*) | ||
157 | 915 | echo powerpc-unknown-linux-gnu | ||
158 | 916 | exit ;; | ||
159 | 917 | ppc64:Linux:*:*) | ||
160 | 918 | echo powerpc64-unknown-linux-gnu | ||
161 | 919 | exit ;; | ||
162 | 920 | alpha:Linux:*:*) | ||
163 | 921 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
164 | 922 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
165 | 923 | EV56) UNAME_MACHINE=alphaev56 ;; | ||
166 | 924 | PCA56) UNAME_MACHINE=alphapca56 ;; | ||
167 | 925 | PCA57) UNAME_MACHINE=alphapca56 ;; | ||
168 | 926 | EV6) UNAME_MACHINE=alphaev6 ;; | ||
169 | 927 | EV67) UNAME_MACHINE=alphaev67 ;; | ||
170 | 928 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
171 | 929 | esac | ||
172 | 930 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
173 | 931 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
174 | 932 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
175 | 933 | exit ;; | ||
176 | 939 | padre:Linux:*:*) | 934 | padre:Linux:*:*) |
177 | 940 | echo sparc-unknown-linux-gnu | 935 | echo sparc-unknown-linux-gnu |
178 | 941 | exit ;; | 936 | exit ;; |
179 | 942 | parisc64:Linux:*:* | hppa64:Linux:*:*) | ||
180 | 943 | echo hppa64-unknown-linux-gnu | ||
181 | 944 | exit ;; | ||
182 | 945 | parisc:Linux:*:* | hppa:Linux:*:*) | 937 | parisc:Linux:*:* | hppa:Linux:*:*) |
183 | 946 | # Look for CPU level | 938 | # Look for CPU level |
184 | 947 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 939 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
185 | @@ -950,11 +942,8 @@ | |||
186 | 950 | *) echo hppa-unknown-linux-gnu ;; | 942 | *) echo hppa-unknown-linux-gnu ;; |
187 | 951 | esac | 943 | esac |
188 | 952 | exit ;; | 944 | exit ;; |
194 | 953 | ppc64:Linux:*:*) | 945 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
195 | 954 | echo powerpc64-unknown-linux-gnu | 946 | echo hppa64-unknown-linux-gnu |
191 | 955 | exit ;; | ||
192 | 956 | ppc:Linux:*:*) | ||
193 | 957 | echo powerpc-unknown-linux-gnu | ||
196 | 958 | exit ;; | 947 | exit ;; |
197 | 959 | s390:Linux:*:* | s390x:Linux:*:*) | 948 | s390:Linux:*:* | s390x:Linux:*:*) |
198 | 960 | echo ${UNAME_MACHINE}-ibm-linux | 949 | echo ${UNAME_MACHINE}-ibm-linux |
199 | @@ -977,6 +966,58 @@ | |||
200 | 977 | xtensa*:Linux:*:*) | 966 | xtensa*:Linux:*:*) |
201 | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 967 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
202 | 979 | exit ;; | 968 | exit ;; |
203 | 969 | i*86:Linux:*:*) | ||
204 | 970 | # The BFD linker knows what the default object file format is, so | ||
205 | 971 | # first see if it will tell us. cd to the root directory to prevent | ||
206 | 972 | # problems with other programs or directories called `ld' in the path. | ||
207 | 973 | # Set LC_ALL=C to ensure ld outputs messages in English. | ||
208 | 974 | ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | ||
209 | 975 | | sed -ne '/supported targets:/!d | ||
210 | 976 | s/[ ][ ]*/ /g | ||
211 | 977 | s/.*supported targets: *// | ||
212 | 978 | s/ .*// | ||
213 | 979 | p'` | ||
214 | 980 | case "$ld_supported_targets" in | ||
215 | 981 | elf32-i386) | ||
216 | 982 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | ||
217 | 983 | ;; | ||
218 | 984 | esac | ||
219 | 985 | # Determine whether the default compiler is a.out or elf | ||
220 | 986 | eval $set_cc_for_build | ||
221 | 987 | sed 's/^ //' << EOF >$dummy.c | ||
222 | 988 | #include <features.h> | ||
223 | 989 | #ifdef __ELF__ | ||
224 | 990 | # ifdef __GLIBC__ | ||
225 | 991 | # if __GLIBC__ >= 2 | ||
226 | 992 | LIBC=gnu | ||
227 | 993 | # else | ||
228 | 994 | LIBC=gnulibc1 | ||
229 | 995 | # endif | ||
230 | 996 | # else | ||
231 | 997 | LIBC=gnulibc1 | ||
232 | 998 | # endif | ||
233 | 999 | #else | ||
234 | 1000 | #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) | ||
235 | 1001 | LIBC=gnu | ||
236 | 1002 | #else | ||
237 | 1003 | LIBC=gnuaout | ||
238 | 1004 | #endif | ||
239 | 1005 | #endif | ||
240 | 1006 | #ifdef __dietlibc__ | ||
241 | 1007 | LIBC=dietlibc | ||
242 | 1008 | #endif | ||
243 | 1009 | EOF | ||
244 | 1010 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | ||
245 | 1011 | /^LIBC/{ | ||
246 | 1012 | s: ::g | ||
247 | 1013 | p | ||
248 | 1014 | }'`" | ||
249 | 1015 | test x"${LIBC}" != x && { | ||
250 | 1016 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
251 | 1017 | exit | ||
252 | 1018 | } | ||
253 | 1019 | test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } | ||
254 | 1020 | ;; | ||
255 | 980 | i*86:DYNIX/ptx:4*:*) | 1021 | i*86:DYNIX/ptx:4*:*) |
256 | 981 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 1022 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
257 | 982 | # earlier versions are messed up and put the nodename in both | 1023 | # earlier versions are messed up and put the nodename in both |
258 | @@ -1206,16 +1247,6 @@ | |||
259 | 1206 | *:Darwin:*:*) | 1247 | *:Darwin:*:*) |
260 | 1207 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1248 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
261 | 1208 | case $UNAME_PROCESSOR in | 1249 | case $UNAME_PROCESSOR in |
262 | 1209 | i386) | ||
263 | 1210 | eval $set_cc_for_build | ||
264 | 1211 | if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then | ||
265 | 1212 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ | ||
266 | 1213 | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ | ||
267 | 1214 | grep IS_64BIT_ARCH >/dev/null | ||
268 | 1215 | then | ||
269 | 1216 | UNAME_PROCESSOR="x86_64" | ||
270 | 1217 | fi | ||
271 | 1218 | fi ;; | ||
272 | 1219 | unknown) UNAME_PROCESSOR=powerpc ;; | 1250 | unknown) UNAME_PROCESSOR=powerpc ;; |
273 | 1220 | esac | 1251 | esac |
274 | 1221 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1252 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
275 | 1222 | 1253 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
281 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
282 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
284 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
285 | 5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
286 | 6 | 6 | ||
288 | 7 | timestamp='2010-01-22' | 7 | timestamp='2009-06-11' |
289 | 8 | 8 | ||
290 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
291 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
292 | @@ -32,16 +32,13 @@ | |||
293 | 32 | 32 | ||
294 | 33 | 33 | ||
295 | 34 | # Please send patches to <config-patches@gnu.org>. Submit a context | 34 | # Please send patches to <config-patches@gnu.org>. Submit a context |
297 | 35 | # diff and a properly formatted GNU ChangeLog entry. | 35 | # diff and a properly formatted ChangeLog entry. |
298 | 36 | # | 36 | # |
299 | 37 | # Configuration subroutine to validate and canonicalize a configuration type. | 37 | # Configuration subroutine to validate and canonicalize a configuration type. |
300 | 38 | # Supply the specified configuration type as an argument. | 38 | # Supply the specified configuration type as an argument. |
301 | 39 | # If it is invalid, we print an error message on stderr and exit with code 1. | 39 | # If it is invalid, we print an error message on stderr and exit with code 1. |
302 | 40 | # Otherwise, we print the canonical config type on stdout and succeed. | 40 | # Otherwise, we print the canonical config type on stdout and succeed. |
303 | 41 | 41 | ||
304 | 42 | # You can get the latest version of this script from: | ||
305 | 43 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD | ||
306 | 44 | |||
307 | 45 | # This file is supposed to be the same for all GNU packages | 42 | # This file is supposed to be the same for all GNU packages |
308 | 46 | # and recognize all the CPU types, system types and aliases | 43 | # and recognize all the CPU types, system types and aliases |
309 | 47 | # that are meaningful with *any* GNU software. | 44 | # that are meaningful with *any* GNU software. |
310 | @@ -75,9 +72,8 @@ | |||
311 | 75 | version="\ | 72 | version="\ |
312 | 76 | GNU config.sub ($timestamp) | 73 | GNU config.sub ($timestamp) |
313 | 77 | 74 | ||
317 | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, | 75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
318 | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free | 76 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
316 | 80 | Software Foundation, Inc. | ||
319 | 81 | 77 | ||
320 | 82 | This is free software; see the source for copying conditions. There is NO | 78 | This is free software; see the source for copying conditions. There is NO |
321 | 83 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
322 | @@ -153,7 +149,7 @@ | |||
323 | 153 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | 149 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
324 | 154 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | 150 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
325 | 155 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | 151 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
327 | 156 | -apple | -axis | -knuth | -cray | -microblaze) | 152 | -apple | -axis | -knuth | -cray) |
328 | 157 | os= | 153 | os= |
329 | 158 | basic_machine=$1 | 154 | basic_machine=$1 |
330 | 159 | ;; | 155 | ;; |
331 | @@ -288,7 +284,6 @@ | |||
332 | 288 | | pdp10 | pdp11 | pj | pjl \ | 284 | | pdp10 | pdp11 | pj | pjl \ |
333 | 289 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 285 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
334 | 290 | | pyramid \ | 286 | | pyramid \ |
335 | 291 | | rx \ | ||
336 | 292 | | score \ | 287 | | score \ |
337 | 293 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 288 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
338 | 294 | | sh64 | sh64le \ | 289 | | sh64 | sh64le \ |
339 | @@ -296,14 +291,13 @@ | |||
340 | 296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 291 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
341 | 297 | | spu | strongarm \ | 292 | | spu | strongarm \ |
342 | 298 | | tahoe | thumb | tic4x | tic80 | tron \ | 293 | | tahoe | thumb | tic4x | tic80 | tron \ |
343 | 299 | | ubicom32 \ | ||
344 | 300 | | v850 | v850e \ | 294 | | v850 | v850e \ |
345 | 301 | | we32k \ | 295 | | we32k \ |
346 | 302 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 296 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
347 | 303 | | z8k | z80) | 297 | | z8k | z80) |
348 | 304 | basic_machine=$basic_machine-unknown | 298 | basic_machine=$basic_machine-unknown |
349 | 305 | ;; | 299 | ;; |
351 | 306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) | 300 | m6811 | m68hc11 | m6812 | m68hc12) |
352 | 307 | # Motorola 68HC11/12. | 301 | # Motorola 68HC11/12. |
353 | 308 | basic_machine=$basic_machine-unknown | 302 | basic_machine=$basic_machine-unknown |
354 | 309 | os=-none | 303 | os=-none |
355 | @@ -346,7 +340,7 @@ | |||
356 | 346 | | lm32-* \ | 340 | | lm32-* \ |
357 | 347 | | m32c-* | m32r-* | m32rle-* \ | 341 | | m32c-* | m32r-* | m32rle-* \ |
358 | 348 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 342 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
360 | 349 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | 343 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
361 | 350 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | 344 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
362 | 351 | | mips16-* \ | 345 | | mips16-* \ |
363 | 352 | | mips64-* | mips64el-* \ | 346 | | mips64-* | mips64el-* \ |
364 | @@ -374,17 +368,15 @@ | |||
365 | 374 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 368 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
366 | 375 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 369 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
367 | 376 | | pyramid-* \ | 370 | | pyramid-* \ |
369 | 377 | | romp-* | rs6000-* | rx-* \ | 371 | | romp-* | rs6000-* \ |
370 | 378 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 372 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
371 | 379 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 373 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
372 | 380 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 374 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
373 | 381 | | sparclite-* \ | 375 | | sparclite-* \ |
374 | 382 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 376 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
375 | 383 | | tahoe-* | thumb-* \ | 377 | | tahoe-* | thumb-* \ |
378 | 384 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | 378 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
377 | 385 | | tile-* | tilegx-* \ | ||
379 | 386 | | tron-* \ | 379 | | tron-* \ |
380 | 387 | | ubicom32-* \ | ||
381 | 388 | | v850-* | v850e-* | vax-* \ | 380 | | v850-* | v850e-* | vax-* \ |
382 | 389 | | we32k-* \ | 381 | | we32k-* \ |
383 | 390 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 382 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
384 | @@ -734,9 +726,6 @@ | |||
385 | 734 | basic_machine=ns32k-utek | 726 | basic_machine=ns32k-utek |
386 | 735 | os=-sysv | 727 | os=-sysv |
387 | 736 | ;; | 728 | ;; |
388 | 737 | microblaze) | ||
389 | 738 | basic_machine=microblaze-xilinx | ||
390 | 739 | ;; | ||
391 | 740 | mingw32) | 729 | mingw32) |
392 | 741 | basic_machine=i386-pc | 730 | basic_machine=i386-pc |
393 | 742 | os=-mingw32 | 731 | os=-mingw32 |
394 | @@ -1087,11 +1076,6 @@ | |||
395 | 1087 | basic_machine=tic6x-unknown | 1076 | basic_machine=tic6x-unknown |
396 | 1088 | os=-coff | 1077 | os=-coff |
397 | 1089 | ;; | 1078 | ;; |
398 | 1090 | # This must be matched before tile*. | ||
399 | 1091 | tilegx*) | ||
400 | 1092 | basic_machine=tilegx-unknown | ||
401 | 1093 | os=-linux-gnu | ||
402 | 1094 | ;; | ||
403 | 1095 | tile*) | 1079 | tile*) |
404 | 1096 | basic_machine=tile-unknown | 1080 | basic_machine=tile-unknown |
405 | 1097 | os=-linux-gnu | 1081 | os=-linux-gnu |
406 | @@ -1263,9 +1247,6 @@ | |||
407 | 1263 | # First match some system type aliases | 1247 | # First match some system type aliases |
408 | 1264 | # that might get confused with valid system types. | 1248 | # that might get confused with valid system types. |
409 | 1265 | # -solaris* is a basic system type, with this one exception. | 1249 | # -solaris* is a basic system type, with this one exception. |
410 | 1266 | -auroraux) | ||
411 | 1267 | os=-auroraux | ||
412 | 1268 | ;; | ||
413 | 1269 | -solaris1 | -solaris1.*) | 1250 | -solaris1 | -solaris1.*) |
414 | 1270 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1251 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
415 | 1271 | ;; | 1252 | ;; |
416 | @@ -1287,8 +1268,8 @@ | |||
417 | 1287 | # -sysv* is not here because it comes later, after sysvr4. | 1268 | # -sysv* is not here because it comes later, after sysvr4. |
418 | 1288 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1269 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
419 | 1289 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1270 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
422 | 1290 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | 1271 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
423 | 1291 | | -sym* | -kopensolaris* \ | 1272 | | -kopensolaris* \ |
424 | 1292 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | 1273 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
425 | 1293 | | -aos* | -aros* \ | 1274 | | -aos* | -aros* \ |
426 | 1294 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1275 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
427 | @@ -1309,7 +1290,7 @@ | |||
428 | 1309 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1290 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
429 | 1310 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1291 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
430 | 1311 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1292 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
432 | 1312 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) | 1293 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
433 | 1313 | # Remember, each alternative MUST END IN *, to match a version number. | 1294 | # Remember, each alternative MUST END IN *, to match a version number. |
434 | 1314 | ;; | 1295 | ;; |
435 | 1315 | -qnx*) | 1296 | -qnx*) |
436 | @@ -1442,8 +1423,6 @@ | |||
437 | 1442 | -dicos*) | 1423 | -dicos*) |
438 | 1443 | os=-dicos | 1424 | os=-dicos |
439 | 1444 | ;; | 1425 | ;; |
440 | 1445 | -nacl*) | ||
441 | 1446 | ;; | ||
442 | 1447 | -none) | 1426 | -none) |
443 | 1448 | ;; | 1427 | ;; |
444 | 1449 | *) | 1428 | *) |
445 | 1450 | 1429 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
451 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
453 | 3 | # Generated by GNU Autoconf 2.67 for evolution-indicator 0.2.12. | 3 | # Generated by GNU Autoconf 2.67 for evolution-indicator 0.2.14. |
454 | 4 | # | 4 | # |
455 | 5 | # | 5 | # |
456 | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 6 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
457 | @@ -698,8 +698,8 @@ | |||
458 | 698 | # Identity of this package. | 698 | # Identity of this package. |
459 | 699 | PACKAGE_NAME='evolution-indicator' | 699 | PACKAGE_NAME='evolution-indicator' |
460 | 700 | PACKAGE_TARNAME='evolution-indicator' | 700 | PACKAGE_TARNAME='evolution-indicator' |
463 | 701 | PACKAGE_VERSION='0.2.12' | 701 | PACKAGE_VERSION='0.2.14' |
464 | 702 | PACKAGE_STRING='evolution-indicator 0.2.12' | 702 | PACKAGE_STRING='evolution-indicator 0.2.14' |
465 | 703 | PACKAGE_BUGREPORT='' | 703 | PACKAGE_BUGREPORT='' |
466 | 704 | PACKAGE_URL='' | 704 | PACKAGE_URL='' |
467 | 705 | 705 | ||
468 | @@ -1484,7 +1484,7 @@ | |||
469 | 1484 | # Omit some internal or obsolete options to make the list less imposing. | 1484 | # Omit some internal or obsolete options to make the list less imposing. |
470 | 1485 | # This message is too long to be a string in the A/UX 3.1 sh. | 1485 | # This message is too long to be a string in the A/UX 3.1 sh. |
471 | 1486 | cat <<_ACEOF | 1486 | cat <<_ACEOF |
473 | 1487 | \`configure' configures evolution-indicator 0.2.12 to adapt to many kinds of systems. | 1487 | \`configure' configures evolution-indicator 0.2.14 to adapt to many kinds of systems. |
474 | 1488 | 1488 | ||
475 | 1489 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1489 | Usage: $0 [OPTION]... [VAR=VALUE]... |
476 | 1490 | 1490 | ||
477 | @@ -1555,7 +1555,7 @@ | |||
478 | 1555 | 1555 | ||
479 | 1556 | if test -n "$ac_init_help"; then | 1556 | if test -n "$ac_init_help"; then |
480 | 1557 | case $ac_init_help in | 1557 | case $ac_init_help in |
482 | 1558 | short | recursive ) echo "Configuration of evolution-indicator 0.2.12:";; | 1558 | short | recursive ) echo "Configuration of evolution-indicator 0.2.14:";; |
483 | 1559 | esac | 1559 | esac |
484 | 1560 | cat <<\_ACEOF | 1560 | cat <<\_ACEOF |
485 | 1561 | 1561 | ||
486 | @@ -1675,7 +1675,7 @@ | |||
487 | 1675 | test -n "$ac_init_help" && exit $ac_status | 1675 | test -n "$ac_init_help" && exit $ac_status |
488 | 1676 | if $ac_init_version; then | 1676 | if $ac_init_version; then |
489 | 1677 | cat <<\_ACEOF | 1677 | cat <<\_ACEOF |
491 | 1678 | evolution-indicator configure 0.2.12 | 1678 | evolution-indicator configure 0.2.14 |
492 | 1679 | generated by GNU Autoconf 2.67 | 1679 | generated by GNU Autoconf 2.67 |
493 | 1680 | 1680 | ||
494 | 1681 | Copyright (C) 2010 Free Software Foundation, Inc. | 1681 | Copyright (C) 2010 Free Software Foundation, Inc. |
495 | @@ -2040,7 +2040,7 @@ | |||
496 | 2040 | This file contains any messages produced by compilers while | 2040 | This file contains any messages produced by compilers while |
497 | 2041 | running configure, to aid debugging if configure makes a mistake. | 2041 | running configure, to aid debugging if configure makes a mistake. |
498 | 2042 | 2042 | ||
500 | 2043 | It was created by evolution-indicator $as_me 0.2.12, which was | 2043 | It was created by evolution-indicator $as_me 0.2.14, which was |
501 | 2044 | generated by GNU Autoconf 2.67. Invocation command line was | 2044 | generated by GNU Autoconf 2.67. Invocation command line was |
502 | 2045 | 2045 | ||
503 | 2046 | $ $0 $@ | 2046 | $ $0 $@ |
504 | @@ -2855,7 +2855,7 @@ | |||
505 | 2855 | 2855 | ||
506 | 2856 | # Define the identity of the package. | 2856 | # Define the identity of the package. |
507 | 2857 | PACKAGE='evolution-indicator' | 2857 | PACKAGE='evolution-indicator' |
509 | 2858 | VERSION='0.2.12' | 2858 | VERSION='0.2.14' |
510 | 2859 | 2859 | ||
511 | 2860 | 2860 | ||
512 | 2861 | cat >>confdefs.h <<_ACEOF | 2861 | cat >>confdefs.h <<_ACEOF |
513 | @@ -12789,7 +12789,7 @@ | |||
514 | 12789 | pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" | 12789 | pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS" |
515 | 12790 | elif test -n "$PKG_CONFIG"; then | 12790 | elif test -n "$PKG_CONFIG"; then |
516 | 12791 | if test -n "$PKG_CONFIG" && \ | 12791 | if test -n "$PKG_CONFIG" && \ |
518 | 12792 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate >= 0.3.0 | 12792 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.5 >= 0.4.91 |
519 | 12793 | evolution-plugin | 12793 | evolution-plugin |
520 | 12794 | dbus-1 | 12794 | dbus-1 |
521 | 12795 | dbus-glib-1 | 12795 | dbus-glib-1 |
522 | @@ -12797,7 +12797,7 @@ | |||
523 | 12797 | libcanberra | 12797 | libcanberra |
524 | 12798 | gtkhtml-editor-3.14 | 12798 | gtkhtml-editor-3.14 |
525 | 12799 | \""; } >&5 | 12799 | \""; } >&5 |
527 | 12800 | ($PKG_CONFIG --exists --print-errors "indicate >= 0.3.0 | 12800 | ($PKG_CONFIG --exists --print-errors "indicate-0.5 >= 0.4.91 |
528 | 12801 | evolution-plugin | 12801 | evolution-plugin |
529 | 12802 | dbus-1 | 12802 | dbus-1 |
530 | 12803 | dbus-glib-1 | 12803 | dbus-glib-1 |
531 | @@ -12808,7 +12808,7 @@ | |||
532 | 12808 | ac_status=$? | 12808 | ac_status=$? |
533 | 12809 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 12809 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
534 | 12810 | test $ac_status = 0; }; then | 12810 | test $ac_status = 0; }; then |
536 | 12811 | pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "indicate >= 0.3.0 | 12811 | pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "indicate-0.5 >= 0.4.91 |
537 | 12812 | evolution-plugin | 12812 | evolution-plugin |
538 | 12813 | dbus-1 | 12813 | dbus-1 |
539 | 12814 | dbus-glib-1 | 12814 | dbus-glib-1 |
540 | @@ -12826,7 +12826,7 @@ | |||
541 | 12826 | pkg_cv_DEPS_LIBS="$DEPS_LIBS" | 12826 | pkg_cv_DEPS_LIBS="$DEPS_LIBS" |
542 | 12827 | elif test -n "$PKG_CONFIG"; then | 12827 | elif test -n "$PKG_CONFIG"; then |
543 | 12828 | if test -n "$PKG_CONFIG" && \ | 12828 | if test -n "$PKG_CONFIG" && \ |
545 | 12829 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate >= 0.3.0 | 12829 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"indicate-0.5 >= 0.4.91 |
546 | 12830 | evolution-plugin | 12830 | evolution-plugin |
547 | 12831 | dbus-1 | 12831 | dbus-1 |
548 | 12832 | dbus-glib-1 | 12832 | dbus-glib-1 |
549 | @@ -12834,7 +12834,7 @@ | |||
550 | 12834 | libcanberra | 12834 | libcanberra |
551 | 12835 | gtkhtml-editor-3.14 | 12835 | gtkhtml-editor-3.14 |
552 | 12836 | \""; } >&5 | 12836 | \""; } >&5 |
554 | 12837 | ($PKG_CONFIG --exists --print-errors "indicate >= 0.3.0 | 12837 | ($PKG_CONFIG --exists --print-errors "indicate-0.5 >= 0.4.91 |
555 | 12838 | evolution-plugin | 12838 | evolution-plugin |
556 | 12839 | dbus-1 | 12839 | dbus-1 |
557 | 12840 | dbus-glib-1 | 12840 | dbus-glib-1 |
558 | @@ -12845,7 +12845,7 @@ | |||
559 | 12845 | ac_status=$? | 12845 | ac_status=$? |
560 | 12846 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 12846 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
561 | 12847 | test $ac_status = 0; }; then | 12847 | test $ac_status = 0; }; then |
563 | 12848 | pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "indicate >= 0.3.0 | 12848 | pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "indicate-0.5 >= 0.4.91 |
564 | 12849 | evolution-plugin | 12849 | evolution-plugin |
565 | 12850 | dbus-1 | 12850 | dbus-1 |
566 | 12851 | dbus-glib-1 | 12851 | dbus-glib-1 |
567 | @@ -12872,7 +12872,7 @@ | |||
568 | 12872 | _pkg_short_errors_supported=no | 12872 | _pkg_short_errors_supported=no |
569 | 12873 | fi | 12873 | fi |
570 | 12874 | if test $_pkg_short_errors_supported = yes; then | 12874 | if test $_pkg_short_errors_supported = yes; then |
572 | 12875 | DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicate >= 0.3.0 | 12875 | DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "indicate-0.5 >= 0.4.91 |
573 | 12876 | evolution-plugin | 12876 | evolution-plugin |
574 | 12877 | dbus-1 | 12877 | dbus-1 |
575 | 12878 | dbus-glib-1 | 12878 | dbus-glib-1 |
576 | @@ -12881,7 +12881,7 @@ | |||
577 | 12881 | gtkhtml-editor-3.14 | 12881 | gtkhtml-editor-3.14 |
578 | 12882 | " 2>&1` | 12882 | " 2>&1` |
579 | 12883 | else | 12883 | else |
581 | 12884 | DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicate >= 0.3.0 | 12884 | DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "indicate-0.5 >= 0.4.91 |
582 | 12885 | evolution-plugin | 12885 | evolution-plugin |
583 | 12886 | dbus-1 | 12886 | dbus-1 |
584 | 12887 | dbus-glib-1 | 12887 | dbus-glib-1 |
585 | @@ -12893,7 +12893,7 @@ | |||
586 | 12893 | # Put the nasty error message in config.log where it belongs | 12893 | # Put the nasty error message in config.log where it belongs |
587 | 12894 | echo "$DEPS_PKG_ERRORS" >&5 | 12894 | echo "$DEPS_PKG_ERRORS" >&5 |
588 | 12895 | 12895 | ||
590 | 12896 | as_fn_error $? "Package requirements (indicate >= 0.3.0 | 12896 | as_fn_error $? "Package requirements (indicate-0.5 >= 0.4.91 |
591 | 12897 | evolution-plugin | 12897 | evolution-plugin |
592 | 12898 | dbus-1 | 12898 | dbus-1 |
593 | 12899 | dbus-glib-1 | 12899 | dbus-glib-1 |
594 | @@ -13475,7 +13475,7 @@ | |||
595 | 13475 | # report actual input values of CONFIG_FILES etc. instead of their | 13475 | # report actual input values of CONFIG_FILES etc. instead of their |
596 | 13476 | # values after options handling. | 13476 | # values after options handling. |
597 | 13477 | ac_log=" | 13477 | ac_log=" |
599 | 13478 | This file was extended by evolution-indicator $as_me 0.2.12, which was | 13478 | This file was extended by evolution-indicator $as_me 0.2.14, which was |
600 | 13479 | generated by GNU Autoconf 2.67. Invocation command line was | 13479 | generated by GNU Autoconf 2.67. Invocation command line was |
601 | 13480 | 13480 | ||
602 | 13481 | CONFIG_FILES = $CONFIG_FILES | 13481 | CONFIG_FILES = $CONFIG_FILES |
603 | @@ -13541,7 +13541,7 @@ | |||
604 | 13541 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 13541 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
605 | 13542 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 13542 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
606 | 13543 | ac_cs_version="\\ | 13543 | ac_cs_version="\\ |
608 | 13544 | evolution-indicator config.status 0.2.12 | 13544 | evolution-indicator config.status 0.2.14 |
609 | 13545 | configured by $0, generated by GNU Autoconf 2.67, | 13545 | configured by $0, generated by GNU Autoconf 2.67, |
610 | 13546 | with options \\"\$ac_cs_config\\" | 13546 | with options \\"\$ac_cs_config\\" |
611 | 13547 | 13547 | ||
612 | 13548 | 13548 | ||
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 | 1 | AC_PREREQ(2.53) | 1 | AC_PREREQ(2.53) |
619 | 2 | AC_INIT(evolution-indicator, 0.2.12, []) | 2 | AC_INIT(evolution-indicator, 0.2.14, []) |
620 | 3 | AM_INIT_AUTOMAKE() | 3 | AM_INIT_AUTOMAKE() |
621 | 4 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | 4 | m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
622 | 5 | AC_CONFIG_SRCDIR(src/evolution-indicator.c) | 5 | AC_CONFIG_SRCDIR(src/evolution-indicator.c) |
623 | @@ -59,7 +59,7 @@ | |||
624 | 59 | AC_SUBST(GCC_FLAGS) | 59 | AC_SUBST(GCC_FLAGS) |
625 | 60 | 60 | ||
626 | 61 | PKG_CHECK_MODULES(DEPS, | 61 | PKG_CHECK_MODULES(DEPS, |
628 | 62 | indicate >= 0.3.0 | 62 | indicate-0.5 >= 0.4.91 |
629 | 63 | evolution-plugin | 63 | evolution-plugin |
630 | 64 | dbus-1 | 64 | dbus-1 |
631 | 65 | dbus-glib-1 | 65 | dbus-glib-1 |
632 | 66 | 66 | ||
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 | 1 | evolution-indicator (0.2.14-0ubuntu1~ppa1) natty; urgency=low | ||
638 | 2 | |||
639 | 3 | * New upstream release. | ||
640 | 4 | * Port to new libindicate | ||
641 | 5 | |||
642 | 6 | -- Ted Gould <ted@ubuntu.com> Fri, 14 Jan 2011 14:44:52 -0600 | ||
643 | 7 | |||
644 | 1 | evolution-indicator (0.2.12-0ubuntu1) natty; urgency=low | 8 | evolution-indicator (0.2.12-0ubuntu1) natty; urgency=low |
645 | 2 | 9 | ||
646 | 3 | * New upstream release: | 10 | * New upstream release: |
Approve