Ubuntu
libmatekbd package

Merge lp:~noskcaj/ubuntu/trusty/libmatekbd/1.6.2 into lp:ubuntu/trusty/libmatekbd

  1. Trusty (14.04)
  2. 1.6.2
  3. Merge into trusty
Proposed by Jackson Doak
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~noskcaj/ubuntu/trusty/libmatekbd/1.6.2
Merge into: lp:ubuntu/trusty/libmatekbd
Diff against target: 2137 lines (+1044/-362)
22 files modified
ChangeLog (+345/-279)
INSTALL (+2/-2)
Makefile.in (+13/-6)
aclocal.m4 (+116/-6)
compile (+347/-0)
config.guess (+7/-1)
config.sub (+8/-5)
configure (+170/-11)
configure.ac (+1/-1)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/libmatekbd4.symbols (+0/-1)
libmatekbd/Makefile.in (+3/-3)
libmatekbd/matekbd-indicator-config.c (+2/-12)
libmatekbd/matekbd-indicator-config.h (+0/-1)
libmatekbd/matekbd-keyboard-drawing.c (+8/-0)
libmatekbd/matekbd-status.c (+2/-16)
libmatekbd/matekbd.convert (+0/-1)
libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in (+4/-9)
ltmain.sh (+2/-2)
missing (+2/-2)
test/Makefile.in (+3/-3)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/trusty/libmatekbd/1.6.2
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+212297@code.launchpad.net

Description of the change

New upstream bugfix release.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

