[mate-control-center] 09/14: debian/patches: Adapt Debian patchset to this release.
Mike Gabriel
sunweaver at debian.org
Thu Jun 18 09:03:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch debian/experimental
in repository mate-control-center.
commit 4269bf4a5a3b318008c1442f51ef0f1a72fe6bd5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jun 17 16:49:42 2015 +0200
debian/patches: Adapt Debian patchset to this release.
0001_fix-NEWS-1.8.3.patch. Requires more work upstream.
0002_initialize-mouse-focus-checkbox.patch. Applied upstream.
0003_fix-i18n-category-names.patch. Applied upstream.
0004_fix-set-preferred-apps-in-some-locales.patch. Applied upstream.
0005_fix-desktop-item-launching.patch. Applied upstream.
1005_rename-libslab-to-libmate-slab0.patch. Applied upstream.
2001_omit-gfdl-licensed-help-files.patch. Rebased against this upstream release.
2002_fix-common-tasks-section-for-German-locale.patch. Applied upstream.
---
debian/patches/0001_fix-NEWS-1.8.3.patch | 27 ---
.../0002_initialize-mouse-focus-checkbox.patch | 23 --
debian/patches/0003_fix-i18n-category-names.patch | 52 -----
...04_fix-set-preferred-apps-in-some-locales.patch | 26 ---
.../patches/0005_fix-desktop-item-launching.patch | 23 --
.../1005_rename-libslab-to-libmate-slab0.patch | 239 ---------------------
.../2001_omit-gfdl-licensed-help-files.patch | 12 +-
...ix-common-tasks-section-for-German-locale.patch | 14 --
debian/patches/series | 7 -
9 files changed, 6 insertions(+), 417 deletions(-)
diff --git a/debian/patches/0001_fix-NEWS-1.8.3.patch b/debian/patches/0001_fix-NEWS-1.8.3.patch
deleted file mode 100644
index 3e9406a..0000000
--- a/debian/patches/0001_fix-NEWS-1.8.3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f39852e19f77e7b852f7dc425d0f37479cfd28c8 Mon Sep 17 00:00:00 2001
-From: infirit <infirit at gmail.com>
-Date: Tue, 7 Oct 2014 21:04:57 +0200
-Subject: [PATCH] Fix NEWS
-
----
- NEWS | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 27feaf4..33bfe3e 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,9 +1,11 @@
-+1.8.3
-+ * Update Marco WM name
-+ * Fix segfault with custom keybindings
-+
- 1.8.2
- * Fix typo in togglekeys-enable (a11y).
- * Allow metacity-2 themes in appearance capplet.
- * Several man page and desktop file fixes.
-- * Update Marco WM name
-- * Fix segfault with custom keybindings
-
- 1.8.1
- * default-applications: Add support for accessibility applications
diff --git a/debian/patches/0002_initialize-mouse-focus-checkbox.patch b/debian/patches/0002_initialize-mouse-focus-checkbox.patch
deleted file mode 100644
index 3eb6909..0000000
--- a/debian/patches/0002_initialize-mouse-focus-checkbox.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 409a1c4bb5b3468a72145ecad9253c22566a0e78 Mon Sep 17 00:00:00 2001
-From: Mike Mueller <mike at subfocal.net>
-Date: Fri, 17 Oct 2014 00:45:15 -0700
-Subject: [PATCH] windows: Initialize mouse focus checkbox
-
-Was showing unchecked, even if the mouse focus setting was set to 'sloppy'.
----
- capplets/windows/mate-window-properties.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c
-index 03a9863..d2f3e4d 100644
---- a/capplets/windows/mate-window-properties.c
-+++ b/capplets/windows/mate-window-properties.c
-@@ -477,6 +477,8 @@ main (int argc, char **argv)
- G_CALLBACK (mouse_focus_toggled_callback), NULL);
- g_signal_connect (marco_settings, "changed::" MARCO_FOCUS_KEY,
- G_CALLBACK (mouse_focus_changed_callback), NULL);
-+ /* Initialize the checkbox state appropriately */
-+ mouse_focus_changed_callback(marco_settings, MARCO_FOCUS_KEY, NULL);
-
- g_settings_bind (marco_settings,
- MARCO_AUTORAISE_KEY,
diff --git a/debian/patches/0003_fix-i18n-category-names.patch b/debian/patches/0003_fix-i18n-category-names.patch
deleted file mode 100644
index c4a41b7..0000000
--- a/debian/patches/0003_fix-i18n-category-names.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5ebc88406f51fe36bfb03319f1d4fb5ed8888b55 Mon Sep 17 00:00:00 2001
-From: rezso <rezso at rezso.net>
-Date: Sun, 25 Jan 2015 17:13:08 +0100
-Subject: [PATCH] Use MATE's own .directory files in matecc
-
-First: Personal.directory, InternetAndNetwork.directory, Hardware.directory and System.directory shipped by gnome-menus, which is causes an unwanted gnome-menus dependency.
-Second: because of different gettext domains, the translations are unused.
----
- shell/matecc.menu | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/shell/matecc.menu b/shell/matecc.menu
-index b0beba5..a99fdf7 100644
---- a/shell/matecc.menu
-+++ b/shell/matecc.menu
-@@ -46,7 +46,7 @@
- <!-- Personal category -->
- <Menu>
- <Name>Personal</Name>
-- <Directory>Personal.directory</Directory>
-+ <Directory>mate-personal.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
-@@ -62,7 +62,7 @@
- <!-- Internet and Network category -->
- <Menu>
- <Name>Internet and Network</Name>
-- <Directory>InternetAndNetwork.directory</Directory>
-+ <Directory>mate-internet-and-network.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
-@@ -74,7 +74,7 @@
- <!-- Hardware category -->
- <Menu>
- <Name>Hardware</Name>
-- <Directory>Hardware.directory</Directory>
-+ <Directory>mate-hardware.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
-@@ -86,7 +86,7 @@
- <!-- System category -->
- <Menu>
- <Name>System</Name>
-- <Directory>System.directory</Directory>
-+ <Directory>mate-system.directory</Directory>
- <Include>
- <And>
- <Category>Settings</Category>
-
diff --git a/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch b/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch
deleted file mode 100644
index 8d1776c..0000000
--- a/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: mate-control-center-1.8.3+dfsg1/po/ru.po
-===================================================================
---- mate-control-center-1.8.3+dfsg1.orig/po/ru.po
-+++ mate-control-center-1.8.3+dfsg1/po/ru.po
-@@ -31,7 +31,7 @@ msgstr ""
- msgid ""
- "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
- "Applications;mate-default-applications-properties.desktop' ]"
--msgstr "[ 'Изменить тему;mate-appearance-properties.desktop', 'Выставить предпочтительные приложения;mate-default-applications.desktop']"
-+msgstr "[ 'Изменить тему;mate-appearance-properties.desktop', 'Выставить предпочтительные приложения;mate-default-applications-properties.desktop']"
-
- #: ../org.mate.control-center.gschema.xml.in.in.h:2
- msgid "Task names and associated .desktop files"
-Index: mate-control-center-1.8.3+dfsg1/po/uk.po
-===================================================================
---- mate-control-center-1.8.3+dfsg1.orig/po/uk.po
-+++ mate-control-center-1.8.3+dfsg1/po/uk.po
-@@ -28,7 +28,7 @@ msgstr ""
- msgid ""
- "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
- "Applications;mate-default-applications-properties.desktop' ]"
--msgstr "[ 'Змінити тему;mate-appearance-properties.desktop', 'Виставити бажані додатки;mate-default-applications.desktop']"
-+msgstr "[ 'Змінити тему;mate-appearance-properties.desktop', 'Виставити бажані додатки;mate-default-applications-properties.desktop']"
-
- #: ../org.mate.control-center.gschema.xml.in.in.h:2
- msgid "Task names and associated .desktop files"
diff --git a/debian/patches/0005_fix-desktop-item-launching.patch b/debian/patches/0005_fix-desktop-item-launching.patch
deleted file mode 100644
index 09122ab..0000000
--- a/debian/patches/0005_fix-desktop-item-launching.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e1ba5271d8ef3b80e81e8d3f4469fe76d46d6c68 Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Wed, 25 Mar 2015 15:25:08 +0300
-Subject: [PATCH] libslab: do not reap child when launching desktop items
-
-should be used after https://github.com/mate-desktop/mate-desktop/pull/167 is applied
----
- libslab/slab-mate-util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libslab/slab-mate-util.c b/libslab/slab-mate-util.c
-index a4527dc..2acf9d0 100644
---- a/libslab/slab-mate-util.c
-+++ b/libslab/slab-mate-util.c
-@@ -127,7 +127,7 @@ open_desktop_item_exec (MateDesktopItem * desktop_item)
- if (!desktop_item)
- return FALSE;
-
-- mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE, &error);
-+ mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE | MATE_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD, &error);
-
- if (error)
- {
diff --git a/debian/patches/1005_rename-libslab-to-libmate-slab0.patch b/debian/patches/1005_rename-libslab-to-libmate-slab0.patch
deleted file mode 100644
index f7ca944..0000000
--- a/debian/patches/1005_rename-libslab-to-libmate-slab0.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-Description: Rename libslab to libmate-slab
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/mate-control-center/issues/100
-Abstract:
- This is to avoid package name and version conflicts with
- libslab0 / libslab0a which existed in Debian until squeeze.
- .
- MATE components (currently only gnome-main-menu) depending
- on libmate-slab0 have to be patch accordingly.
---- a/libslab/Makefile.am
-+++ b/libslab/Makefile.am
-@@ -1,5 +1,5 @@
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = libslab.pc
-+pkgconfig_DATA = mate-slab.pc
-
- AM_CPPFLAGS = \
- -I$(top_srcdir) \
-@@ -28,9 +28,9 @@
- system-tile.h \
- tile.h
-
--lib_LTLIBRARIES = libslab.la
-+lib_LTLIBRARIES = libmate-slab.la
-
--libslab_la_SOURCES = \
-+libmate_slab_la_SOURCES = \
- $(MARSHAL_GENERATED) \
- app-resizer.c \
- app-shell.c \
-@@ -55,9 +55,9 @@
- tile-action.c \
- tile.c
-
--libslab_includedir = $(includedir)/libslab
--libslab_include_HEADERS = $(HEADER_FILES)
--libslab_la_LIBADD = $(LIBSLAB_LIBS)
-+libmate_slab_includedir = $(includedir)/libmate-slab
-+libmate_slab_include_HEADERS = $(HEADER_FILES)
-+libmate_slab_la_LIBADD = $(LIBSLAB_LIBS)
-
- search-entry-watermark.h: search-entry-watermark.svg
- echo '#define SEARCH_ENTRY_WATERMARK_SVG "\' > $@; \
---- a/configure.ac
-+++ b/configure.ac
-@@ -182,20 +182,20 @@
- PKG_CHECK_MODULES(GLIB, glib-2.0 $GMODULE_ADD)
-
- dnl
--dnl Check dependencies of libslab
-+dnl Check dependencies of libmate-slab
- dnl
- PKG_CHECK_MODULES(LIBSLAB, [
- gio-2.0 mate-desktop-2.0 librsvg-2.0 libmate-menu pango
- ],
-- have_libslab=yes,
-- have_libslab=no)
-+ have_libmateslab=yes,
-+ have_libmateslab=no)
- WARN_CFLAGS="-Wall"
-
--AC_SUBST(LIBSLAB_CFLAGS)
--AC_SUBST(LIBSLAB_LIBS)
-+AC_SUBST(LIBMATESLAB_CFLAGS)
-+AC_SUBST(LIBMATESLAB_LIBS)
- AC_SUBST(WARN_CFLAGS)
-
--AM_CONDITIONAL(HAVE_LIBSLAB, [test $have_libslab = yes])
-+AM_CONDITIONAL(HAVE_LIBMATESLAB, [test $have_libmateslab = yes])
-
- dnl
- dnl Check for Xft version 2; we build in extra functionality to the font capplet
-@@ -371,7 +371,7 @@
- libwindow-settings/Makefile
- libwindow-settings/mate-window-settings-2.0.pc
- po/Makefile.in
--libslab/libslab.pc
-+libslab/mate-slab.pc
- libslab/Makefile
- shell/Makefile
- shell/matecc.desktop.in
-@@ -390,7 +390,7 @@
-
- GTK+ API version: ${GTK_API_VERSION}
- Appindicator: ${enable_appindicator}
-- Libslab: ${have_libslab}
-+ Libmate-slab: ${have_libmateslab}
- XCursor support: ${have_xcursor}
- XInput support: ${have_xinput}
- Ubuntu hacks: ${enable_ubuntu}
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,11 +1,11 @@
- SUBDIRS = po libwindow-settings capplets font-viewer help
- DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
-
--if HAVE_LIBSLAB
-+if HAVE_LIBMATESLAB
- SUBDIRS += libslab
- endif
-
--if HAVE_LIBSLAB
-+if HAVE_LIBMATESLAB
- SUBDIRS += shell
- endif
-
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -1,5 +1,5 @@
- REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
--REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la
-+REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libmate-slab.la
-
- AM_CPPFLAGS = \
- -I$(top_srcdir) \
---- a/libslab/app-resizer.h
-+++ b/libslab/app-resizer.h
-@@ -24,7 +24,7 @@
- #include <glib.h>
- #include <gtk/gtk.h>
-
--#include <libslab/app-shell.h>
-+#include "app-shell.h"
-
- #ifdef __cplusplus
- extern "C" {
---- a/libslab/app-shell.h
-+++ b/libslab/app-shell.h
-@@ -28,8 +28,8 @@
- #include <matemenu-tree.h>
- #include <libmate-desktop/mate-desktop-item.h>
-
--#include <libslab/slab-section.h>
--#include <libslab/tile.h>
-+#include "slab-section.h"
-+#include "tile.h"
-
- #ifdef __cplusplus
- extern "C" {
---- a/libslab/application-tile.h
-+++ b/libslab/application-tile.h
-@@ -21,7 +21,7 @@
- #ifndef __APPLICATION_TILE_H__
- #define __APPLICATION_TILE_H__
-
--#include <libslab/nameplate-tile.h>
-+#include "nameplate-tile.h"
-
- #include <libmate-desktop/mate-desktop-item.h>
-
---- a/libslab/directory-tile.h
-+++ b/libslab/directory-tile.h
-@@ -23,7 +23,7 @@
-
- #include <time.h>
-
--#include <libslab/nameplate-tile.h>
-+#include "nameplate-tile.h"
-
- #ifdef __cplusplus
- extern "C" {
---- a/libslab/nameplate-tile.h
-+++ b/libslab/nameplate-tile.h
-@@ -21,7 +21,7 @@
- #ifndef __NAMEPLATE_TILE_H__
- #define __NAMEPLATE_TILE_H__
-
--#include <libslab/tile.h>
-+#include "tile.h"
-
- #include <gtk/gtk.h>
-
---- a/libslab/shell-window.h
-+++ b/libslab/shell-window.h
-@@ -25,7 +25,7 @@
- #include <gtk/gtk.h>
- #include <libmate-desktop/mate-desktop-item.h>
-
--#include <libslab/app-shell.h>
-+#include "app-shell.h"
-
- #ifdef __cplusplus
- extern "C" {
---- a/libslab/slab.h
-+++ b/libslab/slab.h
-@@ -22,24 +22,24 @@
- #ifndef __SLAB_H__
- #define __SLAB_H__
-
--#include <libslab/app-resizer.h>
--#include <libslab/app-shell.h>
--#include <libslab/application-tile.h>
--#include <libslab/bookmark-agent.h>
--#include <libslab/directory-tile.h>
--#include <libslab/document-tile.h>
--#include <libslab/double-click-detector.h>
--#include <libslab/mate-utils.h>
--#include <libslab/libslab-utils.h>
--#include <libslab/nameplate-tile.h>
--#include <libslab/search-bar.h>
--#include <libslab/search-context-picker.h>
--#include <libslab/search-entry.h>
--#include <libslab/shell-window.h>
--#include <libslab/slab-mate-util.h>
--#include <libslab/slab-section.h>
--#include <libslab/system-tile.h>
--#include <libslab/tile.h>
-+#include "app-resizer.h"
-+#include "app-shell.h"
-+#include "application-tile.h"
-+#include "bookmark-agent.h"
-+#include "directory-tile.h"
-+#include "document-tile.h"
-+#include "double-click-detector.h"
-+#include "mate-utils.h"
-+#include "libslab-utils.h"
-+#include "nameplate-tile.h"
-+#include "search-bar.h"
-+#include "search-context-picker.h"
-+#include "search-entry.h"
-+#include "shell-window.h"
-+#include "slab-mate-util.h"
-+#include "slab-section.h"
-+#include "system-tile.h"
-+#include "tile.h"
-
- #endif /* __SLAB_H__ */
-
---- a/libslab/system-tile.h
-+++ b/libslab/system-tile.h
-@@ -21,7 +21,7 @@
- #ifndef __SYSTEM_TILE_H__
- #define __SYSTEM_TILE_H__
-
--#include <libslab/nameplate-tile.h>
-+#include "nameplate-tile.h"
-
- #include <libmate-desktop/mate-desktop-item.h>
-
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
index a71bc72..ac16908 100644
--- a/debian/patches/2001_omit-gfdl-licensed-help-files.patch
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -3,20 +3,20 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
--SUBDIRS = po libwindow-settings capplets font-viewer help
--DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
-+SUBDIRS = po libwindow-settings capplets font-viewer
-+DIST_SUBDIRS = po libwindow-settings capplets font-viewer libslab shell typing-break
+-SUBDIRS = po libwindow-settings capplets font-viewer help man
+-DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break man
++SUBDIRS = po libwindow-settings capplets font-viewer man
++DIST_SUBDIRS = po libwindow-settings capplets font-viewer libslab shell typing-break man
if HAVE_LIBMATESLAB
SUBDIRS += libslab
--- a/configure.ac
+++ b/configure.ac
-@@ -367,7 +367,6 @@
+@@ -368,7 +368,6 @@
capplets/windows/mate-window-properties.desktop.in
font-viewer/Makefile
font-viewer/mate-font-viewer.desktop.in
-help/Makefile
libwindow-settings/Makefile
libwindow-settings/mate-window-settings-2.0.pc
- po/Makefile.in
+ man/Makefile
diff --git a/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch b/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch
deleted file mode 100644
index 6d573f4..0000000
--- a/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Quotation mark fix in German translation file.
-Author: Wolfgang Ulbrich <chat-to-me at raveit.de>
-
---- a/po/de.po
-+++ b/po/de.po
-@@ -40,7 +40,7 @@
- msgid ""
- "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
- "Applications;mate-default-applications-properties.desktop' ]"
--msgstr "[ »Thema ändern;mate-appearance-properties.desktop«, »Bevorzugte Anwendungen einstellen;mate-default-applications-properties.desktop« ]"
-+msgstr "[ 'Thema ändern;mate-appearance-properties.desktop', 'Bevorzugte Anwendungen einstellen;mate-default-applications-properties.desktop' ]"
-
- #: ../org.mate.control-center.gschema.xml.in.in.h:2
- msgid "Task names and associated .desktop files"
diff --git a/debian/patches/series b/debian/patches/series
index 1483536..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1 @@
-0001_fix-NEWS-1.8.3.patch
-0002_initialize-mouse-focus-checkbox.patch
-0003_fix-i18n-category-names.patch
-0004_fix-set-preferred-apps-in-some-locales.patch
-0005_fix-desktop-item-launching.patch
-1005_rename-libslab-to-libmate-slab0.patch
2001_omit-gfdl-licensed-help-files.patch
-2002_fix-common-tasks-section-for-German-locale.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-control-center.git
More information about the pkg-mate-commits
mailing list