Hello community,
here is the log from the commit of package mate-control-center for
openSUSE:Factory checked in at 2014-07-12 17:15:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-control-center (Old)
and /work/SRC/openSUSE:Factory/.mate-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-control-center"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-control-center/mate-control-center.changes
2014-03-22 18:02:18.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mate-control-center.new/mate-control-center.changes
2014-07-12 17:15:15.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Jul 12 12:15:07 UTC 2014 - [email protected]
+
+- Update to version 1.8.2
+ + Fix key name typo in mate-keyboard
+ + Allow metacity-2 themes
+ + Several man page and desktop file fixes
+
+-------------------------------------------------------------------
Old:
----
mate-control-center-1.8.1.tar.xz
New:
----
mate-control-center-1.8.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-control-center.spec ++++++
--- /var/tmp/diff_new_pack.dEzciN/_old 2014-07-12 17:15:17.000000000 +0200
+++ /var/tmp/diff_new_pack.dEzciN/_new 2014-07-12 17:15:17.000000000 +0200
@@ -17,7 +17,7 @@
Name: mate-control-center
%define _name libmate-window-settings1
%define _slab libslab0
-Version: 1.8.1
+Version: 1.8.2
Release: 0
License: GPL-2.0+
Summary: MATE Desktop control center
++++++ mate-control-center-1.8.1.tar.xz -> mate-control-center-1.8.2.tar.xz
++++++
++++ 1846 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/mate-control-center-1.8.1/NEWS new/mate-control-center-1.8.2/NEWS
--- old/mate-control-center-1.8.1/NEWS 2014-03-15 14:27:53.000000000 +0100
+++ new/mate-control-center-1.8.2/NEWS 2014-07-11 14:02:10.000000000 +0200
@@ -1,3 +1,8 @@
+1.8.2
+ * Fix key name typo in mate-keyboard
+ * Allow metacity-2 themes
+ * Several man page and desktop file fixes
+
1.8.1
* default-applications: Add support for accessibility applications
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/mate-control-center-1.8.1/capplets/about-me/mate-about-me.1
new/mate-control-center-1.8.2/capplets/about-me/mate-about-me.1
--- old/mate-control-center-1.8.1/capplets/about-me/mate-about-me.1
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/capplets/about-me/mate-about-me.1
2014-07-11 13:59:30.000000000 +0200
@@ -11,8 +11,8 @@
.PP
MATE About Me is a control center applet to set user information.
.PP
-It allows to change user password and set user avatar image (~/.face file).
+It allows one to change user password and set user avatar image (~/.face
file).
.SH "AUTHOR"
.PP
-This manual page was written by Stefano Karapetsas <[email protected]>.
\ No newline at end of file
+This manual page was written by Stefano Karapetsas <[email protected]>.
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/mate-control-center-1.8.1/capplets/about-me/mate-about-me.desktop.in.in
new/mate-control-center-1.8.2/capplets/about-me/mate-about-me.desktop.in.in
--- old/mate-control-center-1.8.1/capplets/about-me/mate-about-me.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/capplets/about-me/mate-about-me.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;X-MATE-PersonalSettings;
+Keywords=mate-control-center;MATE;personal;information;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
new/mate-control-center-1.8.2/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;accessibility;features;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/appearance/data/mate-appearance-properties.1
new/mate-control-center-1.8.2/capplets/appearance/data/mate-appearance-properties.1
---
old/mate-control-center-1.8.1/capplets/appearance/data/mate-appearance-properties.1
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/appearance/data/mate-appearance-properties.1
2014-07-11 13:59:30.000000000 +0200
@@ -12,7 +12,7 @@
MATE Appearance Properties is a control center applet to edit appearance
settings.
.PP
-It allows to change: GTK theme, window manager theme, icon theme, cursor
+It allows one to change: GTK theme, window manager theme, icon theme, cursor
theme, desktop background and font settings.
.SH "OPTIONS"
@@ -25,4 +25,4 @@
.SH "AUTHOR"
.PP
-This manual page was written by Stefano Karapetsas <[email protected]>.
\ No newline at end of file
+This manual page was written by Stefano Karapetsas <[email protected]>.
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/mate-control-center-1.8.1/capplets/appearance/data/mate-appearance-properties.desktop.in.in
new/mate-control-center-1.8.2/capplets/appearance/data/mate-appearance-properties.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/appearance/data/mate-appearance-properties.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/appearance/data/mate-appearance-properties.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;DesktopSettings;
+Keywords=mate-control-center;MATE;appearance;properties;desktop;customize;look;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/appearance/data/mate-theme-installer.desktop.in.in
new/mate-control-center-1.8.2/capplets/appearance/data/mate-theme-installer.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/appearance/data/mate-theme-installer.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/appearance/data/mate-theme-installer.desktop.in.in
2014-07-11 13:59:14.000000000 +0200
@@ -7,6 +7,7 @@
Type=Application
MimeType=application/x-mate-theme-package;
StartupNotify=true
-Categories=GTK;
+Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;install;desktop;themes;
NoDisplay=true
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/appearance/theme-installer.c
new/mate-control-center-1.8.2/capplets/appearance/theme-installer.c
--- old/mate-control-center-1.8.1/capplets/appearance/theme-installer.c
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/capplets/appearance/theme-installer.c
2014-07-11 13:56:28.000000000 +0200
@@ -128,6 +128,13 @@
if (exists)
return THEME_GTK;
+ filename = g_build_filename (dir, "metacity-1", "metacity-theme-2.xml",
NULL);
+ exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
+ g_free (filename);
+
+ if (exists)
+ return THEME_MARCO;
+
filename = g_build_filename (dir, "metacity-1", "metacity-theme-1.xml",
NULL);
exists = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
g_free (filename);
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/mate-control-center-1.8.1/capplets/common/mate-theme-info.c
new/mate-control-center-1.8.2/capplets/common/mate-theme-info.c
--- old/mate-control-center-1.8.1/capplets/common/mate-theme-info.c
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/capplets/common/mate-theme-info.c
2014-07-11 13:56:28.000000000 +0200
@@ -1062,8 +1062,8 @@
affected_file = g_file_get_basename (file);
- /* The only file we care about is marco-theme-1.xml */
- if (!strcmp (affected_file, "metacity-theme-1.xml")) {
+ /* The only file we care about is metacity-theme-(1|2).xml */
+ if (!strcmp (affected_file, "metacity-theme-1.xml") || !strcmp
(affected_file, "metacity-theme-2.xml")) {
update_marco_index (file, monitor_data->priority);
}
@@ -1180,10 +1180,17 @@
/* marco theme subdir */
subdir = g_file_get_child (theme_dir_uri, "metacity-1");
- uri = g_file_get_child (subdir, "metacity-theme-1.xml");
+ uri = g_file_get_child (subdir, "metacity-theme-2.xml");
if (g_file_query_exists (uri, NULL)) {
update_marco_index (uri, monitor_data->priority);
}
+ else {
+ g_object_unref (uri);
+ uri = g_file_get_child (subdir, "metacity-theme-1.xml");
+ if (g_file_query_exists (uri, NULL)) {
+ update_marco_index (uri, monitor_data->priority);
+ }
+ }
g_object_unref (uri);
monitor = g_file_monitor_directory (subdir, G_FILE_MONITOR_NONE, NULL, NULL);
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/mate-control-center-1.8.1/capplets/default-applications/mate-default-applications-properties.1
new/mate-control-center-1.8.2/capplets/default-applications/mate-default-applications-properties.1
---
old/mate-control-center-1.8.1/capplets/default-applications/mate-default-applications-properties.1
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/default-applications/mate-default-applications-properties.1
2014-07-11 13:59:30.000000000 +0200
@@ -12,7 +12,7 @@
MATE Default Applications Properties is a control center applet to edit
default applications.
.PP
-It allows to set default file manager, email client, web browser, etc.
+It allows one to set default file manager, email client, web browser, etc.
.SH "OPTIONS"
.PP
@@ -21,4 +21,4 @@
.SH "AUTHOR"
.PP
-This manual page was written by Stefano Karapetsas <[email protected]>.
\ No newline at end of file
+This manual page was written by Stefano Karapetsas <[email protected]>.
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/mate-control-center-1.8.1/capplets/default-applications/mate-default-applications-properties.desktop.in.in
new/mate-control-center-1.8.2/capplets/default-applications/mate-default-applications-properties.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/default-applications/mate-default-applications-properties.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/default-applications/mate-default-applications-properties.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;X-MATE-PersonalSettings;
+Keywords=mate-control-center;MATE;default;preferred;applications;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/display/mate-display-properties.desktop.in.in
new/mate-control-center-1.8.2/capplets/display/mate-display-properties.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/display/mate-display-properties.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/display/mate-display-properties.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;HardwareSettings;
+Keywords=mate-control-center;MATE;resolution;position;monitors;display;properties;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/keybindings/mate-keybinding.desktop.in.in
new/mate-control-center-1.8.2/capplets/keybindings/mate-keybinding.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/keybindings/mate-keybinding.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/keybindings/mate-keybinding.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;assign;keyboard;shortcuts;keybindings;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/keyboard/mate-keyboard-properties-a11y.c
new/mate-control-center-1.8.2/capplets/keyboard/mate-keyboard-properties-a11y.c
---
old/mate-control-center-1.8.1/capplets/keyboard/mate-keyboard-properties-a11y.c
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/keyboard/mate-keyboard-properties-a11y.c
2014-07-11 13:55:55.000000000 +0200
@@ -145,7 +145,7 @@
g_settings_bind (a11y_settings, "feature-state-change-beep", w,
"active", G_SETTINGS_BIND_DEFAULT);
w = NWID ("togglekeys_enable");
- g_settings_bind (a11y_settings, "togglekeys_-enable", w, "active",
G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (a11y_settings, "togglekeys-enable", w, "active",
G_SETTINGS_BIND_DEFAULT);
w = NWID ("stickykeys_modifier_beep");
g_settings_bind (a11y_settings, "stickykeys-modifier-beep", w,
"active", G_SETTINGS_BIND_DEFAULT);
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/mate-control-center-1.8.1/capplets/keyboard/mate-keyboard.desktop.in.in
new/mate-control-center-1.8.2/capplets/keyboard/mate-keyboard.desktop.in.in
--- old/mate-control-center-1.8.1/capplets/keyboard/mate-keyboard.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/capplets/keyboard/mate-keyboard.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;HardwareSettings;
+Keywords=mate-control-center;MATE;keyboard;preferences;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/mouse/mate-settings-mouse.desktop.in.in
new/mate-control-center-1.8.2/capplets/mouse/mate-settings-mouse.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/mouse/mate-settings-mouse.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/mouse/mate-settings-mouse.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;HardwareSettings;
+Keywords=mate-control-center;MATE;mouse;preferences;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/network/mate-network-properties.desktop.in.in
new/mate-control-center-1.8.2/capplets/network/mate-network-properties.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/network/mate-network-properties.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/network/mate-network-properties.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;
+Keywords=mate-control-center;MATE;network;http;socks;proxy;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/capplets/windows/mate-window-properties.desktop.in.in
new/mate-control-center-1.8.2/capplets/windows/mate-window-properties.desktop.in.in
---
old/mate-control-center-1.8.1/capplets/windows/mate-window-properties.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++
new/mate-control-center-1.8.2/capplets/windows/mate-window-properties.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;DesktopSettings;
+Keywords=mate-control-center;MATE;window;manager;properties;marco;preferences;
OnlyShowIn=MATE;
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/mate-control-center-1.8.1/configure.ac
new/mate-control-center-1.8.2/configure.ac
--- old/mate-control-center-1.8.1/configure.ac 2014-03-15 14:28:55.000000000
+0100
+++ new/mate-control-center-1.8.2/configure.ac 2014-07-11 14:02:40.000000000
+0200
@@ -1,4 +1,4 @@
-AC_INIT([mate-control-center], [1.8.1], [htts://www.mate-desktop.org/])
+AC_INIT([mate-control-center], [1.8.2], [htts://www.mate-desktop.org/])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([shell])
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/mate-control-center-1.8.1/font-viewer/mate-font-viewer.desktop.in.in
new/mate-control-center-1.8.2/font-viewer/mate-font-viewer.desktop.in.in
--- old/mate-control-center-1.8.1/font-viewer/mate-font-viewer.desktop.in.in
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/font-viewer/mate-font-viewer.desktop.in.in
2014-07-11 13:57:26.000000000 +0200
@@ -8,3 +8,4 @@
StartupNotify=true
NoDisplay=true
MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
+Keywords=mate-control-center;MATE;font;viewer;preview;desktop;preferences;
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/mate-control-center-1.8.1/libwindow-settings/marco-window-manager.c
new/mate-control-center-1.8.2/libwindow-settings/marco-window-manager.c
--- old/mate-control-center-1.8.1/libwindow-settings/marco-window-manager.c
2014-03-05 21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/libwindow-settings/marco-window-manager.c
2014-07-11 13:56:28.000000000 +0200
@@ -121,18 +121,33 @@
return current_list;
for (entry = readdir (theme_dir); entry != NULL; entry = readdir
(theme_dir)) {
- theme_file_path = g_build_filename (path, entry->d_name,
"metacity-1/metacity-theme-1.xml", NULL);
+ theme_file_path = g_build_filename (path, entry->d_name,
"metacity-1/metacity-theme-2.xml", NULL);
if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS)) {
for (node = current_list; (node != NULL) && (!found);
node = node->next) {
found = (strcmp (node->data, entry->d_name) ==
0);
}
-
+
if (!found) {
current_list = g_list_prepend (current_list,
g_strdup (entry->d_name));
}
}
+ else {
+ g_free (theme_file_path);
+ theme_file_path = g_build_filename (path,
entry->d_name, "metacity-1/metacity-theme-1.xml", NULL);
+
+ if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS))
{
+
+ for (node = current_list; (node != NULL) &&
(!found); node = node->next) {
+ found = (strcmp (node->data,
entry->d_name) == 0);
+ }
+
+ if (!found) {
+ current_list = g_list_prepend
(current_list, g_strdup (entry->d_name));
+ }
+ }
+ }
found = FALSE;
/*g_free (entry);*/
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/mate-control-center-1.8.1/m4/intltool.m4
new/mate-control-center-1.8.2/m4/intltool.m4
--- old/mate-control-center-1.8.1/m4/intltool.m4 2014-03-15
14:29:55.000000000 +0100
+++ new/mate-control-center-1.8.2/m4/intltool.m4 2014-07-11
14:03:13.000000000 +0200
@@ -155,31 +155,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
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/mate-control-center-1.8.1/m4/libtool.m4
new/mate-control-center-1.8.2/m4/libtool.m4
--- old/mate-control-center-1.8.1/m4/libtool.m4 2014-03-15 14:29:58.000000000
+0100
+++ new/mate-control-center-1.8.2/m4/libtool.m4 2014-07-11 14:03:18.000000000
+0200
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1324,19 +1324,9 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
- ;;
- powerpc64le-*)
- LD="${LD-ld} -m elf32lppclinux"
+ LD="${LD-ld} -m elf_i386"
;;
- powerpc64-*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1355,10 +1345,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*)
- LD="${LD-ld} -m elf64lppc"
- ;;
- powerpc-*)
+ ppc*-*linux*|powerpc*-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1701,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2493,7 +2479,14 @@
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2504,6 +2497,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix
$libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -2526,6 +2525,17 @@
esac
;;
+gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2642,7 +2652,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2687,18 +2697,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3258,6 +3256,10 @@
fi
;;
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3296,11 +3298,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4048,7 +4050,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4112,7 +4114,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4347,7 +4349,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4589,9 +4591,6 @@
;;
esac
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience |
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4654,9 +4653,6 @@
openbsd*)
with_gnu_ld=no
;;
- linux* | k*bsd*-gnu | gnu*)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4878,7 +4874,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
@@ -5055,7 +5051,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5360,7 +5355,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags' # a.out
else
@@ -6240,6 +6235,9 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
+ gnu*)
+ ;;
+
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6401,7 +6399,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
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/mate-control-center-1.8.1/po/Makefile.in.in
new/mate-control-center-1.8.2/po/Makefile.in.in
--- old/mate-control-center-1.8.1/po/Makefile.in.in 2014-03-15
14:29:55.000000000 +0100
+++ new/mate-control-center-1.8.2/po/Makefile.in.in 2014-07-11
14:03:13.000000000 +0200
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -108,7 +107,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f
$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f
$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
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/mate-control-center-1.8.1/shell/matecc.desktop.in.in
new/mate-control-center-1.8.2/shell/matecc.desktop.in.in
--- old/mate-control-center-1.8.1/shell/matecc.desktop.in.in 2014-03-05
21:55:21.000000000 +0100
+++ new/mate-control-center-1.8.2/shell/matecc.desktop.in.in 2014-07-11
13:57:26.000000000 +0200
@@ -7,4 +7,5 @@
Type=Application
StartupNotify=true
Categories=GTK;Settings;
+Keywords=MATE;control;center;configuration;tool;destop;preferences;
OnlyShowIn=MATE;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
