[SCM] marco Debian package branch, master, updated. debian/1.8.2+dfsg1-1-5-g30b1f48

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=ba01d15

The following commit has been merged in the master branch:
commit ba01d155ff0f4390acc9a8c184026f53ef76b5c1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 23 01:15:36 2014 +0200

    debian/patches: Add 0002_update-keybindings-files-with-new-name.patch. Fix window manager name in keybindings files.
---
 ...02_update-keybindings-files-with-new-name.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/0002_update-keybindings-files-with-new-name.patch b/debian/patches/0002_update-keybindings-files-with-new-name.patch
new file mode 100644
index 0000000..b158918
--- /dev/null
+++ b/debian/patches/0002_update-keybindings-files-with-new-name.patch
@@ -0,0 +1,38 @@
+From c2cbcaa90d88d3d74dc7b79cae17964f4243a51d Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Thu, 2 Oct 2014 14:51:29 +0200
+Subject: [PATCH] Update keybindings files with new name
+
+---
+ src/50-marco-desktop-key.xml.in | 2 +-
+ src/50-marco-global-key.xml.in  | 2 +-
+ src/50-marco-window-key.xml.in  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/50-marco-desktop-key.xml.in
++++ b/src/50-marco-desktop-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Desktop" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
++<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+ 
+ 	<KeyListEntry name="panel-run-dialog" _description="Show the panel's "Run Application" dialog box" />
+ 
+--- a/src/50-marco-global-key.xml.in
++++ b/src/50-marco-global-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
+ 
+ 	<KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" />
+ 
+--- a/src/50-marco-window-key.xml.in
++++ b/src/50-marco-window-key.xml.in
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.window-keybindings">
++<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
+ 
+ 	<KeyListEntry
+ 	name="activate-window-menu"
diff --git a/debian/patches/series b/debian/patches/series
index d3bb327..b64fa6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_use-zenity-instead-of-mate-dialogs.patch
+0002_update-keybindings-files-with-new-name.patch
 2001_omit-gfdl-licensed-theme-documentation.patch

-- 
marco Debian package