https://launchpad.net/ubuntu/trusty/+source/libmatekbd/1.7.1.is.1.6.2-0ubuntu1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-10-14 23:08:20 +0000
3+++ ChangeLog 2014-03-22 20:17:18 +0000
4@@ -1,10 +1,69 @@
5+commit 3d6344fdd8bb22eca3f5f49031454f27bdf74eef
6+Author: Stefano Karapetsas <stefano@karapetsas.com>
7+Date: Wed Jan 1 14:13:40 2014 +0100
8+
9+ Bump version to 1.6.2
10+
11+ configure.ac | 2 +-
12+ 1 file changed, 1 insertion(+), 1 deletion(-)
13+
14+commit 45a1153edb7cb7c69b6f8201addfa6007182e3ae
15+Author: romovs <romovs@gmail.com>
16+Date: Sat Aug 24 14:57:25 2013 +0300
17+
18+ improved indicator font customization
19+
20+ libmatekbd/matekbd-indicator-config.c | 14 ++------------
21+ libmatekbd/matekbd-indicator-config.h | 1 -
22+ libmatekbd/matekbd-status.c | 18 ++----------------
23+ libmatekbd/matekbd.convert | 1 -
24+ ...org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 13 ++++---------
25+ 5 files changed, 8 insertions(+), 39 deletions(-)
26+
27+commit 2e9a5504af1b224b852f1d70ccf75810612eaf3f
28+Author: Stefano Karapetsas <stefano@karapetsas.com>
29+Date: Wed Jul 17 16:00:13 2013 +0200
30+
31+ Remove obsolete distro folder
32+
33+ distro/archlinux/PKGBUILD | 32 --------------------------------
34+ distro/archlinux/libmatekbd.install | 17 -----------------
35+ distro/ubuntu/build | 27 ---------------------------
36+ distro/ubuntu/postinst | 9 ---------
37+ distro/ubuntu/postrm | 6 ------
38+ distro/ubuntu/preinst | 8 --------
39+ distro/ubuntu/prerm | 11 -----------
40+ 7 files changed, 110 deletions(-)
41+
42+commit 85f870a9b42216e658e31ef4451f60eb9c65a69a
43+Merge: 1e723b7 062c52e
44+Author: Stefano Karapetsas <stefano@karapetsas.com>
45+Date: Wed Nov 20 03:52:15 2013 -0800
46+
47+ Merge pull request #12 from infirit/1.6
48+
49+ explicit declaration of internal libxklavier functions
50+
51+commit 062c52e3d35b68b892c0047961d305d0d3cedc05
52+Author: infirit <infirit@gmail.com>
53+Date: Mon Nov 18 15:23:03 2013 +0100
54+
55+ explicit declaration of internal libxklavier functions
56+
57+ from lingnomekbd:
58+ https://git.gnome.org/browse/libgnomekbd/commit/?id=18332fedc6a24e4efeecfdc78a006140c667568a
59+ https://bugzilla.gnome.org/show_bug.cgi?id=643754
60+
61+ libmatekbd/matekbd-keyboard-drawing.c | 8 ++++++++
62+ 1 file changed, 8 insertions(+)
63+
64 commit 1e723b72fe039940825630b0cc0935b0e80946a4
65 Author: Stefano Karapetsas <stefano@karapetsas.com>
66 Date: Sun Jun 23 20:06:28 2013 +0200
67
68 Bump version to 1.6.1
69
70- configure.ac | 2 +-
71+ configure.ac | 2 +-
72 1 file changed, 1 insertion(+), 1 deletion(-)
73
74 commit ea5b148dc56e6d8a84b2e857b3c6343253c67c6e
75@@ -13,9 +72,9 @@
76
77 Fixes to use make dist
78
79- configure.ac | 2 +-
80- libmatekbd/Makefile.am | 4 +++-
81- po/POTFILES.in | 2 +-
82+ configure.ac | 2 +-
83+ libmatekbd/Makefile.am | 4 +++-
84+ po/POTFILES.in | 2 +-
85 3 files changed, 5 insertions(+), 3 deletions(-)
86
87 commit 8f377d99f9ff5bcb3328e9f0615b86811bbf0379
88@@ -24,7 +83,7 @@
89
90 Fix previous commit typo in schema
91
92- libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 4 ++--
93+ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 4 ++--
94 1 file changed, 2 insertions(+), 2 deletions(-)
95
96 commit 24dec90f9c2235c3e7c01998a524489cebc919f1
97@@ -33,7 +92,7 @@
98
99 Add missing keys in GSettings schema
100
101- .../org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 ++++++++++
102+ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 ++++++++++
103 1 file changed, 10 insertions(+)
104
105 commit b8ea69f04ca37619456242782608fa4dcb4261b4
106@@ -42,7 +101,7 @@
107
108 Group concensus: just delete unused code; git log stores it
109
110- libmatekbd/matekbd-indicator.c | 6 ------
111+ libmatekbd/matekbd-indicator.c | 6 ------
112 1 file changed, 6 deletions(-)
113
114 commit 79c44785180728fb53b2a7cc9b9512619fe45a79
115@@ -51,9 +110,9 @@
116
117 Clean up compile, fix bug with handling variants. Closes #8
118
119- libmatekbd/matekbd-indicator.c | 8 +++++---
120- libmatekbd/matekbd-status.c | 6 +++---
121- test/matekbd-status-test.c | 5 +++++
122+ libmatekbd/matekbd-indicator.c | 8 +++++---
123+ libmatekbd/matekbd-status.c | 6 +++---
124+ test/matekbd-status-test.c | 5 +++++
125 3 files changed, 13 insertions(+), 6 deletions(-)
126
127 commit d8ff65934543f6e9f2220e8d95b73cd21307f937
128@@ -62,7 +121,7 @@
129
130 Bump version to 1.6.0
131
132- configure.ac | 6 +++---
133+ configure.ac | 6 +++---
134 1 file changed, 3 insertions(+), 3 deletions(-)
135
136 commit 2b2898dc895dcfc12a0911105bb8877490c56cc8
137@@ -71,12 +130,12 @@
138
139 Sync translations with transifex
140
141- po/LINGUAS | 2 +
142- po/am.po | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
143- po/ast.po | 238 +++++++++++++++++++++++++-----------------------
144- po/en_AU.po | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
145- po/gl.po | 234 +++++++++++++++++++++++------------------------
146- po/ru.po | 228 ++++++++++++++++++++++------------------------
147+ po/LINGUAS | 2 +
148+ po/am.po | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
149+ po/ast.po | 238 ++++++++++++++++++++++++++-----------------------
150+ po/en_AU.po | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
151+ po/gl.po | 234 +++++++++++++++++++++++-------------------------
152+ po/ru.po | 228 +++++++++++++++++++++++------------------------
153 6 files changed, 930 insertions(+), 351 deletions(-)
154
155 commit d3b2d7ceef86f54b9c1b9fc6fed237f4b3e3af1e
156@@ -85,7 +144,7 @@
157
158 Add transifex configuration file
159
160- .tx/config | 7 +++++++
161+ .tx/config | 7 +++++++
162 1 file changed, 7 insertions(+)
163
164 commit 6be8b86cbb299f031f8e941c803c035bcd4d3b72
165@@ -94,7 +153,7 @@
166
167 Add empty ChangeLog to allow build from git
168
169- ChangeLog | 2 ++
170+ ChangeLog | 2 ++
171 1 file changed, 2 insertions(+)
172
173 commit 67bc81144fcc687c9a14dee2ffb49da413d0d16b
174@@ -103,7 +162,7 @@
175
176 "Removed ChangeLog"
177
178- ChangeLog | 270 -------------------------------------------------------------
179+ ChangeLog | 270 --------------------------------------------------------------
180 1 file changed, 270 deletions(-)
181
182 commit 12375f6ac965f580b83bf88790275e368af13301
183@@ -112,7 +171,7 @@
184
185 Bump version to 1.5.1
186
187- configure.ac | 2 +-
188+ configure.ac | 2 +-
189 1 file changed, 1 insertion(+), 1 deletion(-)
190
191 commit 504fcbcb537510facb95aba1ff054cc7e887270b
192@@ -130,7 +189,7 @@
193
194 AC_CONFIG_HEADERS to please automake 1.13
195
196- configure.ac | 2 +-
197+ configure.ac | 2 +-
198 1 file changed, 1 insertion(+), 1 deletion(-)
199
200 commit f579a6f5b230c64698e142c0836f5c1d847a493f
201@@ -148,7 +207,7 @@
202
203 Fix /desktop/ gschema path deprecation
204
205- .../org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 +++++-----
206+ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 +++++-----
207 1 file changed, 5 insertions(+), 5 deletions(-)
208
209 commit eca64b3e16a949120e22b2299c98c1fae4f18043
210@@ -159,9 +218,9 @@
211
212 aclocal-1.12: warning: autoconf input should be named 'configure.ac', not 'configure.in'
213
214- autogen.sh | 2 +-
215- configure.ac | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
216- configure.in | 136 ----------------------------------------------------------
217+ autogen.sh | 2 +-
218+ configure.ac | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
219+ configure.in | 136 -----------------------------------------------------------
220 3 files changed, 137 insertions(+), 137 deletions(-)
221
222 commit 958dec506a68e41df432b1aa91c1ad229137e758
223@@ -179,8 +238,8 @@
224
225 Add mateconf-gsettings-data-convert file
226
227- libmatekbd/Makefile.am | 5 ++++-
228- libmatekbd/matekbd.convert | 28 ++++++++++++++++++++++++++++
229+ libmatekbd/Makefile.am | 5 ++++-
230+ libmatekbd/matekbd.convert | 28 ++++++++++++++++++++++++++++
231 2 files changed, 32 insertions(+), 1 deletion(-)
232
233 commit 18039cef0df9bcb34ad8a2a41aa221c76471751f
234@@ -189,24 +248,24 @@
235
236 fixed incorrect fsf addresses.
237
238- libmatekbd/matekbd-config-private.h | 4 ++--
239- libmatekbd/matekbd-desktop-config.c | 4 ++--
240- libmatekbd/matekbd-desktop-config.h | 4 ++--
241- libmatekbd/matekbd-indicator-config.c | 4 ++--
242- libmatekbd/matekbd-indicator-config.h | 4 ++--
243- libmatekbd/matekbd-indicator.c | 4 ++--
244- libmatekbd/matekbd-indicator.h | 4 ++--
245- libmatekbd/matekbd-keyboard-config.c | 4 ++--
246- libmatekbd/matekbd-keyboard-config.h | 4 ++--
247- libmatekbd/matekbd-keyboard-drawing.c | 4 ++--
248- libmatekbd/matekbd-keyboard-drawing.h | 4 ++--
249- libmatekbd/matekbd-status.c | 4 ++--
250- libmatekbd/matekbd-status.h | 4 ++--
251- libmatekbd/matekbd-util.c | 4 ++--
252- libmatekbd/matekbd-util.h | 4 ++--
253- test/matekbd-indicator-test.c | 4 ++--
254- test/matekbd-keyboard-drawing-test.c | 4 ++--
255- test/matekbd-status-test.c | 4 ++--
256+ libmatekbd/matekbd-config-private.h | 4 ++--
257+ libmatekbd/matekbd-desktop-config.c | 4 ++--
258+ libmatekbd/matekbd-desktop-config.h | 4 ++--
259+ libmatekbd/matekbd-indicator-config.c | 4 ++--
260+ libmatekbd/matekbd-indicator-config.h | 4 ++--
261+ libmatekbd/matekbd-indicator.c | 4 ++--
262+ libmatekbd/matekbd-indicator.h | 4 ++--
263+ libmatekbd/matekbd-keyboard-config.c | 4 ++--
264+ libmatekbd/matekbd-keyboard-config.h | 4 ++--
265+ libmatekbd/matekbd-keyboard-drawing.c | 4 ++--
266+ libmatekbd/matekbd-keyboard-drawing.h | 4 ++--
267+ libmatekbd/matekbd-status.c | 4 ++--
268+ libmatekbd/matekbd-status.h | 4 ++--
269+ libmatekbd/matekbd-util.c | 4 ++--
270+ libmatekbd/matekbd-util.h | 4 ++--
271+ test/matekbd-indicator-test.c | 4 ++--
272+ test/matekbd-keyboard-drawing-test.c | 4 ++--
273+ test/matekbd-status-test.c | 4 ++--
274 18 files changed, 36 insertions(+), 36 deletions(-)
275
276 commit 64b95dd0aeb98811412b1ff3f6f623e39f84ee7d
277@@ -224,7 +283,7 @@
278
279 add COPYING lgplv2
280
281- COPYING | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
282+ COPYING | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
283 1 file changed, 502 insertions(+)
284
285 commit edd896f6e4928d0fd1ea53a267f27e976bf2d401
286@@ -233,7 +292,7 @@
287
288 remove COPYING.LIB
289
290- COPYING.LIB | 481 -----------------------------------------------------------
291+ COPYING.LIB | 481 ------------------------------------------------------------
292 1 file changed, 481 deletions(-)
293
294 commit 0a8b47229c6b453556a40b30c84db8f238e3b887
295@@ -242,9 +301,9 @@
296
297 add internationalization support for gsettings schema
298
299- libmatekbd/Makefile.am | 16 +--
300- .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 --------------------
301- ...mate.peripherals-keyboard-xkb.gschema.xml.in.in | 119 ++++++++++++++++++++
302+ libmatekbd/Makefile.am | 16 +--
303+ .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 ---------------------
304+ ...mate.peripherals-keyboard-xkb.gschema.xml.in.in | 119 +++++++++++++++++++++
305 3 files changed, 128 insertions(+), 126 deletions(-)
306
307 commit 4900d39a6b133939af115e188d4010731426848d
308@@ -253,7 +312,7 @@
309
310 fix schema name
311
312- libmatekbd/matekbd-desktop-config.c | 2 +-
313+ libmatekbd/matekbd-desktop-config.c | 2 +-
314 1 file changed, 1 insertion(+), 1 deletion(-)
315
316 commit 74e8c123722068886a8b12872601b14f5cc3bbe9
317@@ -262,35 +321,35 @@
318
319 migrate to gsettings
320
321- Makefile.am | 2 +-
322- NEWS | 10 +
323- capplet/Makefile.am | 46 --
324- capplet/matekbd-indicator-plugins-add.c | 207 --------
325- capplet/matekbd-indicator-plugins-capplet.c | 490 ------------------
326- ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 -
327- capplet/matekbd-indicator-plugins-capplet.h | 63 ---
328- capplet/matekbd-indicator-plugins.ui | 255 ---------
329- capplet/matekbd-indicator-plugins_add.ui | 142 ------
330- configure.in | 22 +-
331- libmatekbd.pc.in | 2 +-
332- libmatekbd/Makefile.am | 29 +-
333- ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 ----------
334- libmatekbd/matekbd-config-private.h | 30 +-
335- libmatekbd/matekbd-desktop-config.c | 198 ++-----
336- libmatekbd/matekbd-desktop-config.h | 12 +-
337- libmatekbd/matekbd-indicator-config.c | 204 ++------
338- libmatekbd/matekbd-indicator-config.h | 13 +-
339- libmatekbd/matekbd-indicator-plugin-manager.c | 406 ---------------
340- libmatekbd/matekbd-indicator-plugin-manager.h | 116 -----
341- libmatekbd/matekbd-indicator-plugin.h | 125 -----
342- libmatekbd/matekbd-indicator.c | 95 +---
343- libmatekbd/matekbd-keyboard-config.c | 539 +++++++++-----------
344- libmatekbd/matekbd-keyboard-config.h | 22 +-
345- libmatekbd/matekbd-status.c | 40 +-
346- libmatekbd/matekbd-util.c | 118 ++---
347- libmatekbd/matekbd-util.h | 3 +
348- .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 +++++
349- po/POTFILES.in | 6 -
350+ Makefile.am | 2 +-
351+ NEWS | 10 +
352+ capplet/Makefile.am | 46 --
353+ capplet/matekbd-indicator-plugins-add.c | 207 --------
354+ capplet/matekbd-indicator-plugins-capplet.c | 490 -------------------
355+ ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 -
356+ capplet/matekbd-indicator-plugins-capplet.h | 63 ---
357+ capplet/matekbd-indicator-plugins.ui | 255 ----------
358+ capplet/matekbd-indicator-plugins_add.ui | 142 ------
359+ configure.in | 22 +-
360+ libmatekbd.pc.in | 2 +-
361+ libmatekbd/Makefile.am | 29 +-
362+ ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 -----------
363+ libmatekbd/matekbd-config-private.h | 30 +-
364+ libmatekbd/matekbd-desktop-config.c | 198 ++------
365+ libmatekbd/matekbd-desktop-config.h | 12 +-
366+ libmatekbd/matekbd-indicator-config.c | 204 ++------
367+ libmatekbd/matekbd-indicator-config.h | 13 +-
368+ libmatekbd/matekbd-indicator-plugin-manager.c | 406 ----------------
369+ libmatekbd/matekbd-indicator-plugin-manager.h | 116 -----
370+ libmatekbd/matekbd-indicator-plugin.h | 125 -----
371+ libmatekbd/matekbd-indicator.c | 95 +---
372+ libmatekbd/matekbd-keyboard-config.c | 539 ++++++++++-----------
373+ libmatekbd/matekbd-keyboard-config.h | 22 +-
374+ libmatekbd/matekbd-status.c | 40 +-
375+ libmatekbd/matekbd-util.c | 118 ++---
376+ libmatekbd/matekbd-util.h | 3 +
377+ .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 +++++
378+ po/POTFILES.in | 6 -
379 29 files changed, 594 insertions(+), 3012 deletions(-)
380
381 commit 35c8125877e60b0c3279dd15b26bf0e85df5b136
382@@ -314,8 +373,8 @@
383
384 Signed-off-by: Steev Klimaszewski <steev@gentoo.org>
385
386- configure.in | 2 ++
387- libmatekbd/Makefile.am | 2 ++
388+ configure.in | 2 ++
389+ libmatekbd/Makefile.am | 2 ++
390 2 files changed, 4 insertions(+)
391
392 commit f0dfa44f76c332b529d5c67ef8b2ba4639cddb09
393@@ -328,7 +387,7 @@
394
395 Signed-off-by: Steev Klimaszewski <steev@gentoo.org>
396
397- configure.in | 2 ++
398+ configure.in | 2 ++
399 1 file changed, 2 insertions(+)
400
401 commit 3527f5115ef526a0d77fad0ce63156650d4281be
402@@ -337,8 +396,8 @@
403
404 prepare 1.4.0
405
406- ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
407- configure.in | 2 +-
408+ ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
409+ configure.in | 2 +-
410 2 files changed, 47 insertions(+), 5 deletions(-)
411
412 commit 1d5fd9ac44c85562e391c9be0b77d03c2486674c
413@@ -347,8 +406,8 @@
414
415 sync translations with transifex
416
417- po/eu.po | 231 +++++++++++++++++++++++++++--------------------------
418- po/tr.po | 269 ++++++++++++++++++++++++++++++++++----------------------------
419+ po/eu.po | 231 ++++++++++++++++++++++++++++--------------------------
420+ po/tr.po | 269 ++++++++++++++++++++++++++++++++++-----------------------------
421 2 files changed, 267 insertions(+), 233 deletions(-)
422
423 commit efc767078c299c0ea67e890ab0ad46e36ea262aa
424@@ -357,7 +416,7 @@
425
426 add po gnome copyrights file
427
428- po/gnome-copyrights.txt | 732 +++++++++++++++++++++++++++++++++++++++++++++++
429+ po/gnome-copyrights.txt | 732 ++++++++++++++++++++++++++++++++++++++++++++++++
430 1 file changed, 732 insertions(+)
431
432 commit a19eec274804668ed1c6d31ef153fbfe1c285a38
433@@ -366,8 +425,8 @@
434
435 drop wrong quotes in Makefiles (thanks to bickman2k)
436
437- capplet/Makefile.am | 2 +-
438- libmatekbd/Makefile.am | 2 +-
439+ capplet/Makefile.am | 2 +-
440+ libmatekbd/Makefile.am | 2 +-
441 2 files changed, 2 insertions(+), 2 deletions(-)
442
443 commit 484b6a0adf17cf27a2193f6a96e1f44f718261a3
444@@ -376,11 +435,11 @@
445
446 Preparing for 1.2 release
447
448- AUTHORS | 8 ++-
449- ChangeLog | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
450- README | 1 +
451- autogen.sh | 4 +-
452- configure.in | 2 +-
453+ AUTHORS | 8 ++-
454+ ChangeLog | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
455+ README | 1 +
456+ autogen.sh | 4 +-
457+ configure.in | 2 +-
458 5 files changed, 237 insertions(+), 6 deletions(-)
459
460 commit 436060f542b7575731be6f15aad369dda38381f7
461@@ -389,7 +448,7 @@
462
463 changing pkgbuild source method
464
465- distro/archlinux/PKGBUILD | 8 ++++----
466+ distro/archlinux/PKGBUILD | 8 ++++----
467 1 file changed, 4 insertions(+), 4 deletions(-)
468
469 commit 3c709dc41f653a2a5678141a1fec89b4eca60c23
470@@ -398,8 +457,8 @@
471
472 Changed mate.gr.jp to gnome.gr.jp as requested in Issue #86
473
474- po/ChangeLog | 18 +++++++++---------
475- po/ja.po | 2 +-
476+ po/ChangeLog | 18 +++++++++---------
477+ po/ja.po | 2 +-
478 2 files changed, 10 insertions(+), 10 deletions(-)
479
480 commit ebc577b4e0e3e24a614f35649f30f9db24f9e856
481@@ -408,9 +467,9 @@
482
483 updated version
484
485- configure.in | 8 ++++----
486- distro/archlinux/PKGBUILD | 2 +-
487- distro/ubuntu/build | 2 +-
488+ configure.in | 8 ++++----
489+ distro/archlinux/PKGBUILD | 2 +-
490+ distro/ubuntu/build | 2 +-
491 3 files changed, 6 insertions(+), 6 deletions(-)
492
493 commit 46a8d42095a30a1b62b7f24658f4886941b54800
494@@ -419,35 +478,38 @@
495
496 GDK_ key constants was renamed to GDK_KEY_ on GTK+-3.0
497
498- INSTALL | 291 -
499- Makefile.in | 848 --
500- aclocal.m4 | 1864 ---
501- capplet/Makefile.in | 733 --
502- capplet/matekbd-indicator-plugins-capplet.c | 25 +-
503- config.guess | 1502 ---
504- config.h.in | 89 -
505- config.sub | 1714 ---
506- configure |17314 ---------------------------
507- configure.in | 6 +-
508- depcomp | 630 -
509- install-sh | 520 -
510- libmatekbd/Makefile.in | 886 --
511- libmatekbd/matekbd-indicator.c | 61 +-
512- libmatekbd/matekbd-keyboard-drawing.c | 37 +-
513- libmatekbd/matekbd-status.c | 5 +-
514- ltmain.sh | 9636 ---------------
515- m4/intltool.m4 | 216 -
516- m4/libtool.m4 | 7831 ------------
517- m4/ltoptions.m4 | 369 -
518- m4/ltsugar.m4 | 123 -
519- m4/ltversion.m4 | 23 -
520- m4/lt~obsolete.m4 | 98 -
521- missing | 376 -
522- mkinstalldirs | 162 -
523- po/Makefile.in.in | 217 -
524- test/Makefile.in | 638 -
525- test/matekbd-indicator-test.c | 45 +-
526- 28 files changed, 100 insertions(+), 46159 deletions(-)
527+ INSTALL | 291 -
528+ Makefile.in | 848 --
529+ aclocal.m4 | 1864 ---
530+ capplet/Makefile.in | 733 --
531+ capplet/matekbd-indicator-plugins-capplet.c | 25 +-
532+ config.guess | 1502 ---
533+ config.h.in | 89 -
534+ config.sub | 1714 ---
535+ configure | 17314 --------------------------
536+ configure.in | 6 +-
537+ depcomp | 630 -
538+ install-sh | 520 -
539+ intltool-extract.in | 0
540+ intltool-merge.in | 0
541+ intltool-update.in | 0
542+ libmatekbd/Makefile.in | 886 --
543+ libmatekbd/matekbd-indicator.c | 61 +-
544+ libmatekbd/matekbd-keyboard-drawing.c | 37 +-
545+ libmatekbd/matekbd-status.c | 5 +-
546+ ltmain.sh | 9636 --------------
547+ m4/intltool.m4 | 216 -
548+ m4/libtool.m4 | 7831 ------------
549+ m4/ltoptions.m4 | 369 -
550+ m4/ltsugar.m4 | 123 -
551+ m4/ltversion.m4 | 23 -
552+ m4/lt~obsolete.m4 | 98 -
553+ missing | 376 -
554+ mkinstalldirs | 162 -
555+ po/Makefile.in.in | 217 -
556+ test/Makefile.in | 638 -
557+ test/matekbd-indicator-test.c | 45 +-
558+ 31 files changed, 100 insertions(+), 46159 deletions(-)
559
560 commit 731006ad7b3c6c47a52b8ef16e29e2d5ea9e1ea5
561 Author: Steve Zesch <stevezesch2@gmail.com>
562@@ -455,9 +517,9 @@
563
564 Changed version to 2011.12.01
565
566- configure.in | 4 ++--
567- distro/archlinux/PKGBUILD | 2 +-
568- distro/ubuntu/build | 2 +-
569+ configure.in | 4 ++--
570+ distro/archlinux/PKGBUILD | 2 +-
571+ distro/ubuntu/build | 2 +-
572 3 files changed, 4 insertions(+), 4 deletions(-)
573
574 commit 916e2eafe251b44f9d0339282f5d00723899caec
575@@ -466,148 +528,152 @@
576
577 moving from https://github.com/perberos/mate-desktop-environment
578
579- AUTHORS | 1 +
580- COPYING.LIB | 481 +
581- ChangeLog | 4 +
582- INSTALL | 291 +
583- Makefile.am | 22 +
584- Makefile.in | 848 +
585- NEWS | 107 +
586- aclocal.m4 | 1864 +++
587- autogen.sh | 25 +
588- capplet/Makefile.am | 46 +
589- capplet/Makefile.in | 733 +
590- capplet/matekbd-indicator-plugins-add.c | 207 +
591- capplet/matekbd-indicator-plugins-capplet.c | 483 +
592- ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 +
593- capplet/matekbd-indicator-plugins-capplet.h | 63 +
594- capplet/matekbd-indicator-plugins.ui | 255 +
595- capplet/matekbd-indicator-plugins_add.ui | 142 +
596- config.guess | 1502 ++
597- config.h.in | 89 +
598- config.sub | 1714 ++
599- configure |17314 ++++++++++++++++++++
600- configure.in | 138 +
601- depcomp | 630 +
602- distro/archlinux/PKGBUILD | 32 +
603- distro/archlinux/libmatekbd.install | 17 +
604- distro/ubuntu/build | 27 +
605- distro/ubuntu/postinst | 9 +
606- distro/ubuntu/postrm | 6 +
607- distro/ubuntu/preinst | 8 +
608- distro/ubuntu/prerm | 11 +
609- install-sh | 520 +
610- libmatekbd.pc.in | 11 +
611- libmatekbd/Makefile.am | 121 +
612- libmatekbd/Makefile.in | 886 +
613- ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 +
614- libmatekbd/matekbd-config-private.h | 102 +
615- libmatekbd/matekbd-desktop-config.c | 403 +
616- libmatekbd/matekbd-desktop-config.h | 92 +
617- libmatekbd/matekbd-indicator-config.c | 445 +
618- libmatekbd/matekbd-indicator-config.h | 94 +
619- libmatekbd/matekbd-indicator-marshal.list | 1 +
620- libmatekbd/matekbd-indicator-plugin-manager.c | 406 +
621- libmatekbd/matekbd-indicator-plugin-manager.h | 116 +
622- libmatekbd/matekbd-indicator-plugin.h | 125 +
623- libmatekbd/matekbd-indicator.c | 968 ++
624- libmatekbd/matekbd-indicator.h | 80 +
625- libmatekbd/matekbd-keyboard-config.c | 827 +
626- libmatekbd/matekbd-keyboard-config.h | 124 +
627- libmatekbd/matekbd-keyboard-drawing-marshal.list | 2 +
628- libmatekbd/matekbd-keyboard-drawing.c | 2635 +++
629- libmatekbd/matekbd-keyboard-drawing.h | 214 +
630- libmatekbd/matekbd-status.c | 867 +
631- libmatekbd/matekbd-status.h | 72 +
632- libmatekbd/matekbd-util.c | 159 +
633- libmatekbd/matekbd-util.h | 33 +
634- libmatekbd/show-layout.ui | 83 +
635- libmatekbdui.pc.in | 11 +
636- ltmain.sh | 9636 +++++++++++
637- m4/intltool.m4 | 216 +
638- m4/libtool.m4 | 7831 +++++++++
639- m4/ltoptions.m4 | 369 +
640- m4/ltsugar.m4 | 123 +
641- m4/ltversion.m4 | 23 +
642- m4/lt~obsolete.m4 | 98 +
643- missing | 376 +
644- mkinstalldirs | 162 +
645- po/ChangeLog | 772 +
646- po/LINGUAS | 69 +
647- po/Makefile.in.in | 217 +
648- po/POTFILES.in | 16 +
649- po/POTFILES.skip | 1 +
650- po/ar.po | 323 +
651- po/as.po | 249 +
652- po/ast.po | 273 +
653- po/be@latin.po | 261 +
654- po/bg.po | 298 +
655- po/bn.po | 286 +
656- po/bn_IN.po | 251 +
657- po/ca.po | 315 +
658- po/ca@valencia.po | 301 +
659- po/cs.po | 298 +
660- po/da.po | 317 +
661- po/de.po | 322 +
662- po/dz.po | 243 +
663- po/el.po | 311 +
664- po/en@shaw.po | 286 +
665- po/en_GB.po | 314 +
666- po/eo.po | 297 +
667- po/es.po | 301 +
668- po/et.po | 236 +
669- po/eu.po | 281 +
670- po/fi.po | 300 +
671- po/fr.po | 297 +
672- po/ga.po | 257 +
673- po/gl.po | 302 +
674- po/gu.po | 250 +
675- po/he.po | 312 +
676- po/hi.po | 249 +
677- po/hu.po | 300 +
678- po/id.po | 297 +
679- po/it.po | 302 +
680- po/ja.po | 297 +
681- po/ka.po | 233 +
682- po/kn.po | 249 +
683- po/ko.po | 278 +
684- po/lt.po | 269 +
685- po/lv.po | 288 +
686- po/mai.po | 245 +
687- po/mk.po | 262 +
688- po/ml.po | 249 +
689- po/mr.po | 248 +
690- po/ms.po | 271 +
691- po/nb.po | 294 +
692- po/nl.po | 315 +
693- po/nn.po | 256 +
694- po/oc.po | 246 +
695- po/or.po | 253 +
696- po/pa.po | 297 +
697- po/pl.po | 300 +
698- po/pt.po | 312 +
699- po/pt_BR.po | 316 +
700- po/ro.po | 284 +
701- po/ru.po | 305 +
702- po/si.po | 244 +
703- po/sk.po | 299 +
704- po/sl.po | 312 +
705- po/sq.po | 240 +
706- po/sr.po | 322 +
707- po/sr@latin.po | 322 +
708- po/sv.po | 306 +
709- po/ta.po | 302 +
710- po/te.po | 250 +
711- po/th.po | 292 +
712- po/tr.po | 263 +
713- po/uk.po | 299 +
714- po/vi.po | 254 +
715- po/zh_CN.po | 306 +
716- po/zh_HK.po | 303 +
717- po/zh_TW.po | 303 +
718- test/Makefile.am | 25 +
719- test/Makefile.in | 638 +
720- test/matekbd-indicator-test.c | 78 +
721- test/matekbd-keyboard-drawing-test.c | 278 +
722- test/matekbd-status-test.c | 55 +
723- 144 files changed, 77054 insertions(+)
724+ AUTHORS | 1 +
725+ COPYING.LIB | 481 +
726+ ChangeLog | 4 +
727+ INSTALL | 291 +
728+ Makefile.am | 22 +
729+ Makefile.in | 848 +
730+ NEWS | 107 +
731+ README | 0
732+ aclocal.m4 | 1864 ++
733+ autogen.sh | 25 +
734+ capplet/Makefile.am | 46 +
735+ capplet/Makefile.in | 733 +
736+ capplet/matekbd-indicator-plugins-add.c | 207 +
737+ capplet/matekbd-indicator-plugins-capplet.c | 483 +
738+ ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 +
739+ capplet/matekbd-indicator-plugins-capplet.h | 63 +
740+ capplet/matekbd-indicator-plugins.ui | 255 +
741+ capplet/matekbd-indicator-plugins_add.ui | 142 +
742+ config.guess | 1502 ++
743+ config.h.in | 89 +
744+ config.sub | 1714 ++
745+ configure | 17314 +++++++++++++++++++
746+ configure.in | 138 +
747+ depcomp | 630 +
748+ distro/archlinux/PKGBUILD | 32 +
749+ distro/archlinux/libmatekbd.install | 17 +
750+ distro/ubuntu/build | 27 +
751+ distro/ubuntu/postinst | 9 +
752+ distro/ubuntu/postrm | 6 +
753+ distro/ubuntu/preinst | 8 +
754+ distro/ubuntu/prerm | 11 +
755+ install-sh | 520 +
756+ intltool-extract.in | 0
757+ intltool-merge.in | 0
758+ intltool-update.in | 0
759+ libmatekbd.pc.in | 11 +
760+ libmatekbd/Makefile.am | 121 +
761+ libmatekbd/Makefile.in | 886 +
762+ ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 +
763+ libmatekbd/matekbd-config-private.h | 102 +
764+ libmatekbd/matekbd-desktop-config.c | 403 +
765+ libmatekbd/matekbd-desktop-config.h | 92 +
766+ libmatekbd/matekbd-indicator-config.c | 445 +
767+ libmatekbd/matekbd-indicator-config.h | 94 +
768+ libmatekbd/matekbd-indicator-marshal.list | 1 +
769+ libmatekbd/matekbd-indicator-plugin-manager.c | 406 +
770+ libmatekbd/matekbd-indicator-plugin-manager.h | 116 +
771+ libmatekbd/matekbd-indicator-plugin.h | 125 +
772+ libmatekbd/matekbd-indicator.c | 968 ++
773+ libmatekbd/matekbd-indicator.h | 80 +
774+ libmatekbd/matekbd-keyboard-config.c | 827 +
775+ libmatekbd/matekbd-keyboard-config.h | 124 +
776+ libmatekbd/matekbd-keyboard-drawing-marshal.list | 2 +
777+ libmatekbd/matekbd-keyboard-drawing.c | 2635 +++
778+ libmatekbd/matekbd-keyboard-drawing.h | 214 +
779+ libmatekbd/matekbd-status.c | 867 +
780+ libmatekbd/matekbd-status.h | 72 +
781+ libmatekbd/matekbd-util.c | 159 +
782+ libmatekbd/matekbd-util.h | 33 +
783+ libmatekbd/show-layout.ui | 83 +
784+ libmatekbdui.pc.in | 11 +
785+ ltmain.sh | 9636 +++++++++++
786+ m4/intltool.m4 | 216 +
787+ m4/libtool.m4 | 7831 +++++++++
788+ m4/ltoptions.m4 | 369 +
789+ m4/ltsugar.m4 | 123 +
790+ m4/ltversion.m4 | 23 +
791+ m4/lt~obsolete.m4 | 98 +
792+ missing | 376 +
793+ mkinstalldirs | 162 +
794+ po/ChangeLog | 772 +
795+ po/LINGUAS | 69 +
796+ po/Makefile.in.in | 217 +
797+ po/POTFILES.in | 16 +
798+ po/POTFILES.skip | 1 +
799+ po/ar.po | 323 +
800+ po/as.po | 249 +
801+ po/ast.po | 273 +
802+ po/be@latin.po | 261 +
803+ po/bg.po | 298 +
804+ po/bn.po | 286 +
805+ po/bn_IN.po | 251 +
806+ po/ca.po | 315 +
807+ po/ca@valencia.po | 301 +
808+ po/cs.po | 298 +
809+ po/da.po | 317 +
810+ po/de.po | 322 +
811+ po/dz.po | 243 +
812+ po/el.po | 311 +
813+ po/en@shaw.po | 286 +
814+ po/en_GB.po | 314 +
815+ po/eo.po | 297 +
816+ po/es.po | 301 +
817+ po/et.po | 236 +
818+ po/eu.po | 281 +
819+ po/fi.po | 300 +
820+ po/fr.po | 297 +
821+ po/ga.po | 257 +
822+ po/gl.po | 302 +
823+ po/gu.po | 250 +
824+ po/he.po | 312 +
825+ po/hi.po | 249 +
826+ po/hu.po | 300 +
827+ po/id.po | 297 +
828+ po/it.po | 302 +
829+ po/ja.po | 297 +
830+ po/ka.po | 233 +
831+ po/kn.po | 249 +
832+ po/ko.po | 278 +
833+ po/lt.po | 269 +
834+ po/lv.po | 288 +
835+ po/mai.po | 245 +
836+ po/mk.po | 262 +
837+ po/ml.po | 249 +
838+ po/mr.po | 248 +
839+ po/ms.po | 271 +
840+ po/nb.po | 294 +
841+ po/nl.po | 315 +
842+ po/nn.po | 256 +
843+ po/oc.po | 246 +
844+ po/or.po | 253 +
845+ po/pa.po | 297 +
846+ po/pl.po | 300 +
847+ po/pt.po | 312 +
848+ po/pt_BR.po | 316 +
849+ po/ro.po | 284 +
850+ po/ru.po | 305 +
851+ po/si.po | 244 +
852+ po/sk.po | 299 +
853+ po/sl.po | 312 +
854+ po/sq.po | 240 +
855+ po/sr.po | 322 +
856+ po/sr@latin.po | 322 +
857+ po/sv.po | 306 +
858+ po/ta.po | 302 +
859+ po/te.po | 250 +
860+ po/th.po | 292 +
861+ po/tr.po | 263 +
862+ po/uk.po | 299 +
863+ po/vi.po | 254 +
864+ po/zh_CN.po | 306 +
865+ po/zh_HK.po | 303 +
866+ po/zh_TW.po | 303 +
867+ test/Makefile.am | 25 +
868+ test/Makefile.in | 638 +
869+ test/matekbd-indicator-test.c | 78 +
870+ test/matekbd-keyboard-drawing-test.c | 278 +
871+ test/matekbd-status-test.c | 55 +
872+ 148 files changed, 77054 insertions(+)
873
874=== modified file 'INSTALL'
875--- INSTALL 2013-07-03 10:57:40 +0000
876+++ INSTALL 2014-03-22 20:17:18 +0000
877@@ -12,8 +12,8 @@
878 Basic Installation
879 ==================
880
881- Briefly, the shell commands `./configure; make; make install' should
882-configure, build, and install this package. The following
883+ Briefly, the shell command `./configure && make && make install'
884+should configure, build, and install this package. The following
885 more-detailed instructions are generic; see the `README' file for
886 instructions specific to this package. Some packages provide this
887 `INSTALL' file but do not implement all of the features documented
888
889=== modified file 'Makefile.in'
890--- Makefile.in 2013-07-03 10:57:40 +0000
891+++ Makefile.in 2014-03-22 20:17:18 +0000
892@@ -1,4 +1,4 @@
893-# Makefile.in generated by automake 1.13.3 from Makefile.am.
894+# Makefile.in generated by automake 1.14.1 from Makefile.am.
895 # @configure_input@
896
897 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
898@@ -83,8 +83,8 @@
899 $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
900 $(top_srcdir)/configure $(am__configure_deps) \
901 $(srcdir)/config.h.in $(srcdir)/libmatekbd.pc.in \
902- $(srcdir)/libmatekbdui.pc.in COPYING config.guess config.sub \
903- install-sh missing ltmain.sh
904+ $(srcdir)/libmatekbdui.pc.in COPYING compile config.guess \
905+ config.sub install-sh missing ltmain.sh
906 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
907 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
908 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
909@@ -457,8 +457,8 @@
910 $(am__aclocal_m4_deps):
911
912 config.h: stamp-h1
913- @if test ! -f $@; then rm -f stamp-h1; else :; fi
914- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
915+ @test -f $@ || rm -f stamp-h1
916+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
917
918 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
919 @rm -f stamp-h1
920@@ -691,10 +691,16 @@
921 $(am__post_remove_distdir)
922
923 dist-tarZ: distdir
924+ @echo WARNING: "Support for shar distribution archives is" \
925+ "deprecated." >&2
926+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
927 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
928 $(am__post_remove_distdir)
929
930 dist-shar: distdir
931+ @echo WARNING: "Support for distribution archives compressed with" \
932+ "legacy program 'compress' is deprecated." >&2
933+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
934 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
935 $(am__post_remove_distdir)
936
937@@ -736,9 +742,10 @@
938 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
939 && am__cwd=`pwd` \
940 && $(am__cd) $(distdir)/_build \
941- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
942+ && ../configure \
943 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
944 $(DISTCHECK_CONFIGURE_FLAGS) \
945+ --srcdir=.. --prefix="$$dc_install_base" \
946 && $(MAKE) $(AM_MAKEFLAGS) \
947 && $(MAKE) $(AM_MAKEFLAGS) dvi \
948 && $(MAKE) $(AM_MAKEFLAGS) check \
949
950=== modified file 'aclocal.m4'
951--- aclocal.m4 2013-07-03 10:57:40 +0000
952+++ aclocal.m4 2014-03-22 20:17:18 +0000
953@@ -1,4 +1,4 @@
954-# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
955+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
956
957 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
958
959@@ -970,10 +970,10 @@
960 # generated from the m4 files accompanying Automake X.Y.
961 # (This private macro should not be called outside this file.)
962 AC_DEFUN([AM_AUTOMAKE_VERSION],
963-[am__api_version='1.13'
964+[am__api_version='1.14'
965 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
966 dnl require some minimum version. Point them to the right macro.
967-m4_if([$1], [1.13.3], [],
968+m4_if([$1], [1.14.1], [],
969 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
970 ])
971
972@@ -989,7 +989,7 @@
973 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
974 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
975 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
976-[AM_AUTOMAKE_VERSION([1.13.3])dnl
977+[AM_AUTOMAKE_VERSION([1.14.1])dnl
978 m4_ifndef([AC_AUTOCONF_VERSION],
979 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
980 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
981@@ -1356,6 +1356,12 @@
982 # This macro actually does too much. Some checks are only needed if
983 # your package does certain things. But this isn't really a big deal.
984
985+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
986+m4_define([AC_PROG_CC],
987+m4_defn([AC_PROG_CC])
988+[_AM_PROG_CC_C_O
989+])
990+
991 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
992 # AM_INIT_AUTOMAKE([OPTIONS])
993 # -----------------------------------------------
994@@ -1464,7 +1470,48 @@
995 AC_CONFIG_COMMANDS_PRE(dnl
996 [m4_provide_if([_AM_COMPILER_EXEEXT],
997 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
998-])
999+
1000+# POSIX will say in a future version that running "rm -f" with no argument
1001+# is OK; and we want to be able to make that assumption in our Makefile
1002+# recipes. So use an aggressive probe to check that the usage we want is
1003+# actually supported "in the wild" to an acceptable degree.
1004+# See automake bug#10828.
1005+# To make any issue more visible, cause the running configure to be aborted
1006+# by default if the 'rm' program in use doesn't match our expectations; the
1007+# user can still override this though.
1008+if rm -f && rm -fr && rm -rf; then : OK; else
1009+ cat >&2 <<'END'
1010+Oops!
1011+
1012+Your 'rm' program seems unable to run without file operands specified
1013+on the command line, even when the '-f' option is present. This is contrary
1014+to the behaviour of most rm programs out there, and not conforming with
1015+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
1016+
1017+Please tell bug-automake@gnu.org about your system, including the value
1018+of your $PATH and any error possibly output before this message. This
1019+can help us improve future automake versions.
1020+
1021+END
1022+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
1023+ echo 'Configuration will proceed anyway, since you have set the' >&2
1024+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
1025+ echo >&2
1026+ else
1027+ cat >&2 <<'END'
1028+Aborting the configuration process, to ensure you take notice of the issue.
1029+
1030+You can download and install GNU coreutils to get an 'rm' implementation
1031+that behaves properly: <http://www.gnu.org/software/coreutils/>.
1032+
1033+If you want to complete the configuration process using your problematic
1034+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
1035+to "yes", and re-run configure.
1036+
1037+END
1038+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
1039+ fi
1040+fi])
1041
1042 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1043 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1044@@ -1472,7 +1519,6 @@
1045 m4_define([_AC_COMPILER_EXEEXT],
1046 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
1047
1048-
1049 # When config.status generates a header, we must update the stamp-h file.
1050 # This file resides in the same directory as the config header
1051 # that is generated. The stamp files are numbered to have different names.
1052@@ -1654,6 +1700,70 @@
1053 AC_DEFUN([_AM_IF_OPTION],
1054 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1055
1056+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1057+#
1058+# This file is free software; the Free Software Foundation
1059+# gives unlimited permission to copy and/or distribute it,
1060+# with or without modifications, as long as this notice is preserved.
1061+
1062+# _AM_PROG_CC_C_O
1063+# ---------------
1064+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
1065+# to automatically call this.
1066+AC_DEFUN([_AM_PROG_CC_C_O],
1067+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1068+AC_REQUIRE_AUX_FILE([compile])dnl
1069+AC_LANG_PUSH([C])dnl
1070+AC_CACHE_CHECK(
1071+ [whether $CC understands -c and -o together],
1072+ [am_cv_prog_cc_c_o],
1073+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
1074+ # Make sure it works both with $CC and with simple cc.
1075+ # Following AC_PROG_CC_C_O, we do the test twice because some
1076+ # compilers refuse to overwrite an existing .o file with -o,
1077+ # though they will create one.
1078+ am_cv_prog_cc_c_o=yes
1079+ for am_i in 1 2; do
1080+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
1081+ && test -f conftest2.$ac_objext; then
1082+ : OK
1083+ else
1084+ am_cv_prog_cc_c_o=no
1085+ break
1086+ fi
1087+ done
1088+ rm -f core conftest*
1089+ unset am_i])
1090+if test "$am_cv_prog_cc_c_o" != yes; then
1091+ # Losing compiler, so override with the script.
1092+ # FIXME: It is wrong to rewrite CC.
1093+ # But if we don't then we get into trouble of one sort or another.
1094+ # A longer-term fix would be to have automake use am__CC in this case,
1095+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1096+ CC="$am_aux_dir/compile $CC"
1097+fi
1098+AC_LANG_POP([C])])
1099+
1100+# For backward compatibility.
1101+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
1102+
1103+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1104+#
1105+# This file is free software; the Free Software Foundation
1106+# gives unlimited permission to copy and/or distribute it,
1107+# with or without modifications, as long as this notice is preserved.
1108+
1109+# AM_RUN_LOG(COMMAND)
1110+# -------------------
1111+# Run COMMAND, save the exit status in ac_status, and log it.
1112+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
1113+AC_DEFUN([AM_RUN_LOG],
1114+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
1115+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
1116+ ac_status=$?
1117+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
1118+ (exit $ac_status); }])
1119+
1120 # Check to make sure that the build environment is sane. -*- Autoconf -*-
1121
1122 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
1123
1124=== added file 'compile'
1125--- compile 1970-01-01 00:00:00 +0000
1126+++ compile 2014-03-22 20:17:18 +0000
1127@@ -0,0 +1,347 @@
1128+#! /bin/sh
1129+# Wrapper for compilers which do not understand '-c -o'.
1130+
1131+scriptversion=2012-10-14.11; # UTC
1132+
1133+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1134+# Written by Tom Tromey <tromey@cygnus.com>.
1135+#
1136+# This program is free software; you can redistribute it and/or modify
1137+# it under the terms of the GNU General Public License as published by
1138+# the Free Software Foundation; either version 2, or (at your option)
1139+# any later version.
1140+#
1141+# This program is distributed in the hope that it will be useful,
1142+# but WITHOUT ANY WARRANTY; without even the implied warranty of
1143+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1144+# GNU General Public License for more details.
1145+#
1146+# You should have received a copy of the GNU General Public License
1147+# along with this program. If not, see <http://www.gnu.org/licenses/>.
1148+
1149+# As a special exception to the GNU General Public License, if you
1150+# distribute this file as part of a program that contains a
1151+# configuration script generated by Autoconf, you may include it under
1152+# the same distribution terms that you use for the rest of that program.
1153+
1154+# This file is maintained in Automake, please report
1155+# bugs to <bug-automake@gnu.org> or send patches to
1156+# <automake-patches@gnu.org>.
1157+
1158+nl='
1159+'
1160+
1161+# We need space, tab and new line, in precisely that order. Quoting is
1162+# there to prevent tools from complaining about whitespace usage.
1163+IFS=" "" $nl"
1164+
1165+file_conv=
1166+
1167+# func_file_conv build_file lazy
1168+# Convert a $build file to $host form and store it in $file
1169+# Currently only supports Windows hosts. If the determined conversion
1170+# type is listed in (the comma separated) LAZY, no conversion will
1171+# take place.
1172+func_file_conv ()
1173+{
1174+ file=$1
1175+ case $file in
1176+ / | /[!/]*) # absolute file, and not a UNC file
1177+ if test -z "$file_conv"; then
1178+ # lazily determine how to convert abs files
1179+ case `uname -s` in
1180+ MINGW*)
1181+ file_conv=mingw
1182+ ;;
1183+ CYGWIN*)
1184+ file_conv=cygwin
1185+ ;;
1186+ *)
1187+ file_conv=wine
1188+ ;;
1189+ esac
1190+ fi
1191+ case $file_conv/,$2, in
1192+ *,$file_conv,*)
1193+ ;;
1194+ mingw/*)
1195+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
1196+ ;;
1197+ cygwin/*)
1198+ file=`cygpath -m "$file" || echo "$file"`
1199+ ;;
1200+ wine/*)
1201+ file=`winepath -w "$file" || echo "$file"`
1202+ ;;
1203+ esac
1204+ ;;
1205+ esac
1206+}
1207+
1208+# func_cl_dashL linkdir
1209+# Make cl look for libraries in LINKDIR
1210+func_cl_dashL ()
1211+{
1212+ func_file_conv "$1"
1213+ if test -z "$lib_path"; then
1214+ lib_path=$file
1215+ else
1216+ lib_path="$lib_path;$file"
1217+ fi
1218+ linker_opts="$linker_opts -LIBPATH:$file"
1219+}
1220+
1221+# func_cl_dashl library
1222+# Do a library search-path lookup for cl
1223+func_cl_dashl ()
1224+{
1225+ lib=$1
1226+ found=no
1227+ save_IFS=$IFS
1228+ IFS=';'
1229+ for dir in $lib_path $LIB
1230+ do
1231+ IFS=$save_IFS
1232+ if $shared && test -f "$dir/$lib.dll.lib"; then
1233+ found=yes
1234+ lib=$dir/$lib.dll.lib
1235+ break
1236+ fi
1237+ if test -f "$dir/$lib.lib"; then
1238+ found=yes
1239+ lib=$dir/$lib.lib
1240+ break
1241+ fi
1242+ if test -f "$dir/lib$lib.a"; then
1243+ found=yes
1244+ lib=$dir/lib$lib.a
1245+ break
1246+ fi
1247+ done
1248+ IFS=$save_IFS
1249+
1250+ if test "$found" != yes; then
1251+ lib=$lib.lib
1252+ fi
1253+}
1254+
1255+# func_cl_wrapper cl arg...
1256+# Adjust compile command to suit cl
1257+func_cl_wrapper ()
1258+{
1259+ # Assume a capable shell
1260+ lib_path=
1261+ shared=:
1262+ linker_opts=
1263+ for arg
1264+ do
1265+ if test -n "$eat"; then
1266+ eat=
1267+ else
1268+ case $1 in
1269+ -o)
1270+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
1271+ eat=1
1272+ case $2 in
1273+ *.o | *.[oO][bB][jJ])
1274+ func_file_conv "$2"
1275+ set x "$@" -Fo"$file"
1276+ shift
1277+ ;;
1278+ *)
1279+ func_file_conv "$2"
1280+ set x "$@" -Fe"$file"
1281+ shift
1282+ ;;
1283+ esac
1284+ ;;
1285+ -I)
1286+ eat=1
1287+ func_file_conv "$2" mingw
1288+ set x "$@" -I"$file"
1289+ shift
1290+ ;;
1291+ -I*)
1292+ func_file_conv "${1#-I}" mingw
1293+ set x "$@" -I"$file"
1294+ shift
1295+ ;;
1296+ -l)
1297+ eat=1
1298+ func_cl_dashl "$2"
1299+ set x "$@" "$lib"
1300+ shift
1301+ ;;
1302+ -l*)
1303+ func_cl_dashl "${1#-l}"
1304+ set x "$@" "$lib"
1305+ shift
1306+ ;;
1307+ -L)
1308+ eat=1
1309+ func_cl_dashL "$2"
1310+ ;;
1311+ -L*)
1312+ func_cl_dashL "${1#-L}"
1313+ ;;
1314+ -static)
1315+ shared=false
1316+ ;;
1317+ -Wl,*)
1318+ arg=${1#-Wl,}
1319+ save_ifs="$IFS"; IFS=','
1320+ for flag in $arg; do
1321+ IFS="$save_ifs"
1322+ linker_opts="$linker_opts $flag"
1323+ done
1324+ IFS="$save_ifs"
1325+ ;;
1326+ -Xlinker)
1327+ eat=1
1328+ linker_opts="$linker_opts $2"
1329+ ;;
1330+ -*)
1331+ set x "$@" "$1"
1332+ shift
1333+ ;;
1334+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
1335+ func_file_conv "$1"
1336+ set x "$@" -Tp"$file"
1337+ shift
1338+ ;;
1339+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
1340+ func_file_conv "$1" mingw
1341+ set x "$@" "$file"
1342+ shift
1343+ ;;
1344+ *)
1345+ set x "$@" "$1"
1346+ shift
1347+ ;;
1348+ esac
1349+ fi
1350+ shift
1351+ done
1352+ if test -n "$linker_opts"; then
1353+ linker_opts="-link$linker_opts"
1354+ fi
1355+ exec "$@" $linker_opts
1356+ exit 1
1357+}
1358+
1359+eat=
1360+
1361+case $1 in
1362+ '')
1363+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
1364+ exit 1;
1365+ ;;
1366+ -h | --h*)
1367+ cat <<\EOF
1368+Usage: compile [--help] [--version] PROGRAM [ARGS]
1369+
1370+Wrapper for compilers which do not understand '-c -o'.
1371+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
1372+arguments, and rename the output as expected.
1373+
1374+If you are trying to build a whole package this is not the
1375+right script to run: please start by reading the file 'INSTALL'.
1376+
1377+Report bugs to <bug-automake@gnu.org>.
1378+EOF
1379+ exit $?
1380+ ;;
1381+ -v | --v*)
1382+ echo "compile $scriptversion"
1383+ exit $?
1384+ ;;
1385+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
1386+ func_cl_wrapper "$@" # Doesn't return...
1387+ ;;
1388+esac
1389+
1390+ofile=
1391+cfile=
1392+
1393+for arg
1394+do
1395+ if test -n "$eat"; then
1396+ eat=
1397+ else
1398+ case $1 in
1399+ -o)
1400+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
1401+ # So we strip '-o arg' only if arg is an object.
1402+ eat=1
1403+ case $2 in
1404+ *.o | *.obj)
1405+ ofile=$2
1406+ ;;
1407+ *)
1408+ set x "$@" -o "$2"
1409+ shift
1410+ ;;
1411+ esac
1412+ ;;
1413+ *.c)
1414+ cfile=$1
1415+ set x "$@" "$1"
1416+ shift
1417+ ;;
1418+ *)
1419+ set x "$@" "$1"
1420+ shift
1421+ ;;
1422+ esac
1423+ fi
1424+ shift
1425+done
1426+
1427+if test -z "$ofile" || test -z "$cfile"; then
1428+ # If no '-o' option was seen then we might have been invoked from a
1429+ # pattern rule where we don't need one. That is ok -- this is a
1430+ # normal compilation that the losing compiler can handle. If no
1431+ # '.c' file was seen then we are probably linking. That is also
1432+ # ok.
1433+ exec "$@"
1434+fi
1435+
1436+# Name of file we expect compiler to create.
1437+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
1438+
1439+# Create the lock directory.
1440+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
1441+# that we are using for the .o file. Also, base the name on the expected
1442+# object file name, since that is what matters with a parallel build.
1443+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
1444+while true; do
1445+ if mkdir "$lockdir" >/dev/null 2>&1; then
1446+ break
1447+ fi
1448+ sleep 1
1449+done
1450+# FIXME: race condition here if user kills between mkdir and trap.
1451+trap "rmdir '$lockdir'; exit 1" 1 2 15
1452+
1453+# Run the compile.
1454+"$@"
1455+ret=$?
1456+
1457+if test -f "$cofile"; then
1458+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
1459+elif test -f "${cofile}bj"; then
1460+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
1461+fi
1462+
1463+rmdir "$lockdir"
1464+exit $ret
1465+
1466+# Local Variables:
1467+# mode: shell-script
1468+# sh-indentation: 2
1469+# eval: (add-hook 'write-file-hooks 'time-stamp)
1470+# time-stamp-start: "scriptversion="
1471+# time-stamp-format: "%:y-%02m-%02d.%02H"
1472+# time-stamp-time-zone: "UTC"
1473+# time-stamp-end: "; # UTC"
1474+# End:
1475
1476=== modified file 'config.guess'
1477--- config.guess 2013-07-03 10:57:40 +0000
1478+++ config.guess 2014-03-22 20:17:18 +0000
1479@@ -2,7 +2,7 @@
1480 # Attempt to guess a canonical system name.
1481 # Copyright 1992-2013 Free Software Foundation, Inc.
1482
1483-timestamp='2013-05-16'
1484+timestamp='2013-06-10'
1485
1486 # This file is free software; you can redistribute it and/or modify it
1487 # under the terms of the GNU General Public License as published by
1488@@ -995,6 +995,12 @@
1489 ppc:Linux:*:*)
1490 echo powerpc-unknown-linux-${LIBC}
1491 exit ;;
1492+ ppc64le:Linux:*:*)
1493+ echo powerpc64le-unknown-linux-${LIBC}
1494+ exit ;;
1495+ ppcle:Linux:*:*)
1496+ echo powerpcle-unknown-linux-${LIBC}
1497+ exit ;;
1498 s390:Linux:*:* | s390x:Linux:*:*)
1499 echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
1500 exit ;;
1501
1502=== modified file 'config.sub'
1503--- config.sub 2013-07-03 10:57:40 +0000
1504+++ config.sub 2014-03-22 20:17:18 +0000
1505@@ -2,7 +2,7 @@
1506 # Configuration validation subroutine script.
1507 # Copyright 1992-2013 Free Software Foundation, Inc.
1508
1509-timestamp='2013-04-24'
1510+timestamp='2013-08-10'
1511
1512 # This file is free software; you can redistribute it and/or modify it
1513 # under the terms of the GNU General Public License as published by
1514@@ -257,7 +257,7 @@
1515 | avr | avr32 \
1516 | be32 | be64 \
1517 | bfin \
1518- | c4x | clipper \
1519+ | c4x | c8051 | clipper \
1520 | d10v | d30v | dlx | dsp16xx \
1521 | epiphany \
1522 | fido | fr30 | frv \
1523@@ -372,7 +372,7 @@
1524 | be32-* | be64-* \
1525 | bfin-* | bs2000-* \
1526 | c[123]* | c30-* | [cjt]90-* | c4x-* \
1527- | clipper-* | craynv-* | cydra-* \
1528+ | c8051-* | clipper-* | craynv-* | cydra-* \
1529 | d10v-* | d30v-* | dlx-* \
1530 | elxsi-* \
1531 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
1532@@ -794,7 +794,7 @@
1533 os=-mingw64
1534 ;;
1535 mingw32)
1536- basic_machine=i386-pc
1537+ basic_machine=i686-pc
1538 os=-mingw32
1539 ;;
1540 mingw32ce)
1541@@ -830,7 +830,7 @@
1542 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
1543 ;;
1544 msys)
1545- basic_machine=i386-pc
1546+ basic_machine=i686-pc
1547 os=-msys
1548 ;;
1549 mvs)
1550@@ -1546,6 +1546,9 @@
1551 c4x-* | tic4x-*)
1552 os=-coff
1553 ;;
1554+ c8051-*)
1555+ os=-elf
1556+ ;;
1557 hexagon-*)
1558 os=-elf
1559 ;;
1560
1561=== modified file 'configure'
1562--- configure 2013-10-14 23:08:20 +0000
1563+++ configure 2014-03-22 20:17:18 +0000
1564@@ -1,6 +1,6 @@
1565 #! /bin/sh
1566 # Guess values for system-dependent variables and create Makefiles.
1567-# Generated by GNU Autoconf 2.69 for libmatekbd 1.6.1.
1568+# Generated by GNU Autoconf 2.69 for libmatekbd 1.6.2.
1569 #
1570 # Report bugs to <https://github.com/mate-desktop/libmatekbd>.
1571 #
1572@@ -590,8 +590,8 @@
1573 # Identity of this package.
1574 PACKAGE_NAME='libmatekbd'
1575 PACKAGE_TARNAME='libmatekbd'
1576-PACKAGE_VERSION='1.6.1'
1577-PACKAGE_STRING='libmatekbd 1.6.1'
1578+PACKAGE_VERSION='1.6.2'
1579+PACKAGE_STRING='libmatekbd 1.6.2'
1580 PACKAGE_BUGREPORT='https://github.com/mate-desktop/libmatekbd'
1581 PACKAGE_URL=''
1582
1583@@ -1415,7 +1415,7 @@
1584 # Omit some internal or obsolete options to make the list less imposing.
1585 # This message is too long to be a string in the A/UX 3.1 sh.
1586 cat <<_ACEOF
1587-\`configure' configures libmatekbd 1.6.1 to adapt to many kinds of systems.
1588+\`configure' configures libmatekbd 1.6.2 to adapt to many kinds of systems.
1589
1590 Usage: $0 [OPTION]... [VAR=VALUE]...
1591
1592@@ -1489,7 +1489,7 @@
1593
1594 if test -n "$ac_init_help"; then
1595 case $ac_init_help in
1596- short | recursive ) echo "Configuration of libmatekbd 1.6.1:";;
1597+ short | recursive ) echo "Configuration of libmatekbd 1.6.2:";;
1598 esac
1599 cat <<\_ACEOF
1600
1601@@ -1625,7 +1625,7 @@
1602 test -n "$ac_init_help" && exit $ac_status
1603 if $ac_init_version; then
1604 cat <<\_ACEOF
1605-libmatekbd configure 1.6.1
1606+libmatekbd configure 1.6.2
1607 generated by GNU Autoconf 2.69
1608
1609 Copyright (C) 2012 Free Software Foundation, Inc.
1610@@ -1994,7 +1994,7 @@
1611 This file contains any messages produced by compilers while
1612 running configure, to aid debugging if configure makes a mistake.
1613
1614-It was created by libmatekbd $as_me 1.6.1, which was
1615+It was created by libmatekbd $as_me 1.6.2, which was
1616 generated by GNU Autoconf 2.69. Invocation command line was
1617
1618 $ $0 $@
1619@@ -2349,7 +2349,7 @@
1620
1621 ac_config_headers="$ac_config_headers config.h"
1622
1623-am__api_version='1.13'
1624+am__api_version='1.14'
1625
1626 ac_aux_dir=
1627 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1628@@ -2864,7 +2864,7 @@
1629
1630 # Define the identity of the package.
1631 PACKAGE='libmatekbd'
1632- VERSION='1.6.1'
1633+ VERSION='1.6.2'
1634
1635
1636 cat >>confdefs.h <<_ACEOF
1637@@ -2915,6 +2915,47 @@
1638
1639
1640
1641+# POSIX will say in a future version that running "rm -f" with no argument
1642+# is OK; and we want to be able to make that assumption in our Makefile
1643+# recipes. So use an aggressive probe to check that the usage we want is
1644+# actually supported "in the wild" to an acceptable degree.
1645+# See automake bug#10828.
1646+# To make any issue more visible, cause the running configure to be aborted
1647+# by default if the 'rm' program in use doesn't match our expectations; the
1648+# user can still override this though.
1649+if rm -f && rm -fr && rm -rf; then : OK; else
1650+ cat >&2 <<'END'
1651+Oops!
1652+
1653+Your 'rm' program seems unable to run without file operands specified
1654+on the command line, even when the '-f' option is present. This is contrary
1655+to the behaviour of most rm programs out there, and not conforming with
1656+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
1657+
1658+Please tell bug-automake@gnu.org about your system, including the value
1659+of your $PATH and any error possibly output before this message. This
1660+can help us improve future automake versions.
1661+
1662+END
1663+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
1664+ echo 'Configuration will proceed anyway, since you have set the' >&2
1665+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
1666+ echo >&2
1667+ else
1668+ cat >&2 <<'END'
1669+Aborting the configuration process, to ensure you take notice of the issue.
1670+
1671+You can download and install GNU coreutils to get an 'rm' implementation
1672+that behaves properly: <http://www.gnu.org/software/coreutils/>.
1673+
1674+If you want to complete the configuration process using your problematic
1675+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
1676+to "yes", and re-run configure.
1677+
1678+END
1679+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
1680+ fi
1681+fi
1682 # Check whether --enable-silent-rules was given.
1683 if test "${enable_silent_rules+set}" = set; then :
1684 enableval=$enable_silent_rules;
1685@@ -3859,6 +3900,65 @@
1686 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1687 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1688
1689+ac_ext=c
1690+ac_cpp='$CPP $CPPFLAGS'
1691+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1692+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1693+ac_compiler_gnu=$ac_cv_c_compiler_gnu
1694+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
1695+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
1696+if ${am_cv_prog_cc_c_o+:} false; then :
1697+ $as_echo_n "(cached) " >&6
1698+else
1699+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1700+/* end confdefs.h. */
1701+
1702+int
1703+main ()
1704+{
1705+
1706+ ;
1707+ return 0;
1708+}
1709+_ACEOF
1710+ # Make sure it works both with $CC and with simple cc.
1711+ # Following AC_PROG_CC_C_O, we do the test twice because some
1712+ # compilers refuse to overwrite an existing .o file with -o,
1713+ # though they will create one.
1714+ am_cv_prog_cc_c_o=yes
1715+ for am_i in 1 2; do
1716+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
1717+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
1718+ ac_status=$?
1719+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1720+ (exit $ac_status); } \
1721+ && test -f conftest2.$ac_objext; then
1722+ : OK
1723+ else
1724+ am_cv_prog_cc_c_o=no
1725+ break
1726+ fi
1727+ done
1728+ rm -f core conftest*
1729+ unset am_i
1730+fi
1731+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
1732+$as_echo "$am_cv_prog_cc_c_o" >&6; }
1733+if test "$am_cv_prog_cc_c_o" != yes; then
1734+ # Losing compiler, so override with the script.
1735+ # FIXME: It is wrong to rewrite CC.
1736+ # But if we don't then we get into trouble of one sort or another.
1737+ # A longer-term fix would be to have automake use am__CC in this case,
1738+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1739+ CC="$am_aux_dir/compile $CC"
1740+fi
1741+ac_ext=c
1742+ac_cpp='$CPP $CPPFLAGS'
1743+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1744+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1745+ac_compiler_gnu=$ac_cv_c_compiler_gnu
1746+
1747+
1748 depcc="$CC" am_compiler_list=
1749
1750 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1751@@ -4690,6 +4790,65 @@
1752 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1753 ac_compiler_gnu=$ac_cv_c_compiler_gnu
1754
1755+ac_ext=c
1756+ac_cpp='$CPP $CPPFLAGS'
1757+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1758+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1759+ac_compiler_gnu=$ac_cv_c_compiler_gnu
1760+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
1761+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
1762+if ${am_cv_prog_cc_c_o+:} false; then :
1763+ $as_echo_n "(cached) " >&6
1764+else
1765+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1766+/* end confdefs.h. */
1767+
1768+int
1769+main ()
1770+{
1771+
1772+ ;
1773+ return 0;
1774+}
1775+_ACEOF
1776+ # Make sure it works both with $CC and with simple cc.
1777+ # Following AC_PROG_CC_C_O, we do the test twice because some
1778+ # compilers refuse to overwrite an existing .o file with -o,
1779+ # though they will create one.
1780+ am_cv_prog_cc_c_o=yes
1781+ for am_i in 1 2; do
1782+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
1783+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
1784+ ac_status=$?
1785+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
1786+ (exit $ac_status); } \
1787+ && test -f conftest2.$ac_objext; then
1788+ : OK
1789+ else
1790+ am_cv_prog_cc_c_o=no
1791+ break
1792+ fi
1793+ done
1794+ rm -f core conftest*
1795+ unset am_i
1796+fi
1797+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
1798+$as_echo "$am_cv_prog_cc_c_o" >&6; }
1799+if test "$am_cv_prog_cc_c_o" != yes; then
1800+ # Losing compiler, so override with the script.
1801+ # FIXME: It is wrong to rewrite CC.
1802+ # But if we don't then we get into trouble of one sort or another.
1803+ # A longer-term fix would be to have automake use am__CC in this case,
1804+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
1805+ CC="$am_aux_dir/compile $CC"
1806+fi
1807+ac_ext=c
1808+ac_cpp='$CPP $CPPFLAGS'
1809+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
1810+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
1811+ac_compiler_gnu=$ac_cv_c_compiler_gnu
1812+
1813+
1814 depcc="$CC" am_compiler_list=
1815
1816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
1817@@ -15930,7 +16089,7 @@
1818 # report actual input values of CONFIG_FILES etc. instead of their
1819 # values after options handling.
1820 ac_log="
1821-This file was extended by libmatekbd $as_me 1.6.1, which was
1822+This file was extended by libmatekbd $as_me 1.6.2, which was
1823 generated by GNU Autoconf 2.69. Invocation command line was
1824
1825 CONFIG_FILES = $CONFIG_FILES
1826@@ -15996,7 +16155,7 @@
1827 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1828 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1829 ac_cs_version="\\
1830-libmatekbd config.status 1.6.1
1831+libmatekbd config.status 1.6.2
1832 configured by $0, generated by GNU Autoconf 2.69,
1833 with options \\"\$ac_cs_config\\"
1834
1835
1836=== modified file 'configure.ac'
1837--- configure.ac 2013-10-14 23:08:20 +0000
1838+++ configure.ac 2014-03-22 20:17:18 +0000
1839@@ -3,7 +3,7 @@
1840 dnl ***************************************************************************
1841 m4_define([libmatekbd_major_version], [1])
1842 m4_define([libmatekbd_minor_version], [6])
1843-m4_define([libmatekbd_micro_version], [1])
1844+m4_define([libmatekbd_micro_version], [2])
1845 m4_define([libmatekbd_version],[libmatekbd_major_version.libmatekbd_minor_version.libmatekbd_micro_version])
1846
1847 AC_INIT([libmatekbd], [libmatekbd_version], [https://github.com/mate-desktop/libmatekbd])
1848
1849=== modified file 'debian/changelog'
1850--- debian/changelog 2014-01-04 23:26:34 +0000
1851+++ debian/changelog 2014-03-22 20:17:18 +0000
1852@@ -1,3 +1,10 @@
1853+libmatekbd (1.7.1.is.1.6.2-0ubuntu1) trusty; urgency=medium
1854+
1855+ * New upstream release.
1856+ - Update symbols
1857+
1858+ -- Jackson Doak <noskcaj@ubuntu.com> Sun, 23 Mar 2014 06:43:42 +1100
1859+
1860 libmatekbd (1.7.1.is.1.6.1-2) unstable; urgency=low
1861
1862 * Use dh-autoreconf to fix FTBFS on ppc64el. (Closes: #733839).
1863
1864=== modified file 'debian/control'
1865--- debian/control 2014-01-04 23:26:34 +0000
1866+++ debian/control 2014-03-22 20:17:18 +0000
1867@@ -1,7 +1,8 @@
1868 Source: libmatekbd
1869 Section: libs
1870 Priority: optional
1871-Maintainer: MATE Packaging Team <pkg-mate-team@lists.alioth.debian.org>
1872+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
1873+XSBC-Original-Maintainer: MATE Packaging Team <pkg-mate-team@lists.alioth.debian.org>
1874 Uploaders:
1875 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>,
1876 Stefano Karapetsas <stefano@karapetsas.com>,
1877
1878=== modified file 'debian/libmatekbd4.symbols'
1879--- debian/libmatekbd4.symbols 2013-10-14 23:08:20 +0000
1880+++ debian/libmatekbd4.symbols 2014-03-22 20:17:18 +0000
1881@@ -56,7 +56,6 @@
1882 matekbd_indicator_config_init@Base 1.6.1
1883 MATEKBD_INDICATOR_CONFIG_KEY_BACKGROUND_COLOR@Base 1.6.1
1884 MATEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY@Base 1.6.1
1885- MATEKBD_INDICATOR_CONFIG_KEY_FONT_SIZE@Base 1.6.1
1886 MATEKBD_INDICATOR_CONFIG_KEY_FOREGROUND_COLOR@Base 1.6.1
1887 MATEKBD_INDICATOR_CONFIG_KEY_SECONDARIES@Base 1.6.1
1888 MATEKBD_INDICATOR_CONFIG_KEY_SHOW_FLAGS@Base 1.6.1
1889
1890=== modified file 'libmatekbd/Makefile.in'
1891--- libmatekbd/Makefile.in 2013-07-03 10:57:40 +0000
1892+++ libmatekbd/Makefile.in 2014-03-22 20:17:18 +0000
1893@@ -1,4 +1,4 @@
1894-# Makefile.in generated by automake 1.13.3 from Makefile.am.
1895+# Makefile.in generated by automake 1.14.1 from Makefile.am.
1896 # @configure_input@
1897
1898 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
1899@@ -567,14 +567,14 @@
1900 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1901 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1902 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1903-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
1904+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
1905
1906 .c.obj:
1907 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
1908 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
1909 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
1910 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1911-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
1912+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
1913
1914 .c.lo:
1915 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1916
1917=== modified file 'libmatekbd/matekbd-indicator-config.c'
1918--- libmatekbd/matekbd-indicator-config.c 2013-10-14 23:08:20 +0000
1919+++ libmatekbd/matekbd-indicator-config.c 2014-03-22 20:17:18 +0000
1920@@ -43,7 +43,6 @@
1921 const gchar MATEKBD_INDICATOR_CONFIG_KEY_SHOW_FLAGS[] = "show-flags";
1922 const gchar MATEKBD_INDICATOR_CONFIG_KEY_SECONDARIES[] = "secondary";
1923 const gchar MATEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY[] = "font-family";
1924-const gchar MATEKBD_INDICATOR_CONFIG_KEY_FONT_SIZE[] = "font-size";
1925 const gchar MATEKBD_INDICATOR_CONFIG_KEY_FOREGROUND_COLOR[] = "foreground-color";
1926 const gchar MATEKBD_INDICATOR_CONFIG_KEY_BACKGROUND_COLOR[] = "background-color";
1927
1928@@ -60,10 +59,6 @@
1929 g_settings_get_string (ind_config->settings,
1930 MATEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY);
1931
1932- ind_config->font_size =
1933- g_settings_get_int (ind_config->settings,
1934- MATEKBD_INDICATOR_CONFIG_KEY_FONT_SIZE);
1935-
1936 if (ind_config->font_family == NULL ||
1937 ind_config->font_family[0] == '\0') {
1938 PangoFontDescription *fd = NULL;
1939@@ -76,15 +71,10 @@
1940 fd = style->font_desc;
1941 if (fd != NULL) {
1942 ind_config->font_family =
1943- g_strdup (pango_font_description_get_family
1944- (fd));
1945- ind_config->font_size =
1946- pango_font_description_get_size (fd) /
1947- PANGO_SCALE;
1948+ g_strdup (pango_font_description_to_string(fd));
1949 }
1950 }
1951- xkl_debug (150, "font: [%s], size %d\n", ind_config->font_family,
1952- ind_config->font_size);
1953+ xkl_debug (150, "font: [%s]\n", ind_config->font_family);
1954
1955 }
1956
1957
1958=== modified file 'libmatekbd/matekbd-indicator-config.h'
1959--- libmatekbd/matekbd-indicator-config.h 2013-07-03 10:57:40 +0000
1960+++ libmatekbd/matekbd-indicator-config.h 2014-03-22 20:17:18 +0000
1961@@ -32,7 +32,6 @@
1962 gboolean show_flags;
1963
1964 gchar *font_family;
1965- int font_size;
1966 gchar *foreground_color;
1967 gchar *background_color;
1968
1969
1970=== modified file 'libmatekbd/matekbd-keyboard-drawing.c'
1971--- libmatekbd/matekbd-keyboard-drawing.c 2013-10-14 23:08:20 +0000
1972+++ libmatekbd/matekbd-keyboard-drawing.c 2014-03-22 20:17:18 +0000
1973@@ -49,6 +49,14 @@
1974 static void matekbd_keyboard_drawing_set_mods (MatekbdKeyboardDrawing * drawing,
1975 guint mods);
1976
1977+extern gboolean xkl_xkb_config_native_prepare (XklEngine * engine,
1978+ const XklConfigRec * data,
1979+ gpointer component_names);
1980+
1981+extern void xkl_xkb_config_native_cleanup (XklEngine * engine,
1982+ gpointer component_names);
1983+
1984+
1985 static gint
1986 xkb_to_pixmap_coord (MatekbdKeyboardDrawingRenderContext * context, gint n)
1987 {
1988
1989=== modified file 'libmatekbd/matekbd-status.c'
1990--- libmatekbd/matekbd-status.c 2013-07-03 10:57:40 +0000
1991+++ libmatekbd/matekbd-status.c 2014-03-22 20:17:18 +0000
1992@@ -183,22 +183,6 @@
1993 }
1994 }
1995
1996- if (globals.ind_cfg.font_family != NULL &&
1997- globals.ind_cfg.font_family[0] != 0) {
1998- cairo_select_font_face (cr, globals.ind_cfg.font_family,
1999- CAIRO_FONT_SLANT_NORMAL,
2000- CAIRO_FONT_WEIGHT_NORMAL);
2001- }
2002-
2003- pfd = pango_font_description_new ();
2004- pango_font_description_set_family (pfd,
2005- globals.ind_cfg.font_family);
2006- pango_font_description_set_style (pfd, PANGO_STYLE_NORMAL);
2007- pango_font_description_set_weight (pfd, PANGO_WEIGHT_NORMAL);
2008- pango_font_description_set_size (pfd,
2009- globals.ind_cfg.font_size *
2010- PANGO_SCALE);
2011-
2012 pcc = pango_cairo_create_context (cr);
2013
2014 fo = cairo_font_options_copy (gdk_screen_get_font_options
2015@@ -230,6 +214,8 @@
2016
2017 g_free (lbl_title);
2018
2019+ pfd = pango_font_description_from_string (globals.ind_cfg.font_family);
2020+
2021 pango_layout_set_font_description (pl, pfd);
2022 pango_layout_get_size (pl, &lwidth, &lheight);
2023
2024
2025=== modified file 'libmatekbd/matekbd.convert'
2026--- libmatekbd/matekbd.convert 2013-07-03 10:57:40 +0000
2027+++ libmatekbd/matekbd.convert 2014-03-22 20:17:18 +0000
2028@@ -23,6 +23,5 @@
2029 secondary = /desktop/mate/peripherals/keyboard/indicator/secondary
2030 show-flags = /desktop/mate/peripherals/keyboard/indicator/showFlags
2031 font-family = /desktop/mate/peripherals/keyboard/indicator/fontFamily
2032-font-size = /desktop/mate/peripherals/keyboard/indicator/fontSize
2033 foreground-color = /desktop/mate/peripherals/keyboard/indicator/foregroundColor
2034 background-color = /desktop/mate/peripherals/keyboard/indicator/backgroundColor
2035
2036=== modified file 'libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in'
2037--- libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in 2013-07-03 10:57:40 +0000
2038+++ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in 2014-03-22 20:17:18 +0000
2039@@ -107,23 +107,18 @@
2040 </key>
2041 <key name="font-family" type="s">
2042 <default>''</default>
2043- <_summary>The font family</_summary>
2044- <_description>The font family for the layout indicator</_description>
2045- </key>
2046- <key name="font-size" type="i">
2047- <default>10</default>
2048- <_summary>The font size</_summary>
2049- <_description>The font size for the layout indicator</_description>
2050+ <_summary>The font</_summary>
2051+ <_description>The font for the layout indicator. This should be in "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format.</_description>
2052 </key>
2053 <key name="foreground-color" type="s">
2054 <default>''</default>
2055 <_summary>The foreground color</_summary>
2056- <_description>The foreground color for the layout indicator</_description>
2057+ <_description>The foreground color for the layout indicator. This should be in "R G B" format, for example "255 0 0".</_description>
2058 </key>
2059 <key name="background-color" type="s">
2060 <default>''</default>
2061 <_summary>The background color</_summary>
2062- <_description>The background color for the layout indicator</_description>
2063+ <_description>The background color for the layout indicator. This should be in "R G B" format, for example "255 0 0".</_description>
2064 </key>
2065 </schema>
2066 </schemalist>
2067
2068=== modified file 'ltmain.sh'
2069--- ltmain.sh 2013-10-14 23:08:20 +0000
2070+++ ltmain.sh 2014-03-22 20:17:18 +0000
2071@@ -70,7 +70,7 @@
2072 # compiler: $LTCC
2073 # compiler flags: $LTCFLAGS
2074 # linker: $LD (gnu? $with_gnu_ld)
2075-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2
2076+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3
2077 # automake: $automake_version
2078 # autoconf: $autoconf_version
2079 #
2080@@ -80,7 +80,7 @@
2081
2082 PROGRAM=libtool
2083 PACKAGE=libtool
2084-VERSION="2.4.2 Debian-2.4.2-1.2"
2085+VERSION="2.4.2 Debian-2.4.2-1.3"
2086 TIMESTAMP=""
2087 package_revision=1.3337
2088
2089
2090=== modified file 'missing'
2091--- missing 2013-07-03 10:57:40 +0000
2092+++ missing 2014-03-22 20:17:18 +0000
2093@@ -1,7 +1,7 @@
2094 #! /bin/sh
2095 # Common wrapper for a few potentially missing GNU programs.
2096
2097-scriptversion=2012-06-26.16; # UTC
2098+scriptversion=2013-10-28.13; # UTC
2099
2100 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
2101 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
2102@@ -160,7 +160,7 @@
2103 ;;
2104 autom4te*)
2105 echo "You might have modified some maintainer files that require"
2106- echo "the 'automa4te' program to be rebuilt."
2107+ echo "the 'autom4te' program to be rebuilt."
2108 program_details 'autom4te'
2109 ;;
2110 bison*|yacc*)
2111
2112=== modified file 'test/Makefile.in'
2113--- test/Makefile.in 2013-07-03 10:57:40 +0000
2114+++ test/Makefile.in 2014-03-22 20:17:18 +0000
2115@@ -1,4 +1,4 @@
2116-# Makefile.in generated by automake 1.13.3 from Makefile.am.
2117+# Makefile.in generated by automake 1.14.1 from Makefile.am.
2118 # @configure_input@
2119
2120 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
2121@@ -449,14 +449,14 @@
2122 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2123 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2124 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2125-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
2126+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
2127
2128 .c.obj:
2129 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
2130 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
2131 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
2132 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
2133-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
2134+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
2135
2136 .c.lo:
2137 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

Subscribers

People subscribed via source and target branches

to all changes: