[SCM] mate-file-manager Debian package branch, master, updated. 1da62a557c9ef9dca4a8746bbf8732d6f6538836

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=669e617

The following commit has been merged in the master branch:
commit 669e61710ba99ddd159657a5667a8789743bc49f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Apr 5 22:10:46 2014 +0200

    debian/patches: Drop 1001_add-keywords-to-desktop-files.patch. Applied upstream.
---
 .../1001_add-keywords-to-desktop-files.patch       | 50 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/1001_add-keywords-to-desktop-files.patch b/debian/patches/1001_add-keywords-to-desktop-files.patch
deleted file mode 100644
index 5ef550b..0000000
--- a/debian/patches/1001_add-keywords-to-desktop-files.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Provide Keywords key for .desktop files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/data/caja-browser.desktop.in.in
-+++ b/data/caja-browser.desktop.in.in
-@@ -9,6 +9,7 @@
- StartupNotify=true
- Type=Application
- Categories=GTK;System;Utility;Core;
-+Keywords=files;browser;manager;MATE;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=caja
---- a/data/caja-computer.desktop.in.in
-+++ b/data/caja-computer.desktop.in.in
-@@ -8,6 +8,7 @@
- StartupNotify=true
- Type=Application
- Categories=GTK;Core;
-+Keywords=browse;disks;folders;local;remote;computer;MATE;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=caja
---- a/src/mate-network-scheme.desktop.in
-+++ b/src/mate-network-scheme.desktop.in
-@@ -8,4 +8,5 @@
- Type=Application
- Icon=network-workgroup
- Categories=Core;
-+Keywords=bookmarks;browse;local;network;locations;MATE;
- OnlyShowIn=MATE;
---- a/data/caja-home.desktop.in.in
-+++ b/data/caja-home.desktop.in.in
-@@ -8,6 +8,7 @@
- StartupNotify=true
- Type=Application
- Categories=GTK;Core;
-+Keywords=home;personal;folder;open;MATE;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=caja
---- a/data/caja-file-management-properties.desktop.in.in
-+++ b/data/caja-file-management-properties.desktop.in.in
-@@ -7,6 +7,7 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;X-MATE-PersonalSettings;
-+Keywords=file;manager;change;properties;behaviour;appearance;windows;MATE;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=caja
diff --git a/debian/patches/series b/debian/patches/series
index c7a5f19..753965f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-1001_add-keywords-to-desktop-files.patch
 1002_fix-caja-autorun-software-man-page.patch
 1003_fix-missing-main-category-in-desktop-files.patch

-- 
mate-file-manager Debian package