[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=f0468ee

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

    debian/patches: Drop 1003_fix-missing-main-category-in-desktop-files.patch. Applied upstream.
---
 ...ix-missing-main-category-in-desktop-files.patch | 41 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 42 deletions(-)

diff --git a/debian/patches/1003_fix-missing-main-category-in-desktop-files.patch b/debian/patches/1003_fix-missing-main-category-in-desktop-files.patch
deleted file mode 100644
index f37306f..0000000
--- a/debian/patches/1003_fix-missing-main-category-in-desktop-files.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Add a desktop file main category to categories
-Author: Sander Sweers
---- a/data/caja-computer.desktop.in.in
-+++ b/data/caja-computer.desktop.in.in
-@@ -7,9 +7,10 @@
- Terminal=false
- StartupNotify=true
- Type=Application
--Categories=GTK;Core;
-+Categories=GTK;System;Core;
- Keywords=browse;disks;folders;local;remote;computer;MATE;
- OnlyShowIn=MATE;
-+NoDisplay=true;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=caja
- X-MATE-Bugzilla-Component=general
---- a/data/caja-home.desktop.in.in
-+++ b/data/caja-home.desktop.in.in
-@@ -7,9 +7,10 @@
- Terminal=false
- StartupNotify=true
- Type=Application
--Categories=GTK;Core;
-+Categories=GTK;System;Core;
- Keywords=home;personal;folder;open;MATE;
- OnlyShowIn=MATE;
-+NoDisplay=true;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=caja
- X-MATE-Bugzilla-Component=general
---- a/src/mate-network-scheme.desktop.in
-+++ b/src/mate-network-scheme.desktop.in
-@@ -7,6 +7,7 @@
- StartupNotify=true
- Type=Application
- Icon=network-workgroup
--Categories=Core;
-+Categories=GTK;System;Core;
- Keywords=bookmarks;browse;local;network;locations;MATE;
- OnlyShowIn=MATE;
-+NoDisplay=true;
diff --git a/debian/patches/series b/debian/patches/series
index 58c61c3..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-1003_fix-missing-main-category-in-desktop-files.patch

-- 
mate-file-manager Debian package