[SCM] mate-system-monitor Debian package branch, master, updated. debian/1.6.1+dfsg1-1-12-gfc5e3e3

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-system-monitor.git;a=commitdiff;h=a2c90bb

The following commit has been merged in the master branch:
commit a2c90bb3a150e244528967f6246efa6742b51228
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 14 17:11:33 2014 +0100

    debian/patches: Drop 1001_add-keywords-to-desktop-file.patch. Fixed upstream.
---
 debian/patches/1001_add-keywords-to-desktop-file.patch | 12 ------------
 debian/patches/series                                  |  1 -
 2 files changed, 13 deletions(-)

diff --git a/debian/patches/1001_add-keywords-to-desktop-file.patch b/debian/patches/1001_add-keywords-to-desktop-file.patch
deleted file mode 100644
index 656fbd7..0000000
--- a/debian/patches/1001_add-keywords-to-desktop-file.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Add keywords key to .desktop file
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/mate-system-monitor.desktop.in.in
-+++ b/mate-system-monitor.desktop.in.in
-@@ -9,6 +9,7 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;System;Monitor;
-+Keywords=MATE;system;monitor;process;list;view;current;resources;
- OnlyShowIn=MATE;
- X-MATE-Bugzilla-Bugzilla=MATE
- X-MATE-Bugzilla-Product=system-monitor
diff --git a/debian/patches/series b/debian/patches/series
index eeac465..83b110e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-1001_add-keywords-to-desktop-file.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
mate-system-monitor Debian package