Hello community,
here is the log from the commit of package libmatekbd for openSUSE:Factory checked in at 2014-01-03 19:44:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libmatekbd (Old)
and /work/SRC/openSUSE:Factory/.libmatekbd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmatekbd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libmatekbd/libmatekbd.changes 2013-12-18 19:21:06.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libmatekbd.new/libmatekbd.changes 2014-01-03 19:44:26.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Jan 1 16:19:14 UTC 2014 - p.drouand@gmail.com
+
+- Update to version 1.6.2
+ + improved indicator font customization
+ + explicit declaration of internal libxklavier functions
+ from lingnomekbd:
+ https://git.gnome.org/browse/libgnomekbd/commit/?id=18332fedc6a24e4efeecfdc7...
+ https://bugzilla.gnome.org/show_bug.cgi?id=643754
+
+-------------------------------------------------------------------
Old:
----
libmatekbd-1.6.1.tar.xz
New:
----
libmatekbd-1.6.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libmatekbd.spec ++++++
--- /var/tmp/diff_new_pack.kov72D/_old 2014-01-03 19:44:26.000000000 +0100
+++ /var/tmp/diff_new_pack.kov72D/_new 2014-01-03 19:44:26.000000000 +0100
@@ -16,7 +16,7 @@
Name: libmatekbd
%define _name libmatekbd1
-Version: 1.6.1
+Version: 1.6.2
Release: 0
License: LGPL-2.1+
Summary: MATE Desktop keyboard configuration libraries
++++++ libmatekbd-1.6.1.tar.xz -> libmatekbd-1.6.2.tar.xz ++++++
++++ 2078 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/ChangeLog new/libmatekbd-1.6.2/ChangeLog
--- old/libmatekbd-1.6.1/ChangeLog 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/ChangeLog 2014-01-01 14:16:41.000000000 +0100
@@ -1,10 +1,69 @@
+commit 3d6344fdd8bb22eca3f5f49031454f27bdf74eef
+Author: Stefano Karapetsas
+Date: Wed Jan 1 14:13:40 2014 +0100
+
+ Bump version to 1.6.2
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 45a1153edb7cb7c69b6f8201addfa6007182e3ae
+Author: romovs
+Date: Sat Aug 24 14:57:25 2013 +0300
+
+ improved indicator font customization
+
+ libmatekbd/matekbd-indicator-config.c | 14 ++------------
+ libmatekbd/matekbd-indicator-config.h | 1 -
+ libmatekbd/matekbd-status.c | 18 ++----------------
+ libmatekbd/matekbd.convert | 1 -
+ ...org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 13 ++++---------
+ 5 files changed, 8 insertions(+), 39 deletions(-)
+
+commit 2e9a5504af1b224b852f1d70ccf75810612eaf3f
+Author: Stefano Karapetsas
+Date: Wed Jul 17 16:00:13 2013 +0200
+
+ Remove obsolete distro folder
+
+ distro/archlinux/PKGBUILD | 32 --------------------------------
+ distro/archlinux/libmatekbd.install | 17 -----------------
+ distro/ubuntu/build | 27 ---------------------------
+ distro/ubuntu/postinst | 9 ---------
+ distro/ubuntu/postrm | 6 ------
+ distro/ubuntu/preinst | 8 --------
+ distro/ubuntu/prerm | 11 -----------
+ 7 files changed, 110 deletions(-)
+
+commit 85f870a9b42216e658e31ef4451f60eb9c65a69a
+Merge: 1e723b7 062c52e
+Author: Stefano Karapetsas
+Date: Wed Nov 20 03:52:15 2013 -0800
+
+ Merge pull request #12 from infirit/1.6
+
+ explicit declaration of internal libxklavier functions
+
+commit 062c52e3d35b68b892c0047961d305d0d3cedc05
+Author: infirit
+Date: Mon Nov 18 15:23:03 2013 +0100
+
+ explicit declaration of internal libxklavier functions
+
+ from lingnomekbd:
+ https://git.gnome.org/browse/libgnomekbd/commit/?id=18332fedc6a24e4efeecfdc7...
+ https://bugzilla.gnome.org/show_bug.cgi?id=643754
+
+ libmatekbd/matekbd-keyboard-drawing.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
commit 1e723b72fe039940825630b0cc0935b0e80946a4
Author: Stefano Karapetsas
Date: Sun Jun 23 20:06:28 2013 +0200
Bump version to 1.6.1
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit ea5b148dc56e6d8a84b2e857b3c6343253c67c6e
@@ -13,9 +72,9 @@
Fixes to use make dist
- configure.ac | 2 +-
- libmatekbd/Makefile.am | 4 +++-
- po/POTFILES.in | 2 +-
+ configure.ac | 2 +-
+ libmatekbd/Makefile.am | 4 +++-
+ po/POTFILES.in | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
commit 8f377d99f9ff5bcb3328e9f0615b86811bbf0379
@@ -24,7 +83,7 @@
Fix previous commit typo in schema
- libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 4 ++--
+ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
commit 24dec90f9c2235c3e7c01998a524489cebc919f1
@@ -33,7 +92,7 @@
Add missing keys in GSettings schema
- .../org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 ++++++++++
+ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 ++++++++++
1 file changed, 10 insertions(+)
commit b8ea69f04ca37619456242782608fa4dcb4261b4
@@ -42,7 +101,7 @@
Group concensus: just delete unused code; git log stores it
- libmatekbd/matekbd-indicator.c | 6 ------
+ libmatekbd/matekbd-indicator.c | 6 ------
1 file changed, 6 deletions(-)
commit 79c44785180728fb53b2a7cc9b9512619fe45a79
@@ -51,9 +110,9 @@
Clean up compile, fix bug with handling variants. Closes #8
- libmatekbd/matekbd-indicator.c | 8 +++++---
- libmatekbd/matekbd-status.c | 6 +++---
- test/matekbd-status-test.c | 5 +++++
+ libmatekbd/matekbd-indicator.c | 8 +++++---
+ libmatekbd/matekbd-status.c | 6 +++---
+ test/matekbd-status-test.c | 5 +++++
3 files changed, 13 insertions(+), 6 deletions(-)
commit d8ff65934543f6e9f2220e8d95b73cd21307f937
@@ -62,7 +121,7 @@
Bump version to 1.6.0
- configure.ac | 6 +++---
+ configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
commit 2b2898dc895dcfc12a0911105bb8877490c56cc8
@@ -71,12 +130,12 @@
Sync translations with transifex
- po/LINGUAS | 2 +
- po/am.po | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- po/ast.po | 238 +++++++++++++++++++++++++-----------------------
- po/en_AU.po | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- po/gl.po | 234 +++++++++++++++++++++++------------------------
- po/ru.po | 228 ++++++++++++++++++++++------------------------
+ po/LINGUAS | 2 +
+ po/am.po | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ast.po | 238 ++++++++++++++++++++++++++-----------------------
+ po/en_AU.po | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/gl.po | 234 +++++++++++++++++++++++-------------------------
+ po/ru.po | 228 +++++++++++++++++++++++------------------------
6 files changed, 930 insertions(+), 351 deletions(-)
commit d3b2d7ceef86f54b9c1b9fc6fed237f4b3e3af1e
@@ -85,7 +144,7 @@
Add transifex configuration file
- .tx/config | 7 +++++++
+ .tx/config | 7 +++++++
1 file changed, 7 insertions(+)
commit 6be8b86cbb299f031f8e941c803c035bcd4d3b72
@@ -94,7 +153,7 @@
Add empty ChangeLog to allow build from git
- ChangeLog | 2 ++
+ ChangeLog | 2 ++
1 file changed, 2 insertions(+)
commit 67bc81144fcc687c9a14dee2ffb49da413d0d16b
@@ -103,7 +162,7 @@
"Removed ChangeLog"
- ChangeLog | 270 -------------------------------------------------------------
+ ChangeLog | 270 --------------------------------------------------------------
1 file changed, 270 deletions(-)
commit 12375f6ac965f580b83bf88790275e368af13301
@@ -112,7 +171,7 @@
Bump version to 1.5.1
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 504fcbcb537510facb95aba1ff054cc7e887270b
@@ -130,7 +189,7 @@
AC_CONFIG_HEADERS to please automake 1.13
- configure.ac | 2 +-
+ configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit f579a6f5b230c64698e142c0836f5c1d847a493f
@@ -148,7 +207,7 @@
Fix /desktop/ gschema path deprecation
- .../org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 +++++-----
+ libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
commit eca64b3e16a949120e22b2299c98c1fae4f18043
@@ -159,9 +218,9 @@
aclocal-1.12: warning: autoconf input should be named 'configure.ac', not 'configure.in'
- autogen.sh | 2 +-
- configure.ac | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- configure.in | 136 ----------------------------------------------------------
+ autogen.sh | 2 +-
+ configure.ac | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.in | 136 -----------------------------------------------------------
3 files changed, 137 insertions(+), 137 deletions(-)
commit 958dec506a68e41df432b1aa91c1ad229137e758
@@ -179,8 +238,8 @@
Add mateconf-gsettings-data-convert file
- libmatekbd/Makefile.am | 5 ++++-
- libmatekbd/matekbd.convert | 28 ++++++++++++++++++++++++++++
+ libmatekbd/Makefile.am | 5 ++++-
+ libmatekbd/matekbd.convert | 28 ++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
commit 18039cef0df9bcb34ad8a2a41aa221c76471751f
@@ -189,24 +248,24 @@
fixed incorrect fsf addresses.
- libmatekbd/matekbd-config-private.h | 4 ++--
- libmatekbd/matekbd-desktop-config.c | 4 ++--
- libmatekbd/matekbd-desktop-config.h | 4 ++--
- libmatekbd/matekbd-indicator-config.c | 4 ++--
- libmatekbd/matekbd-indicator-config.h | 4 ++--
- libmatekbd/matekbd-indicator.c | 4 ++--
- libmatekbd/matekbd-indicator.h | 4 ++--
- libmatekbd/matekbd-keyboard-config.c | 4 ++--
- libmatekbd/matekbd-keyboard-config.h | 4 ++--
- libmatekbd/matekbd-keyboard-drawing.c | 4 ++--
- libmatekbd/matekbd-keyboard-drawing.h | 4 ++--
- libmatekbd/matekbd-status.c | 4 ++--
- libmatekbd/matekbd-status.h | 4 ++--
- libmatekbd/matekbd-util.c | 4 ++--
- libmatekbd/matekbd-util.h | 4 ++--
- test/matekbd-indicator-test.c | 4 ++--
- test/matekbd-keyboard-drawing-test.c | 4 ++--
- test/matekbd-status-test.c | 4 ++--
+ libmatekbd/matekbd-config-private.h | 4 ++--
+ libmatekbd/matekbd-desktop-config.c | 4 ++--
+ libmatekbd/matekbd-desktop-config.h | 4 ++--
+ libmatekbd/matekbd-indicator-config.c | 4 ++--
+ libmatekbd/matekbd-indicator-config.h | 4 ++--
+ libmatekbd/matekbd-indicator.c | 4 ++--
+ libmatekbd/matekbd-indicator.h | 4 ++--
+ libmatekbd/matekbd-keyboard-config.c | 4 ++--
+ libmatekbd/matekbd-keyboard-config.h | 4 ++--
+ libmatekbd/matekbd-keyboard-drawing.c | 4 ++--
+ libmatekbd/matekbd-keyboard-drawing.h | 4 ++--
+ libmatekbd/matekbd-status.c | 4 ++--
+ libmatekbd/matekbd-status.h | 4 ++--
+ libmatekbd/matekbd-util.c | 4 ++--
+ libmatekbd/matekbd-util.h | 4 ++--
+ test/matekbd-indicator-test.c | 4 ++--
+ test/matekbd-keyboard-drawing-test.c | 4 ++--
+ test/matekbd-status-test.c | 4 ++--
18 files changed, 36 insertions(+), 36 deletions(-)
commit 64b95dd0aeb98811412b1ff3f6f623e39f84ee7d
@@ -224,7 +283,7 @@
add COPYING lgplv2
- COPYING | 502 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ COPYING | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 502 insertions(+)
commit edd896f6e4928d0fd1ea53a267f27e976bf2d401
@@ -233,7 +292,7 @@
remove COPYING.LIB
- COPYING.LIB | 481 -----------------------------------------------------------
+ COPYING.LIB | 481 ------------------------------------------------------------
1 file changed, 481 deletions(-)
commit 0a8b47229c6b453556a40b30c84db8f238e3b887
@@ -242,9 +301,9 @@
add internationalization support for gsettings schema
- libmatekbd/Makefile.am | 16 +--
- .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 --------------------
- ...mate.peripherals-keyboard-xkb.gschema.xml.in.in | 119 ++++++++++++++++++++
+ libmatekbd/Makefile.am | 16 +--
+ .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 ---------------------
+ ...mate.peripherals-keyboard-xkb.gschema.xml.in.in | 119 +++++++++++++++++++++
3 files changed, 128 insertions(+), 126 deletions(-)
commit 4900d39a6b133939af115e188d4010731426848d
@@ -253,7 +312,7 @@
fix schema name
- libmatekbd/matekbd-desktop-config.c | 2 +-
+ libmatekbd/matekbd-desktop-config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 74e8c123722068886a8b12872601b14f5cc3bbe9
@@ -262,35 +321,35 @@
migrate to gsettings
- Makefile.am | 2 +-
- NEWS | 10 +
- capplet/Makefile.am | 46 --
- capplet/matekbd-indicator-plugins-add.c | 207 --------
- capplet/matekbd-indicator-plugins-capplet.c | 490 ------------------
- ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 -
- capplet/matekbd-indicator-plugins-capplet.h | 63 ---
- capplet/matekbd-indicator-plugins.ui | 255 ---------
- capplet/matekbd-indicator-plugins_add.ui | 142 ------
- configure.in | 22 +-
- libmatekbd.pc.in | 2 +-
- libmatekbd/Makefile.am | 29 +-
- ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 ----------
- libmatekbd/matekbd-config-private.h | 30 +-
- libmatekbd/matekbd-desktop-config.c | 198 ++-----
- libmatekbd/matekbd-desktop-config.h | 12 +-
- libmatekbd/matekbd-indicator-config.c | 204 ++------
- libmatekbd/matekbd-indicator-config.h | 13 +-
- libmatekbd/matekbd-indicator-plugin-manager.c | 406 ---------------
- libmatekbd/matekbd-indicator-plugin-manager.h | 116 -----
- libmatekbd/matekbd-indicator-plugin.h | 125 -----
- libmatekbd/matekbd-indicator.c | 95 +---
- libmatekbd/matekbd-keyboard-config.c | 539 +++++++++-----------
- libmatekbd/matekbd-keyboard-config.h | 22 +-
- libmatekbd/matekbd-status.c | 40 +-
- libmatekbd/matekbd-util.c | 118 ++---
- libmatekbd/matekbd-util.h | 3 +
- .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 +++++
- po/POTFILES.in | 6 -
+ Makefile.am | 2 +-
+ NEWS | 10 +
+ capplet/Makefile.am | 46 --
+ capplet/matekbd-indicator-plugins-add.c | 207 --------
+ capplet/matekbd-indicator-plugins-capplet.c | 490 -------------------
+ ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 -
+ capplet/matekbd-indicator-plugins-capplet.h | 63 ---
+ capplet/matekbd-indicator-plugins.ui | 255 ----------
+ capplet/matekbd-indicator-plugins_add.ui | 142 ------
+ configure.in | 22 +-
+ libmatekbd.pc.in | 2 +-
+ libmatekbd/Makefile.am | 29 +-
+ ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 -----------
+ libmatekbd/matekbd-config-private.h | 30 +-
+ libmatekbd/matekbd-desktop-config.c | 198 ++------
+ libmatekbd/matekbd-desktop-config.h | 12 +-
+ libmatekbd/matekbd-indicator-config.c | 204 ++------
+ libmatekbd/matekbd-indicator-config.h | 13 +-
+ libmatekbd/matekbd-indicator-plugin-manager.c | 406 ----------------
+ libmatekbd/matekbd-indicator-plugin-manager.h | 116 -----
+ libmatekbd/matekbd-indicator-plugin.h | 125 -----
+ libmatekbd/matekbd-indicator.c | 95 +---
+ libmatekbd/matekbd-keyboard-config.c | 539 ++++++++++-----------
+ libmatekbd/matekbd-keyboard-config.h | 22 +-
+ libmatekbd/matekbd-status.c | 40 +-
+ libmatekbd/matekbd-util.c | 118 ++---
+ libmatekbd/matekbd-util.h | 3 +
+ .../org.mate.peripherals-keyboard-xkb.gschema.xml | 119 +++++
+ po/POTFILES.in | 6 -
29 files changed, 594 insertions(+), 3012 deletions(-)
commit 35c8125877e60b0c3279dd15b26bf0e85df5b136
@@ -314,8 +373,8 @@
Signed-off-by: Steev Klimaszewski
- configure.in | 2 ++
- libmatekbd/Makefile.am | 2 ++
+ configure.in | 2 ++
+ libmatekbd/Makefile.am | 2 ++
2 files changed, 4 insertions(+)
commit f0dfa44f76c332b529d5c67ef8b2ba4639cddb09
@@ -328,7 +387,7 @@
Signed-off-by: Steev Klimaszewski
- configure.in | 2 ++
+ configure.in | 2 ++
1 file changed, 2 insertions(+)
commit 3527f5115ef526a0d77fad0ce63156650d4281be
@@ -337,8 +396,8 @@
prepare 1.4.0
- ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
- configure.in | 2 +-
+ ChangeLog | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
+ configure.in | 2 +-
2 files changed, 47 insertions(+), 5 deletions(-)
commit 1d5fd9ac44c85562e391c9be0b77d03c2486674c
@@ -347,8 +406,8 @@
sync translations with transifex
- po/eu.po | 231 +++++++++++++++++++++++++++--------------------------
- po/tr.po | 269 ++++++++++++++++++++++++++++++++++----------------------------
+ po/eu.po | 231 ++++++++++++++++++++++++++++--------------------------
+ po/tr.po | 269 ++++++++++++++++++++++++++++++++++-----------------------------
2 files changed, 267 insertions(+), 233 deletions(-)
commit efc767078c299c0ea67e890ab0ad46e36ea262aa
@@ -357,7 +416,7 @@
add po gnome copyrights file
- po/gnome-copyrights.txt | 732 +++++++++++++++++++++++++++++++++++++++++++++++
+ po/gnome-copyrights.txt | 732 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 732 insertions(+)
commit a19eec274804668ed1c6d31ef153fbfe1c285a38
@@ -366,8 +425,8 @@
drop wrong quotes in Makefiles (thanks to bickman2k)
- capplet/Makefile.am | 2 +-
- libmatekbd/Makefile.am | 2 +-
+ capplet/Makefile.am | 2 +-
+ libmatekbd/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit 484b6a0adf17cf27a2193f6a96e1f44f718261a3
@@ -376,11 +435,11 @@
Preparing for 1.2 release
- AUTHORS | 8 ++-
- ChangeLog | 228 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- README | 1 +
- autogen.sh | 4 +-
- configure.in | 2 +-
+ AUTHORS | 8 ++-
+ ChangeLog | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ README | 1 +
+ autogen.sh | 4 +-
+ configure.in | 2 +-
5 files changed, 237 insertions(+), 6 deletions(-)
commit 436060f542b7575731be6f15aad369dda38381f7
@@ -389,7 +448,7 @@
changing pkgbuild source method
- distro/archlinux/PKGBUILD | 8 ++++----
+ distro/archlinux/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
commit 3c709dc41f653a2a5678141a1fec89b4eca60c23
@@ -398,8 +457,8 @@
Changed mate.gr.jp to gnome.gr.jp as requested in Issue #86
- po/ChangeLog | 18 +++++++++---------
- po/ja.po | 2 +-
+ po/ChangeLog | 18 +++++++++---------
+ po/ja.po | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
commit ebc577b4e0e3e24a614f35649f30f9db24f9e856
@@ -408,9 +467,9 @@
updated version
- configure.in | 8 ++++----
- distro/archlinux/PKGBUILD | 2 +-
- distro/ubuntu/build | 2 +-
+ configure.in | 8 ++++----
+ distro/archlinux/PKGBUILD | 2 +-
+ distro/ubuntu/build | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
commit 46a8d42095a30a1b62b7f24658f4886941b54800
@@ -419,35 +478,38 @@
GDK_ key constants was renamed to GDK_KEY_ on GTK+-3.0
- INSTALL | 291 -
- Makefile.in | 848 --
- aclocal.m4 | 1864 ---
- capplet/Makefile.in | 733 --
- capplet/matekbd-indicator-plugins-capplet.c | 25 +-
- config.guess | 1502 ---
- config.h.in | 89 -
- config.sub | 1714 ---
- configure |17314 ---------------------------
- configure.in | 6 +-
- depcomp | 630 -
- install-sh | 520 -
- libmatekbd/Makefile.in | 886 --
- libmatekbd/matekbd-indicator.c | 61 +-
- libmatekbd/matekbd-keyboard-drawing.c | 37 +-
- libmatekbd/matekbd-status.c | 5 +-
- ltmain.sh | 9636 ---------------
- m4/intltool.m4 | 216 -
- m4/libtool.m4 | 7831 ------------
- m4/ltoptions.m4 | 369 -
- m4/ltsugar.m4 | 123 -
- m4/ltversion.m4 | 23 -
- m4/lt~obsolete.m4 | 98 -
- missing | 376 -
- mkinstalldirs | 162 -
- po/Makefile.in.in | 217 -
- test/Makefile.in | 638 -
- test/matekbd-indicator-test.c | 45 +-
- 28 files changed, 100 insertions(+), 46159 deletions(-)
+ INSTALL | 291 -
+ Makefile.in | 848 --
+ aclocal.m4 | 1864 ---
+ capplet/Makefile.in | 733 --
+ capplet/matekbd-indicator-plugins-capplet.c | 25 +-
+ config.guess | 1502 ---
+ config.h.in | 89 -
+ config.sub | 1714 ---
+ configure | 17314 --------------------------
+ configure.in | 6 +-
+ depcomp | 630 -
+ install-sh | 520 -
+ intltool-extract.in | 0
+ intltool-merge.in | 0
+ intltool-update.in | 0
+ libmatekbd/Makefile.in | 886 --
+ libmatekbd/matekbd-indicator.c | 61 +-
+ libmatekbd/matekbd-keyboard-drawing.c | 37 +-
+ libmatekbd/matekbd-status.c | 5 +-
+ ltmain.sh | 9636 --------------
+ m4/intltool.m4 | 216 -
+ m4/libtool.m4 | 7831 ------------
+ m4/ltoptions.m4 | 369 -
+ m4/ltsugar.m4 | 123 -
+ m4/ltversion.m4 | 23 -
+ m4/lt~obsolete.m4 | 98 -
+ missing | 376 -
+ mkinstalldirs | 162 -
+ po/Makefile.in.in | 217 -
+ test/Makefile.in | 638 -
+ test/matekbd-indicator-test.c | 45 +-
+ 31 files changed, 100 insertions(+), 46159 deletions(-)
commit 731006ad7b3c6c47a52b8ef16e29e2d5ea9e1ea5
Author: Steve Zesch
@@ -455,9 +517,9 @@
Changed version to 2011.12.01
- configure.in | 4 ++--
- distro/archlinux/PKGBUILD | 2 +-
- distro/ubuntu/build | 2 +-
+ configure.in | 4 ++--
+ distro/archlinux/PKGBUILD | 2 +-
+ distro/ubuntu/build | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
commit 916e2eafe251b44f9d0339282f5d00723899caec
@@ -466,148 +528,152 @@
moving from https://github.com/perberos/mate-desktop-environment
- AUTHORS | 1 +
- COPYING.LIB | 481 +
- ChangeLog | 4 +
- INSTALL | 291 +
- Makefile.am | 22 +
- Makefile.in | 848 +
- NEWS | 107 +
- aclocal.m4 | 1864 +++
- autogen.sh | 25 +
- capplet/Makefile.am | 46 +
- capplet/Makefile.in | 733 +
- capplet/matekbd-indicator-plugins-add.c | 207 +
- capplet/matekbd-indicator-plugins-capplet.c | 483 +
- ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 +
- capplet/matekbd-indicator-plugins-capplet.h | 63 +
- capplet/matekbd-indicator-plugins.ui | 255 +
- capplet/matekbd-indicator-plugins_add.ui | 142 +
- config.guess | 1502 ++
- config.h.in | 89 +
- config.sub | 1714 ++
- configure |17314 ++++++++++++++++++++
- configure.in | 138 +
- depcomp | 630 +
- distro/archlinux/PKGBUILD | 32 +
- distro/archlinux/libmatekbd.install | 17 +
- distro/ubuntu/build | 27 +
- distro/ubuntu/postinst | 9 +
- distro/ubuntu/postrm | 6 +
- distro/ubuntu/preinst | 8 +
- distro/ubuntu/prerm | 11 +
- install-sh | 520 +
- libmatekbd.pc.in | 11 +
- libmatekbd/Makefile.am | 121 +
- libmatekbd/Makefile.in | 886 +
- ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 +
- libmatekbd/matekbd-config-private.h | 102 +
- libmatekbd/matekbd-desktop-config.c | 403 +
- libmatekbd/matekbd-desktop-config.h | 92 +
- libmatekbd/matekbd-indicator-config.c | 445 +
- libmatekbd/matekbd-indicator-config.h | 94 +
- libmatekbd/matekbd-indicator-marshal.list | 1 +
- libmatekbd/matekbd-indicator-plugin-manager.c | 406 +
- libmatekbd/matekbd-indicator-plugin-manager.h | 116 +
- libmatekbd/matekbd-indicator-plugin.h | 125 +
- libmatekbd/matekbd-indicator.c | 968 ++
- libmatekbd/matekbd-indicator.h | 80 +
- libmatekbd/matekbd-keyboard-config.c | 827 +
- libmatekbd/matekbd-keyboard-config.h | 124 +
- libmatekbd/matekbd-keyboard-drawing-marshal.list | 2 +
- libmatekbd/matekbd-keyboard-drawing.c | 2635 +++
- libmatekbd/matekbd-keyboard-drawing.h | 214 +
- libmatekbd/matekbd-status.c | 867 +
- libmatekbd/matekbd-status.h | 72 +
- libmatekbd/matekbd-util.c | 159 +
- libmatekbd/matekbd-util.h | 33 +
- libmatekbd/show-layout.ui | 83 +
- libmatekbdui.pc.in | 11 +
- ltmain.sh | 9636 +++++++++++
- m4/intltool.m4 | 216 +
- m4/libtool.m4 | 7831 +++++++++
- m4/ltoptions.m4 | 369 +
- m4/ltsugar.m4 | 123 +
- m4/ltversion.m4 | 23 +
- m4/lt~obsolete.m4 | 98 +
- missing | 376 +
- mkinstalldirs | 162 +
- po/ChangeLog | 772 +
- po/LINGUAS | 69 +
- po/Makefile.in.in | 217 +
- po/POTFILES.in | 16 +
- po/POTFILES.skip | 1 +
- po/ar.po | 323 +
- po/as.po | 249 +
- po/ast.po | 273 +
- po/be@latin.po | 261 +
- po/bg.po | 298 +
- po/bn.po | 286 +
- po/bn_IN.po | 251 +
- po/ca.po | 315 +
- po/ca@valencia.po | 301 +
- po/cs.po | 298 +
- po/da.po | 317 +
- po/de.po | 322 +
- po/dz.po | 243 +
- po/el.po | 311 +
- po/en@shaw.po | 286 +
- po/en_GB.po | 314 +
- po/eo.po | 297 +
- po/es.po | 301 +
- po/et.po | 236 +
- po/eu.po | 281 +
- po/fi.po | 300 +
- po/fr.po | 297 +
- po/ga.po | 257 +
- po/gl.po | 302 +
- po/gu.po | 250 +
- po/he.po | 312 +
- po/hi.po | 249 +
- po/hu.po | 300 +
- po/id.po | 297 +
- po/it.po | 302 +
- po/ja.po | 297 +
- po/ka.po | 233 +
- po/kn.po | 249 +
- po/ko.po | 278 +
- po/lt.po | 269 +
- po/lv.po | 288 +
- po/mai.po | 245 +
- po/mk.po | 262 +
- po/ml.po | 249 +
- po/mr.po | 248 +
- po/ms.po | 271 +
- po/nb.po | 294 +
- po/nl.po | 315 +
- po/nn.po | 256 +
- po/oc.po | 246 +
- po/or.po | 253 +
- po/pa.po | 297 +
- po/pl.po | 300 +
- po/pt.po | 312 +
- po/pt_BR.po | 316 +
- po/ro.po | 284 +
- po/ru.po | 305 +
- po/si.po | 244 +
- po/sk.po | 299 +
- po/sl.po | 312 +
- po/sq.po | 240 +
- po/sr.po | 322 +
- po/sr@latin.po | 322 +
- po/sv.po | 306 +
- po/ta.po | 302 +
- po/te.po | 250 +
- po/th.po | 292 +
- po/tr.po | 263 +
- po/uk.po | 299 +
- po/vi.po | 254 +
- po/zh_CN.po | 306 +
- po/zh_HK.po | 303 +
- po/zh_TW.po | 303 +
- test/Makefile.am | 25 +
- test/Makefile.in | 638 +
- test/matekbd-indicator-test.c | 78 +
- test/matekbd-keyboard-drawing-test.c | 278 +
- test/matekbd-status-test.c | 55 +
- 144 files changed, 77054 insertions(+)
+ AUTHORS | 1 +
+ COPYING.LIB | 481 +
+ ChangeLog | 4 +
+ INSTALL | 291 +
+ Makefile.am | 22 +
+ Makefile.in | 848 +
+ NEWS | 107 +
+ README | 0
+ aclocal.m4 | 1864 ++
+ autogen.sh | 25 +
+ capplet/Makefile.am | 46 +
+ capplet/Makefile.in | 733 +
+ capplet/matekbd-indicator-plugins-add.c | 207 +
+ capplet/matekbd-indicator-plugins-capplet.c | 483 +
+ ...matekbd-indicator-plugins-capplet.desktop.in.in | 15 +
+ capplet/matekbd-indicator-plugins-capplet.h | 63 +
+ capplet/matekbd-indicator-plugins.ui | 255 +
+ capplet/matekbd-indicator-plugins_add.ui | 142 +
+ config.guess | 1502 ++
+ config.h.in | 89 +
+ config.sub | 1714 ++
+ configure | 17314 +++++++++++++++++++
+ configure.in | 138 +
+ depcomp | 630 +
+ distro/archlinux/PKGBUILD | 32 +
+ distro/archlinux/libmatekbd.install | 17 +
+ distro/ubuntu/build | 27 +
+ distro/ubuntu/postinst | 9 +
+ distro/ubuntu/postrm | 6 +
+ distro/ubuntu/preinst | 8 +
+ distro/ubuntu/prerm | 11 +
+ install-sh | 520 +
+ intltool-extract.in | 0
+ intltool-merge.in | 0
+ intltool-update.in | 0
+ libmatekbd.pc.in | 11 +
+ libmatekbd/Makefile.am | 121 +
+ libmatekbd/Makefile.in | 886 +
+ ...esktop_mate_peripherals_keyboard_xkb.schemas.in | 277 +
+ libmatekbd/matekbd-config-private.h | 102 +
+ libmatekbd/matekbd-desktop-config.c | 403 +
+ libmatekbd/matekbd-desktop-config.h | 92 +
+ libmatekbd/matekbd-indicator-config.c | 445 +
+ libmatekbd/matekbd-indicator-config.h | 94 +
+ libmatekbd/matekbd-indicator-marshal.list | 1 +
+ libmatekbd/matekbd-indicator-plugin-manager.c | 406 +
+ libmatekbd/matekbd-indicator-plugin-manager.h | 116 +
+ libmatekbd/matekbd-indicator-plugin.h | 125 +
+ libmatekbd/matekbd-indicator.c | 968 ++
+ libmatekbd/matekbd-indicator.h | 80 +
+ libmatekbd/matekbd-keyboard-config.c | 827 +
+ libmatekbd/matekbd-keyboard-config.h | 124 +
+ libmatekbd/matekbd-keyboard-drawing-marshal.list | 2 +
+ libmatekbd/matekbd-keyboard-drawing.c | 2635 +++
+ libmatekbd/matekbd-keyboard-drawing.h | 214 +
+ libmatekbd/matekbd-status.c | 867 +
+ libmatekbd/matekbd-status.h | 72 +
+ libmatekbd/matekbd-util.c | 159 +
+ libmatekbd/matekbd-util.h | 33 +
+ libmatekbd/show-layout.ui | 83 +
+ libmatekbdui.pc.in | 11 +
+ ltmain.sh | 9636 +++++++++++
+ m4/intltool.m4 | 216 +
+ m4/libtool.m4 | 7831 +++++++++
+ m4/ltoptions.m4 | 369 +
+ m4/ltsugar.m4 | 123 +
+ m4/ltversion.m4 | 23 +
+ m4/lt~obsolete.m4 | 98 +
+ missing | 376 +
+ mkinstalldirs | 162 +
+ po/ChangeLog | 772 +
+ po/LINGUAS | 69 +
+ po/Makefile.in.in | 217 +
+ po/POTFILES.in | 16 +
+ po/POTFILES.skip | 1 +
+ po/ar.po | 323 +
+ po/as.po | 249 +
+ po/ast.po | 273 +
+ po/be@latin.po | 261 +
+ po/bg.po | 298 +
+ po/bn.po | 286 +
+ po/bn_IN.po | 251 +
+ po/ca.po | 315 +
+ po/ca@valencia.po | 301 +
+ po/cs.po | 298 +
+ po/da.po | 317 +
+ po/de.po | 322 +
+ po/dz.po | 243 +
+ po/el.po | 311 +
+ po/en@shaw.po | 286 +
+ po/en_GB.po | 314 +
+ po/eo.po | 297 +
+ po/es.po | 301 +
+ po/et.po | 236 +
+ po/eu.po | 281 +
+ po/fi.po | 300 +
+ po/fr.po | 297 +
+ po/ga.po | 257 +
+ po/gl.po | 302 +
+ po/gu.po | 250 +
+ po/he.po | 312 +
+ po/hi.po | 249 +
+ po/hu.po | 300 +
+ po/id.po | 297 +
+ po/it.po | 302 +
+ po/ja.po | 297 +
+ po/ka.po | 233 +
+ po/kn.po | 249 +
+ po/ko.po | 278 +
+ po/lt.po | 269 +
+ po/lv.po | 288 +
+ po/mai.po | 245 +
+ po/mk.po | 262 +
+ po/ml.po | 249 +
+ po/mr.po | 248 +
+ po/ms.po | 271 +
+ po/nb.po | 294 +
+ po/nl.po | 315 +
+ po/nn.po | 256 +
+ po/oc.po | 246 +
+ po/or.po | 253 +
+ po/pa.po | 297 +
+ po/pl.po | 300 +
+ po/pt.po | 312 +
+ po/pt_BR.po | 316 +
+ po/ro.po | 284 +
+ po/ru.po | 305 +
+ po/si.po | 244 +
+ po/sk.po | 299 +
+ po/sl.po | 312 +
+ po/sq.po | 240 +
+ po/sr.po | 322 +
+ po/sr@latin.po | 322 +
+ po/sv.po | 306 +
+ po/ta.po | 302 +
+ po/te.po | 250 +
+ po/th.po | 292 +
+ po/tr.po | 263 +
+ po/uk.po | 299 +
+ po/vi.po | 254 +
+ po/zh_CN.po | 306 +
+ po/zh_HK.po | 303 +
+ po/zh_TW.po | 303 +
+ test/Makefile.am | 25 +
+ test/Makefile.in | 638 +
+ test/matekbd-indicator-test.c | 78 +
+ test/matekbd-keyboard-drawing-test.c | 278 +
+ test/matekbd-status-test.c | 55 +
+ 148 files changed, 77054 insertions(+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/INSTALL new/libmatekbd-1.6.2/INSTALL
--- old/libmatekbd-1.6.1/INSTALL 2013-06-23 20:14:30.000000000 +0200
+++ new/libmatekbd-1.6.2/INSTALL 2014-01-01 14:16:46.000000000 +0100
@@ -12,8 +12,8 @@
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/compile new/libmatekbd-1.6.2/compile
--- old/libmatekbd-1.6.1/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/libmatekbd-1.6.2/compile 2014-01-01 14:16:46.000000000 +0100
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/configure.ac new/libmatekbd-1.6.2/configure.ac
--- old/libmatekbd-1.6.1/configure.ac 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/configure.ac 2014-01-01 14:16:41.000000000 +0100
@@ -3,7 +3,7 @@
dnl ***************************************************************************
m4_define([libmatekbd_major_version], [1])
m4_define([libmatekbd_minor_version], [6])
-m4_define([libmatekbd_micro_version], [1])
+m4_define([libmatekbd_micro_version], [2])
m4_define([libmatekbd_version],[libmatekbd_major_version.libmatekbd_minor_version.libmatekbd_micro_version])
AC_INIT([libmatekbd], [libmatekbd_version], [https://github.com/mate-desktop/libmatekbd])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/libmatekbd/matekbd-indicator-config.c new/libmatekbd-1.6.2/libmatekbd/matekbd-indicator-config.c
--- old/libmatekbd-1.6.1/libmatekbd/matekbd-indicator-config.c 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/libmatekbd/matekbd-indicator-config.c 2014-01-01 14:16:41.000000000 +0100
@@ -43,7 +43,6 @@
const gchar MATEKBD_INDICATOR_CONFIG_KEY_SHOW_FLAGS[] = "show-flags";
const gchar MATEKBD_INDICATOR_CONFIG_KEY_SECONDARIES[] = "secondary";
const gchar MATEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY[] = "font-family";
-const gchar MATEKBD_INDICATOR_CONFIG_KEY_FONT_SIZE[] = "font-size";
const gchar MATEKBD_INDICATOR_CONFIG_KEY_FOREGROUND_COLOR[] = "foreground-color";
const gchar MATEKBD_INDICATOR_CONFIG_KEY_BACKGROUND_COLOR[] = "background-color";
@@ -60,10 +59,6 @@
g_settings_get_string (ind_config->settings,
MATEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY);
- ind_config->font_size =
- g_settings_get_int (ind_config->settings,
- MATEKBD_INDICATOR_CONFIG_KEY_FONT_SIZE);
-
if (ind_config->font_family == NULL ||
ind_config->font_family[0] == '\0') {
PangoFontDescription *fd = NULL;
@@ -76,15 +71,10 @@
fd = style->font_desc;
if (fd != NULL) {
ind_config->font_family =
- g_strdup (pango_font_description_get_family
- (fd));
- ind_config->font_size =
- pango_font_description_get_size (fd) /
- PANGO_SCALE;
+ g_strdup (pango_font_description_to_string(fd));
}
}
- xkl_debug (150, "font: [%s], size %d\n", ind_config->font_family,
- ind_config->font_size);
+ xkl_debug (150, "font: [%s]\n", ind_config->font_family);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/libmatekbd/matekbd-indicator-config.h new/libmatekbd-1.6.2/libmatekbd/matekbd-indicator-config.h
--- old/libmatekbd-1.6.1/libmatekbd/matekbd-indicator-config.h 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/libmatekbd/matekbd-indicator-config.h 2014-01-01 14:16:41.000000000 +0100
@@ -32,7 +32,6 @@
gboolean show_flags;
gchar *font_family;
- int font_size;
gchar *foreground_color;
gchar *background_color;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/libmatekbd/matekbd-keyboard-drawing.c new/libmatekbd-1.6.2/libmatekbd/matekbd-keyboard-drawing.c
--- old/libmatekbd-1.6.1/libmatekbd/matekbd-keyboard-drawing.c 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/libmatekbd/matekbd-keyboard-drawing.c 2014-01-01 14:16:41.000000000 +0100
@@ -49,6 +49,14 @@
static void matekbd_keyboard_drawing_set_mods (MatekbdKeyboardDrawing * drawing,
guint mods);
+extern gboolean xkl_xkb_config_native_prepare (XklEngine * engine,
+ const XklConfigRec * data,
+ gpointer component_names);
+
+extern void xkl_xkb_config_native_cleanup (XklEngine * engine,
+ gpointer component_names);
+
+
static gint
xkb_to_pixmap_coord (MatekbdKeyboardDrawingRenderContext * context, gint n)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/libmatekbd/matekbd-status.c new/libmatekbd-1.6.2/libmatekbd/matekbd-status.c
--- old/libmatekbd-1.6.1/libmatekbd/matekbd-status.c 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/libmatekbd/matekbd-status.c 2014-01-01 14:16:41.000000000 +0100
@@ -183,22 +183,6 @@
}
}
- if (globals.ind_cfg.font_family != NULL &&
- globals.ind_cfg.font_family[0] != 0) {
- cairo_select_font_face (cr, globals.ind_cfg.font_family,
- CAIRO_FONT_SLANT_NORMAL,
- CAIRO_FONT_WEIGHT_NORMAL);
- }
-
- pfd = pango_font_description_new ();
- pango_font_description_set_family (pfd,
- globals.ind_cfg.font_family);
- pango_font_description_set_style (pfd, PANGO_STYLE_NORMAL);
- pango_font_description_set_weight (pfd, PANGO_WEIGHT_NORMAL);
- pango_font_description_set_size (pfd,
- globals.ind_cfg.font_size *
- PANGO_SCALE);
-
pcc = pango_cairo_create_context (cr);
fo = cairo_font_options_copy (gdk_screen_get_font_options
@@ -230,6 +214,8 @@
g_free (lbl_title);
+ pfd = pango_font_description_from_string (globals.ind_cfg.font_family);
+
pango_layout_set_font_description (pl, pfd);
pango_layout_get_size (pl, &lwidth, &lheight);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/libmatekbd/matekbd.convert new/libmatekbd-1.6.2/libmatekbd/matekbd.convert
--- old/libmatekbd-1.6.1/libmatekbd/matekbd.convert 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/libmatekbd/matekbd.convert 2014-01-01 14:16:41.000000000 +0100
@@ -23,6 +23,5 @@
secondary = /desktop/mate/peripherals/keyboard/indicator/secondary
show-flags = /desktop/mate/peripherals/keyboard/indicator/showFlags
font-family = /desktop/mate/peripherals/keyboard/indicator/fontFamily
-font-size = /desktop/mate/peripherals/keyboard/indicator/fontSize
foreground-color = /desktop/mate/peripherals/keyboard/indicator/foregroundColor
background-color = /desktop/mate/peripherals/keyboard/indicator/backgroundColor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in new/libmatekbd-1.6.2/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in
--- old/libmatekbd-1.6.1/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in 2013-06-23 20:14:24.000000000 +0200
+++ new/libmatekbd-1.6.2/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in 2014-01-01 14:16:41.000000000 +0100
@@ -107,23 +107,18 @@
</key>
<key name="font-family" type="s">
<default>''</default>
- <_summary>The font family
- <_description>The font family for the layout indicator
- </key>
- <key name="font-size" type="i">
- <default>10</default>
- <_summary>The font size
- <_description>The font size for the layout indicator
+ <_summary>The font
+ <_description>The font for the layout indicator. This should be in "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format.
</key>
<key name="foreground-color" type="s">
<default>''</default>
<_summary>The foreground color
- <_description>The foreground color for the layout indicator
+ <_description>The foreground color for the layout indicator. This should be in "R G B" format, for example "255 0 0".
</key>
<key name="background-color" type="s">
<default>''</default>
<_summary>The background color
- <_description>The background color for the layout indicator
+ <_description>The background color for the layout indicator. This should be in "R G B" format, for example "255 0 0".
</key>
</schema>
</schemalist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libmatekbd-1.6.1/missing new/libmatekbd-1.6.2/missing
--- old/libmatekbd-1.6.1/missing 2013-06-23 20:14:30.000000000 +0200
+++ new/libmatekbd-1.6.2/missing 2014-01-01 14:16:46.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org