[SCM] mate-control-center Debian package branch, master, updated. debian/1.8.1+dfsg1-4-3-gbb2fb41

Mike Gabriel sunweaver at moszumanska.debian.org
Tue Aug 19 16:51:57 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=b0f414e

The following commit has been merged in the master branch:
commit b0f414e342e880b51f5f13d0a71c377f4a1c6bb2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 4 17:17:41 2014 +0200

    New upstream release.
    
    * New upstream release.
    * debian/patches:
      + Drop 1002_spelling-check-in-man-pages.patch. Applied upstream.
      + Drop 1003_add-keywords-key-to-desktop-files.patch. Applied upstream.
      + Drop 1004_add-main-category-to-categories-key-in-desktop-file.patch.
        Applied upstream.
---
 debian/changelog                                   |  11 +++
 .../patches/1002_spelling-check-in-man-pages.patch |  53 ----------
 .../1003_add-keywords-key-to-desktop-files.patch   | 107 ---------------------
 ...ategory-to-categories-key-in-desktop-file.patch |  14 ---
 debian/patches/series                              |   3 -
 5 files changed, 11 insertions(+), 177 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a94752f..90c7457 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mate-control-center (1.8.2+dfsg1-1.1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    + Drop 1002_spelling-check-in-man-pages.patch. Applied upstream.
+    + Drop 1003_add-keywords-key-to-desktop-files.patch. Applied upstream.
+    + Drop 1004_add-main-category-to-categories-key-in-desktop-file.patch.
+      Applied upstream.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Aug 2014 17:16:08 +0200
+
 mate-control-center (1.8.1+dfsg1-4) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/1002_spelling-check-in-man-pages.patch b/debian/patches/1002_spelling-check-in-man-pages.patch
deleted file mode 100644
index 2629083..0000000
--- a/debian/patches/1002_spelling-check-in-man-pages.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Grammar fix for man page mate-about-me.1
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/mate-control-center/issues/101
---- a/capplets/about-me/mate-about-me.1
-+++ b/capplets/about-me/mate-about-me.1
-@@ -11,8 +11,8 @@
- .PP 
- MATE About Me is a control center applet to set user information.
- .PP
--It allows to change user password and set user avatar image (~/.face file). 
-+It allows one to change user password and set user avatar image (~/.face file). 
- 
- .SH "AUTHOR" 
- .PP 
--This manual page was written by Stefano Karapetsas <stefano at karapetsas.com>.
-\ No newline at end of file
-+This manual page was written by Stefano Karapetsas <stefano at karapetsas.com>.
---- a/capplets/default-applications/mate-default-applications-properties.1
-+++ b/capplets/default-applications/mate-default-applications-properties.1
-@@ -12,7 +12,7 @@
- MATE Default Applications Properties is a control center applet to edit
- default applications.
- .PP
--It allows to set default file manager, email client, web browser, etc. 
-+It allows one to set default file manager, email client, web browser, etc. 
- 
- .SH "OPTIONS" 
- .PP 
-@@ -21,4 +21,4 @@
- 
- .SH "AUTHOR" 
- .PP 
--This manual page was written by Stefano Karapetsas <stefano at karapetsas.com>.
-\ No newline at end of file
-+This manual page was written by Stefano Karapetsas <stefano at karapetsas.com>.
---- a/capplets/appearance/data/mate-appearance-properties.1
-+++ b/capplets/appearance/data/mate-appearance-properties.1
-@@ -12,7 +12,7 @@
- MATE Appearance Properties is a control center applet to edit appearance
- settings.
- .PP
--It allows to change: GTK theme, window manager theme, icon theme, cursor
-+It allows one to change: GTK theme, window manager theme, icon theme, cursor
- theme, desktop background and font settings. 
- 
- .SH "OPTIONS" 
-@@ -25,4 +25,4 @@
- 
- .SH "AUTHOR" 
- .PP 
--This manual page was written by Stefano Karapetsas <stefano at karapetsas.com>.
-\ No newline at end of file
-+This manual page was written by Stefano Karapetsas <stefano at karapetsas.com>.
diff --git a/debian/patches/1003_add-keywords-key-to-desktop-files.patch b/debian/patches/1003_add-keywords-key-to-desktop-files.patch
deleted file mode 100644
index 9aa9519..0000000
--- a/debian/patches/1003_add-keywords-key-to-desktop-files.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Add keywords key to .desktop files
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/mate-control-center/issues/102
---- a/capplets/about-me/mate-about-me.desktop.in.in
-+++ b/capplets/about-me/mate-about-me.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;X-MATE-PersonalSettings;
-+Keywords=mate-control-center;MATE;personal;information;
- OnlyShowIn=MATE;
---- a/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
-+++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;
-+Keywords=mate-control-center;MATE;accessibility;features;
- OnlyShowIn=MATE;
---- a/capplets/appearance/data/mate-appearance-properties.desktop.in.in
-+++ b/capplets/appearance/data/mate-appearance-properties.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;DesktopSettings;
-+Keywords=mate-control-center;MATE;appearance;properties;desktop;customize;look;
- OnlyShowIn=MATE;
---- a/capplets/appearance/data/mate-theme-installer.desktop.in.in
-+++ b/capplets/appearance/data/mate-theme-installer.desktop.in.in
-@@ -8,5 +8,6 @@
- MimeType=application/x-mate-theme-package;
- StartupNotify=true
- Categories=GTK;
-+Keywords=mate-control-center;MATE;install;desktop;themes;
- NoDisplay=true
- OnlyShowIn=MATE;
---- a/capplets/default-applications/mate-default-applications-properties.desktop.in.in
-+++ b/capplets/default-applications/mate-default-applications-properties.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;X-MATE-PersonalSettings;
-+Keywords=mate-control-center;MATE;default;preferred;applications;
- OnlyShowIn=MATE;
---- a/capplets/display/mate-display-properties.desktop.in.in
-+++ b/capplets/display/mate-display-properties.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;HardwareSettings;
-+Keywords=mate-control-center;MATE;resolution;position;monitors;display;properties;
- OnlyShowIn=MATE;
---- a/capplets/keybindings/mate-keybinding.desktop.in.in
-+++ b/capplets/keybindings/mate-keybinding.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;
-+Keywords=mate-control-center;MATE;assign;keyboard;shortcuts;keybindings;
- OnlyShowIn=MATE;
---- a/capplets/keyboard/mate-keyboard.desktop.in.in
-+++ b/capplets/keyboard/mate-keyboard.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;HardwareSettings;
-+Keywords=mate-control-center;MATE;keyboard;preferences;
- OnlyShowIn=MATE;
---- a/capplets/mouse/mate-settings-mouse.desktop.in.in
-+++ b/capplets/mouse/mate-settings-mouse.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;HardwareSettings;
-+Keywords=mate-control-center;MATE;mouse;preferences;
- OnlyShowIn=MATE;
---- a/capplets/network/mate-network-properties.desktop.in.in
-+++ b/capplets/network/mate-network-properties.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;
-+Keywords=mate-control-center;MATE;network;http;socks;proxy;
- OnlyShowIn=MATE;
---- a/font-viewer/mate-font-viewer.desktop.in.in
-+++ b/font-viewer/mate-font-viewer.desktop.in.in
-@@ -8,3 +8,4 @@
- StartupNotify=true
- NoDisplay=true
- MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
-+Keywords=mate-control-center;MATE;font;viewer;preview;desktop;preferences;
---- a/shell/matecc.desktop.in.in
-+++ b/shell/matecc.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;
-+Keywords=MATE;control;center;configuration;tool;destop;preferences;
- OnlyShowIn=MATE;
---- a/capplets/windows/mate-window-properties.desktop.in.in
-+++ b/capplets/windows/mate-window-properties.desktop.in.in
-@@ -7,4 +7,5 @@
- Type=Application
- StartupNotify=true
- Categories=GTK;Settings;DesktopSettings;
-+Keywords=mate-control-center;MATE;window;manager;properties;marco;preferences;
- OnlyShowIn=MATE;
diff --git a/debian/patches/1004_add-main-category-to-categories-key-in-desktop-file.patch b/debian/patches/1004_add-main-category-to-categories-key-in-desktop-file.patch
deleted file mode 100644
index 114d87d..0000000
--- a/debian/patches/1004_add-main-category-to-categories-key-in-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Add main category to Categories key
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Forwarded: https://github.com/mate-desktop/mate-control-center/issues/103
---- a/capplets/appearance/data/mate-theme-installer.desktop.in.in
-+++ b/capplets/appearance/data/mate-theme-installer.desktop.in.in
-@@ -7,7 +7,7 @@
- Type=Application
- MimeType=application/x-mate-theme-package;
- StartupNotify=true
--Categories=GTK;
-+Categories=GTK;Settings;
- Keywords=mate-control-center;MATE;install;desktop;themes;
- NoDisplay=true
- OnlyShowIn=MATE;
diff --git a/debian/patches/series b/debian/patches/series
index 44ca71d..66b63bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-1002_spelling-check-in-man-pages.patch
-1003_add-keywords-key-to-desktop-files.patch
-1004_add-main-category-to-categories-key-in-desktop-file.patch
 1005_rename-libslab-to-libmate-slab0.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
mate-control-center Debian package

More information about the pkg-mate-commits mailing list