[SCM] mate-power-manager Debian package branch, master, updated. 324a45a723c377765337900667ea385cbedddb8c

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-power-manager.git;a=commitdiff;h=6ed741a

The following commit has been merged in the master branch:
commit 6ed741a04a5040338b460f029b5c17ae7b515461
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 21 21:33:14 2014 +0200

    debian/patches: Add 1001_fix-hyphens-on-man-page.patch. Add 1002_add-keywords-key-to-desktop-files.patch.
---
 debian/patches/1001_fix-hyphens-on-man-page.patch  | 102 +++++++++++++++++++++
 .../1002_add-keywords-key-to-desktop-files.patch   |  13 +++
 debian/patches/series                              |   2 +
 3 files changed, 117 insertions(+)

diff --git a/debian/patches/1001_fix-hyphens-on-man-page.patch b/debian/patches/1001_fix-hyphens-on-man-page.patch
new file mode 100644
index 0000000..a5badda
--- /dev/null
+++ b/debian/patches/1001_fix-hyphens-on-man-page.patch
@@ -0,0 +1,102 @@
+Description: Fix hyphen-as-minus-sign issues for engrampa.1 man page
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Forwarded: https://github.com/mate-desktop/mate-power-manager/issues/99 
+--- a/man/mate-power-manager.sgml
++++ b/man/mate-power-manager.sgml
+@@ -71,13 +71,13 @@
+     <title>OPTIONS</title>
+ 
+     <para>This program follows the usual &gnu; command line syntax,
+-      with long options starting with two dashes (`-').  A summary of
++      with long options starting with two dashes (`\-').  A summary of
+       options is included below. </para>
+ 
+     <variablelist>
+       <varlistentry>
+         <term>
+-          <option>--help</option>
++          <option>\-\-help</option>
+         </term>
+         <listitem>
+           <para>Show summary of options.</para>
+@@ -85,7 +85,7 @@
+       </varlistentry>
+       <varlistentry>
+         <term>
+-          <option>--verbose</option>
++          <option>\-\-verbose</option>
+         </term>
+         <listitem>
+           <para>Show extra debugging.</para>
+@@ -93,7 +93,7 @@
+       </varlistentry>
+   	  <varlistentry>
+         <term>
+-          <option>--no-daemon</option>
++          <option>\-\-no-daemon</option>
+         </term>
+         <listitem>
+           <para>Do not detach <command>&package;</command> into the background so that error messages will be displayed on console.</para>
+@@ -101,7 +101,7 @@
+       </varlistentry>
+       <varlistentry>
+         <term>
+-          <option>--debug</option>
++          <option>\-\-debug</option>
+         </term>
+         <listitem>
+           <para>Only show specific debugging options. Useful for developers only.</para>
+--- a/man/mate-power-preferences.sgml
++++ b/man/mate-power-preferences.sgml
+@@ -78,13 +78,13 @@
+     <title>OPTIONS</title>
+ 
+     <para>This program follows the usual &gnu; command line syntax,
+-      with long options starting with two dashes (`-').  A summary of
++      with long options starting with two dashes (`\-').  A summary of
+       options is included below. </para>
+ 
+     <variablelist>
+       <varlistentry>
+         <term>
+-          <option>--help</option>
++          <option>\-\-help</option>
+         </term>
+         <listitem>
+           <para>Show summary of options.</para>
+@@ -92,7 +92,7 @@
+       </varlistentry>
+       <varlistentry>
+         <term>
+-          <option>--verbose</option>
++          <option>\-\-verbose</option>
+         </term>
+         <listitem>
+           <para>Show extra debugging.</para>
+--- a/man/mate-power-statistics.sgml
++++ b/man/mate-power-statistics.sgml
+@@ -79,13 +79,13 @@
+     <title>OPTIONS</title>
+ 
+     <para>This program follows the usual &gnu; command line syntax,
+-      with long options starting with two dashes (`-').  A summary of
++      with long options starting with two dashes (`\-').  A summary of
+       options is included below. </para>
+ 
+     <variablelist>
+       <varlistentry>
+         <term>
+-          <option>--help</option>
++          <option>\-\-help</option>
+         </term>
+         <listitem>
+           <para>Show summary of options.</para>
+@@ -93,7 +93,7 @@
+       </varlistentry>
+       <varlistentry>
+         <term>
+-          <option>--verbose</option>
++          <option>\-\-verbose</option>
+         </term>
+         <listitem>
+           <para>Show extra debugging.</para>
diff --git a/debian/patches/1002_add-keywords-key-to-desktop-files.patch b/debian/patches/1002_add-keywords-key-to-desktop-files.patch
new file mode 100644
index 0000000..b3af1d1
--- /dev/null
+++ b/debian/patches/1002_add-keywords-key-to-desktop-files.patch
@@ -0,0 +1,13 @@
+Description: Add keywords key to .desktop file
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Forwarded: https://github.com/mate-desktop/mate-power-manager/issues/100
+--- a/data/mate-power-preferences.desktop.in.in
++++ b/data/mate-power-preferences.desktop.in.in
+@@ -6,6 +6,7 @@
+ Terminal=false
+ Type=Application
+ Categories=Settings;HardwareSettings;
++Keywords=MATE;power;management;preferences;settings;
+ OnlyShowIn=MATE;
+ StartupNotify=true
+ X-MATE-Bugzilla-Bugzilla=MATE
diff --git a/debian/patches/series b/debian/patches/series
index 83b110e..1fc1731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+1001_fix-hyphens-on-man-page.patch
+1002_add-keywords-key-to-desktop-files.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
mate-power-manager Debian package