[xdg-utils] 1.1.0-0.21.rc2

Rex Dieter rdieter at fedoraproject.org
Sun Mar 30 22:40:40 UTC 2014


commit 82f4a464bd612614d9b557ce0014d4f903173e4e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 30 17:40:51 2014 -0500

    1.1.0-0.21.rc2
    
    - .spec housecleaning (remove deprecated stuff)
    - pull in latest upstream fixes, including...
    - xdg-open does not substitute all field codes in Exec key (#1056431, fdo#49204)

 0001-mention-xdg-settings.patch                    |   27 +
 ...rovement-of-detecting-KDE-session-BR63157.patch |   39 +
 0003-xdg-terminal-incompatible-.-BR44357.patch     |   55 +
 0004-remove-generated-html-files.patch             | 1107 +++++++++++
 0005-remove-generated-man-pages.patch              | 1939 ++++++++++++++++++++
 0006-all-re-generate-html-man-too.patch            |   25 +
 ...-drop-references-to-Value-1.0-key-BR74688.patch |   70 +
 ...-open-Remove-first_word-already-in-common.patch |   29 +
 0009-xdg-open-Expand-i-and-c-from-Exec.patch       |   61 +
 xdg-utils.spec                                     |   29 +-
 10 files changed, 3370 insertions(+), 11 deletions(-)
---
diff --git a/0001-mention-xdg-settings.patch b/0001-mention-xdg-settings.patch
new file mode 100644
index 0000000..3d6a8da
--- /dev/null
+++ b/0001-mention-xdg-settings.patch
@@ -0,0 +1,27 @@
+From a983a14293129ea94b634579a46dc69835e88e15 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 7 Feb 2014 10:31:08 -0600
+Subject: [PATCH 1/9] mention xdg-settings
+
+gleaned from 1.1.0-rc1 release announcement
+---
+ RELEASE_NOTES | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/RELEASE_NOTES b/RELEASE_NOTES
+index 7f84063..484b2b9 100644
+--- a/RELEASE_NOTES
++++ b/RELEASE_NOTES
+@@ -4,6 +4,9 @@ Release notes for xdg-utils 1.1.0
+ This release includes:
+ * better support for GNOME3, KDE4, LXDE, MATE, XFCE
+ * initial support for generic methods (non toolkit-specific, experimental)
++* xdg-settings utility, a script to get various settings from the desktop
++  environment
++
+ 
+ Release notes for xdg-utils 1.0.2
+ =================================
+-- 
+1.9.0
+
diff --git a/0002-Improvement-of-detecting-KDE-session-BR63157.patch b/0002-Improvement-of-detecting-KDE-session-BR63157.patch
new file mode 100644
index 0000000..0bade0e
--- /dev/null
+++ b/0002-Improvement-of-detecting-KDE-session-BR63157.patch
@@ -0,0 +1,39 @@
+From cba39e7a00abe27b3bff49e2d455bb30ad33dde6 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 7 Feb 2014 10:51:10 -0600
+Subject: [PATCH 2/9] Improvement of detecting KDE session (BR63157)
+
+---
+ ChangeLog                   | 3 +++
+ scripts/xdg-utils-common.in | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 8b35df0..b7fcf86 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,5 +1,8 @@
+ === xdg-utils 1.1.x ===
+ 
++2014-02-07 Rex Dieter <rdieter at fedoraproject.org>
++   * Improvement of detecting KDE session (BR63157)
++
+ 2013-10-24 Rex Dieter <rdieter at fedoraproject.org>
+    * xdg-desktop-menu: improperly check for vendor prefix on Estonian locale (BR70742)
+ 
+diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
+index 5b50f9b..c365cca 100644
+--- a/scripts/xdg-utils-common.in
++++ b/scripts/xdg-utils-common.in
+@@ -279,7 +279,7 @@ detectDE()
+ 
+     if [ x"$DE" = x"" ]; then
+       # classic fallbacks
+-      if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
++      if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
+       elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
+       elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate;
+       elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
+-- 
+1.9.0
+
diff --git a/0003-xdg-terminal-incompatible-.-BR44357.patch b/0003-xdg-terminal-incompatible-.-BR44357.patch
new file mode 100644
index 0000000..d18aed1
--- /dev/null
+++ b/0003-xdg-terminal-incompatible-.-BR44357.patch
@@ -0,0 +1,55 @@
+From 495fa68306f6f5b0c0bb312e92f0f2a0e35fa567 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 7 Feb 2014 10:56:17 -0600
+Subject: [PATCH 3/9] xdg-terminal incompatible ... (BR44357)
+
+fix harder!  put the code in the right place this time.
+---
+ scripts/xdg-terminal.in | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in
+index 614dacf..21d8309 100644
+--- a/scripts/xdg-terminal.in
++++ b/scripts/xdg-terminal.in
+@@ -38,17 +38,7 @@ terminal_kde()
+         if [ x"$1" = x"" ]; then
+             $terminal_exec
+         else
+-            # screen and urxvt won't do their own parsing of quoted arguments
+-            if [ x"$TERM" = x"screen" ]; then
+-                # screen has an incompatible meaning for -e
+-                sh -c "exec $terminal_exec $1"
+-            elif [ x"$TERM" = x"urxvt" ] || [ x"$TERM" = x"rxvt-unicode" ] || [ x"$TERM" = x"rxvt" ]; then
+-                #TODO: Use whatever mechanism dash supports to test for
+-                #      rxvt-* to match things like rxvt-unicode-256color
+-                sh -c "exec $terminal_exec -e $1"
+-            else
+-                $terminal_exec -e "$1"
+-            fi
++            $terminal_exec -e "$1"
+         fi
+ 
+         if [ $? -eq 0 ]; then
+@@ -120,7 +110,17 @@ terminal_generic()
+         if [ x"$1" = x"" ]; then
+             $terminal_exec
+         else
+-            $terminal_exec -e "$1"
++            # screen and urxvt won't do their own parsing of quoted arguments
++            if [ x"$TERM" = x"screen" ]; then
++                # screen has an incompatible meaning for -e
++                sh -c "exec $terminal_exec $1"
++            elif [ x"$TERM" = x"urxvt" ] || [ x"$TERM" = x"rxvt-unicode" ] || [ x"$TERM" = x"rxvt" ]; then
++                #TODO: Use whatever mechanism dash supports to test for
++                #      rxvt-* to match things like rxvt-unicode-256color
++                sh -c "exec $terminal_exec -e $1"
++            else
++                $terminal_exec -e "$1"
++            fi
+         fi
+ 
+         if [ $? -eq 0 ]; then
+-- 
+1.9.0
+
diff --git a/0004-remove-generated-html-files.patch b/0004-remove-generated-html-files.patch
new file mode 100644
index 0000000..13b15be
--- /dev/null
+++ b/0004-remove-generated-html-files.patch
@@ -0,0 +1,1107 @@
+From 3af8eeca3be36c7dfb52a816f5e9cf57c3be1bd5 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 7 Feb 2014 12:23:34 -0600
+Subject: [PATCH 4/9] remove generated html files
+
+---
+ scripts/html/.gitignore             |   9 +
+ scripts/html/index.html             |  19 --
+ scripts/html/xdg-desktop-icon.html  | 133 --------------
+ scripts/html/xdg-desktop-menu.html  | 334 ------------------------------------
+ scripts/html/xdg-email.html         |  89 ----------
+ scripts/html/xdg-icon-resource.html | 128 --------------
+ scripts/html/xdg-mime.html          | 145 ----------------
+ scripts/html/xdg-open.html          |  38 ----
+ scripts/html/xdg-screensaver.html   |  63 -------
+ scripts/html/xdg-settings.html      |  59 -------
+ 10 files changed, 9 insertions(+), 1008 deletions(-)
+ delete mode 100644 scripts/html/index.html
+ delete mode 100644 scripts/html/xdg-desktop-icon.html
+ delete mode 100644 scripts/html/xdg-desktop-menu.html
+ delete mode 100644 scripts/html/xdg-email.html
+ delete mode 100644 scripts/html/xdg-icon-resource.html
+ delete mode 100644 scripts/html/xdg-mime.html
+ delete mode 100644 scripts/html/xdg-open.html
+ delete mode 100644 scripts/html/xdg-screensaver.html
+ delete mode 100644 scripts/html/xdg-settings.html
+
+diff --git a/scripts/html/.gitignore b/scripts/html/.gitignore
+index e69de29..0be5f9a 100644
+--- a/scripts/html/.gitignore
++++ b/scripts/html/.gitignore
+@@ -0,0 +1,9 @@
++index.html
++xdg-desktop-icon.html
++xdg-desktop-menu.html
++xdg-email.html
++xdg-icon-resource.html
++xdg-mime.html
++xdg-open.html
++xdg-screensaver.html
++xdg-settings.html
+diff --git a/scripts/html/index.html b/scripts/html/index.html
+deleted file mode 100644
+index 64b0c53..0000000
+--- a/scripts/html/index.html
++++ /dev/null
+@@ -1,19 +0,0 @@
+-<html>
+-<body>
+-<h1>xdg-utils</h1>
+-<p>
+-This version of xdg-utils contains the following commands:
+-</p>
+-<table>
+-<tr><td><a href="xdg-desktop-menu.html">xdg-desktop-menu</a>:</td><td>command line tool for (un)installing desktop menu items</td></tr>
+-<tr><td><a href="xdg-desktop-icon.html">xdg-desktop-icon</a>:</td><td>command line tool for (un)installing icons to the desktop</td></tr>
+-<tr><td><a href="xdg-mime.html">xdg-mime</a>:</td><td>command line tool for querying information about file type handling
+-and adding descriptions for new file types</td></tr>
+-<tr><td><a href="xdg-icon-resource.html">xdg-icon-resource</a>:</td><td>command line tool for (un)installing icon resources</td></tr>
+-<tr><td><a href="xdg-open.html">xdg-open</a>:</td><td>opens a file or URL in the user's preferred application</td></tr>
+-<tr><td><a href="xdg-email.html">xdg-email</a>:</td><td>command line tool for sending mail using the user's preferred e-mail composer</td></tr>
+-<tr><td><a href="xdg-screensaver.html">xdg-screensaver</a>:</td><td>command line tool for controlling the screensaver</td></tr>
+-<tr><td><a href="xdg-settings.html">xdg-settings</a>:</td><td>get various settings from the desktop environment</td></tr>
+-</table>
+-</body>
+-</html>
+\ No newline at end of file
+diff --git a/scripts/html/xdg-desktop-icon.html b/scripts/html/xdg-desktop-icon.html
+deleted file mode 100644
+index f9683ba..0000000
+--- a/scripts/html/xdg-desktop-icon.html
++++ /dev/null
+@@ -1,133 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-desktop-icon</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-desktop-icon"><a name="xdg-desktop-icon"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-desktop-icon &#8212; command line tool for (un)installing icons to the desktop</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-desktop-icon</code>   install  [<code class="option">--novendor</code>]  <em class="replaceable"><code>FILE</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-desktop-icon</code>   uninstall   <em class="replaceable"><code>FILE</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-desktop-icon</code>  { <code class=
 "option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      The xdg-desktop-icon program can be used to install an application launcher
+-      or other file on the desktop of the current user.
+-    </p><p>
+-      An application launcher is represented by a *.desktop file.
+-      Desktop files are defined by the freedesktop.org Desktop Entry
+-      Specification. The most important aspects of *.desktop files
+-      are summarized below.
+-    </p></div><div class="refsect1" title="Commands"><a name="commands"></a><h2>Commands</h2><div class="variablelist"><dl><dt><span class="term">install</span></dt><dd>
+-	    Installs <em class="replaceable"><code>FILE</code></em> to the desktop of the current user.
+-	    <em class="replaceable"><code>FILE</code></em> can be a *.desktop file or any
+-            other type of file.
+-	  </dd><dt><span class="term">uninstall</span></dt><dd>
+-	    Removes <em class="replaceable"><code>FILE</code></em> from the desktop
+-            of the current user.
+-	  </dd></dl></div></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--novendor</code></span></dt><dd><p class="simpara">
+-	    Normally, xdg-desktop-icon checks to ensure that a *.desktop file
+-	    to be installed has a vendor prefix. This option can be
+-	    used to disable that check.
+-	  </p><p class="simpara">
+-            A vendor prefix consists of alpha characters ([a-zA-Z]) and is
+-            terminated with a dash ("-").
+-            Companies and organizations are encouraged to use a word
+-            or phrase, preferably the organizations name, for which they hold
+-            a trademark as their vendor prefix.
+-            The purpose of the vendor prefix is to prevent name conflicts.
+-          </p></dd><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Desktop Files"><a name="desktopfiles"></a><h2>Desktop Files</h2><p>
+-      An application launcher can be added to the desktop by installing a
+-      *.desktop file. A *.desktop file consists of a
+-      <span class="emphasis"><em>[Desktop Entry]</em></span> header followed by several
+-      <em class="replaceable"><code>Key</code></em>=<em class="replaceable"><code>Value</code></em> lines.
+-    </p><p>
+-      A *.desktop file can provide a name and description for an application
+-      in several different languages. This is done by adding a language
+-      code as used by LC_MESSAGES in square brackets behind the 
+-      <em class="replaceable"><code>Key</code></em>. This way one can specify different
+-      values for the same <em class="replaceable"><code>Key</code></em> depending on the
+-      currently selected language.
+-    </p><p>
+-      The following keys are often used:
+-    </p><div class="variablelist"><dl><dt><span class="term">Value=1.0</span></dt><dd>
+-	    This is a mandatory field to indicate that the *.desktop file
+-	    follows the 1.0 version of the specification.
+-	  </dd><dt><span class="term">Type=Application</span></dt><dd>
+-	    This is a mandatory field that indicates that the *.desktop file
+-	    describes an application launcher.
+-	  </dd><dt><span class="term">Name=<em class="replaceable"><code>Application Name</code></em></span></dt><dd>
+-	    The name of the application.
+-	    For example <span class="emphasis"><em>Mozilla</em></span>
+-	  </dd><dt><span class="term">GenericName=<em class="replaceable"><code>Generic Name</code></em></span></dt><dd>
+-	    A generic description of the application.
+-	    For example <span class="emphasis"><em>Web Browser</em></span>
+-	  </dd><dt><span class="term">Comment=<em class="replaceable"><code>Comment</code></em></span></dt><dd>
+-	    Optional field to specify a tooltip for the application. 
+-	    For example <span class="emphasis"><em>Visit websites on the Internet</em></span>
+-	  </dd><dt><span class="term">Icon=<em class="replaceable"><code>Icon File</code></em></span></dt><dd>
+-	    The icon to use for the application. This can either be
+-	    an absolute path to an image file or an icon-name.
+-	    If an icon-name is provided an image lookup by name is done
+-	    in the user's current icon theme. The <span class="command"><strong>xdg-icon-resource</strong></span>
+-	    command can be used to install image files into icon themes.
+-	    The advantage of using an icon-name instead of an absolute
+-	    path is that with an icon-name the application icon can be
+-	    provided in several different sizes as well as in several
+-	    differently themed styles.
+-	  </dd><dt><span class="term">Exec=<em class="replaceable"><code>Command Line</code></em></span></dt><dd>
+-	    The command line to start the application. If the application
+-	    can open files the %f placeholder should be specified. When
+-	    a file is dropped on the application launcher the %f is replaced
+-	    with the file path of the dropped file. If multiple files
+-	    can be specified on the command line the %F placeholder should
+-	    be used instead of %f. If the application is able to open URLs
+-	    in addition to local files then  %u or %U can be used instead
+-	    of %f or %F.
+-	  </dd></dl></div><p>
+-      For a complete oveview of the *.desktop file format please
+-      visit http://www.freedesktop.org/wiki/Standards/desktop-entry-spec
+-    </p></div><div class="refsect1" title="Environment Variables"><a name="env_vars"></a><h2>Environment Variables</h2><p>
+-      xdg-desktop-icon honours the following environment variables:
+-    </p><div class="variablelist"><dl><dt><span class="term">XDG_UTILS_DEBUG_LEVEL</span></dt><dd>
+-	    Setting this environment variable to a non-zero numerical value
+-	    makes xdg-desktop-icon do more verbose reporting on stderr.
+-	    Setting a higher value increases the verbosity.
+-	  </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-	    One of the files passed on the command line did not exist.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd><dt><span class="term"><code class="option">5</code></span></dt><dd>
+-	    No permission to read one of the files passed on the command
+-            line.
+-	  </dd></dl></div></div><div class="refsect1" title="See Also"><a name="seealso"></a><h2>See Also</h2><p><span class="citerefentry"><span class="refentrytitle">xdg-icon-resource</span>(1)</span>
+-    </p></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-      The company ShinyThings Inc. has developed an application named
+-      "WebMirror" and would like to add a launcher for for on the desktop.
+-      The company will use "shinythings" as its vendor id.
+-      In order to add the application to the desktop there needs to be a
+-      .desktop file for the application:
+-</p><pre class="programlisting">
+-shinythings-webmirror.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF-8
+-  Type=Application
+-
+-  Exec=webmirror
+-  Icon=shinythings-webmirror
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-</pre><p>
+-    </p><p>Now the xdg-desktop-icon tool can be used to add the webmirror.desktop file
+-    to the desktop:
+-</p><pre class="programlisting">
+-xdg-desktop-icon install ./shinythings-webmirror.desktop
+-</pre><p>
+-    </p><p>To add a README file to the desktop as well, the following command can be used:  
+-</p><pre class="programlisting">
+-xdg-desktop-icon install ./shinythings-README
+-</pre><p>
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-desktop-menu.html b/scripts/html/xdg-desktop-menu.html
+deleted file mode 100644
+index 71b7e04..0000000
+--- a/scripts/html/xdg-desktop-menu.html
++++ /dev/null
+@@ -1,334 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-desktop-menu</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-desktop-menu"><a name="xdg-desktop-menu"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-desktop-menu &#8212; command line tool for (un)installing desktop menu items</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-desktop-menu</code>   install  [<code class="option">--noupdate</code>] [<code class="option">--novendor</code>] [<code class="option">--mode <em class="replaceable"><code>mode</code></em></code>]  <em class="replaceable"><code>directory-file(s)</code></em>   <em class="replaceable"><code>desktop-file(s)</code></em> </p></div><div class="cmdsynopsis"><p><code clas
 s="command">xdg-desktop-menu</code>   uninstall  [<code class="option">--noupdate</code>] [<code class="option">--mode <em class="replaceable"><code>mode</code></em></code>]  <em class="replaceable"><code>directory-file(s)</code></em>   <em class="replaceable"><code>desktop-file(s)</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-desktop-menu</code>   forceupdate  [<code class="option">--mode <em class="replaceable"><code>mode</code></em></code>]</p></div><div class="cmdsynopsis"><p><code class="command">xdg-desktop-menu</code>  { <code class="option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      The xdg-desktop-menu program can be used to install new menu entries
+-      to the desktop's application menu.
+-    </p><p>
+-      The application menu works according to the
+-      XDG Desktop Menu Specification at
+-      http://www.freedesktop.org/Standards/menu-spec
+-    </p></div><div class="refsect1" title="Commands"><a name="commands"></a><h2>Commands</h2><div class="variablelist"><dl><dt><span class="term">install</span></dt><dd><p class="simpara">
+-	    Install one or more applications in a submenu of
+-	    the desktop menu system.
+-	  </p><p class="simpara"><em class="replaceable"><code>desktop-file</code></em>:
+-            A desktop file represents a single menu entry in the menu.
+-            Desktop files are defined by the freedesktop.org Desktop Entry
+-            Specification. The most important aspects of *.desktop
+-            files are summarized below.
+-	  </p><p class="simpara">
+-            Menu entries can be added to the menu system in two different
+-            ways. They can either be added to a predefined submenu in the
+-            menu system based on one or more category keywords, or they can
+-            be added to a new submenu. 
+-	  </p><p class="simpara">
+-	    To add a menu entry to a predefined submenu the desktop file
+-	    that represents the menu entry must have a Categories= entry
+-	    that lists one or more keywords. The menu item will be included
+-	    in an appropriate submenu based on the included keywords.
+-	  </p><p class="simpara">
+-            To add menu items to a new submenu the desktop-files must be
+-            preceded by a directory-file that describes the submenu.
+-            If multiple desktop-files are specified, all entries will
+-            be added to the same menu. If entries are installed to a menu
+-            that has been created with a previous call to
+-            <span class="command"><strong>xdg-desktop-menu</strong></span> the entries will be
+-            installed in addition to any already existing entries.
+-	  </p><p class="simpara"><em class="replaceable"><code>directory-file</code></em>:
+-	    The *.directory file indicated by
+-	    <em class="replaceable"><code>directory-file</code></em> represents a submenu.
+-	    The directory file provides the name and icon for a submenu. The
+-	    name of the directory file is used to identify the submenu. 
+-	  </p><p class="simpara">
+-	    If multiple directory files are provided each file will
+-	    represent a submenu within the menu that preceeds it, creating
+-	    a nested menu hierarchy (sub-sub-menus).
+-	    The menu entries themselves will be added to the last submenu.
+-	  </p><p class="simpara">
+-            Directory files follow the syntax defined by the freedesktop.org
+-            Desktop Entry Specification.
+-	  </p></dd><dt><span class="term">uninstall</span></dt><dd><p class="simpara">
+-	    Remove applications or submenus from the desktop menu system
+-            previously installed with <span class="command"><strong>xdg-desktop-menu install</strong></span>.
+-	  </p><p class="simpara">
+-	    A submenu and the associated directory file is only removed
+-	    when the submenu no longer contains any menu entries.
+-	  </p></dd><dt><span class="term">forceupdate</span></dt><dd><p class="simpara">
+-	    Force an update of the menu system.
+-	  </p><p class="simpara">
+-	    This command is only useful if the last call to
+-	    xdg-desktop-menu included the <code class="option">--noupdate</code> option.
+-	  </p></dd></dl></div></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--noupdate</code></span></dt><dd>
+-	    Postpone updating the menu system. If multiple updates to the
+-            menu system are made in sequence this flag can be used to
+-            indicate that additional changes will follow and that it is not
+-            necassery to update the menu system right away.
+-	  </dd><dt><span class="term"><code class="option">--novendor</code></span></dt><dd><p class="simpara">
+-	    Normally, xdg-desktop-menu checks to ensure that any *.directory
+-	    and *.desktop files to be installed has a vendor prefix.
+-	    This option can be used to disable that check.
+-	  </p><p class="simpara">
+-            A vendor prefix consists of alpha characters ([a-zA-Z]) and is
+-            terminated with a dash ("-").
+-            Companies and organizations are encouraged to use a word
+-            or phrase, preferably the organizations name, for which they hold
+-            a trademark as their vendor prefix.
+-            The purpose of the vendor prefix is to prevent name conflicts.
+-          </p></dd><dt><span class="term"><code class="option">--mode</code> <em class="replaceable"><code>mode</code></em></span></dt><dd><p class="simpara"><em class="replaceable"><code>mode</code></em> can be
+-            <span class="emphasis"><em>user</em></span> or <span class="emphasis"><em>system</em></span>.
+-            In user mode the file is (un)installed for the current user
+-            only. In system mode the file is (un)installed for all users
+-            on the system. Usually only root is allowed to install in
+-            system mode.
+-	  </p><p class="simpara">
+-	    The default is to use system mode when called by root
+-	    and to use user mode when called by a non-root user.
+-	  </p></dd><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Desktop Files"><a name="desktopfiles"></a><h2>Desktop Files</h2><p>
+-      An application item in the application menu is represented by a
+-      *.desktop file. A *.desktop file consists of a
+-      <span class="emphasis"><em>[Desktop Entry]</em></span> header followed by several
+-      <em class="replaceable"><code>Key</code></em>=<em class="replaceable"><code>Value</code></em> lines.
+-    </p><p>
+-      A *.desktop file can provide a name and description for an application
+-      in several different languages. This is done by adding a language
+-      code as used by LC_MESSAGES in square brackets behind the 
+-      <em class="replaceable"><code>Key</code></em>. This way one can specify different
+-      values for the same <em class="replaceable"><code>Key</code></em> depending on the
+-      currently selected language.
+-    </p><p>
+-      The following keys are often used:
+-    </p><div class="variablelist"><dl><dt><span class="term">Value=1.0</span></dt><dd>
+-	    This is a mandatory field to indicate that the *.desktop file
+-	    follows the 1.0 version of the specification.
+-	  </dd><dt><span class="term">Type=Application</span></dt><dd>
+-	    This is a mandatory field that indicates that the *.desktop file
+-	    describes an application launcher.
+-	  </dd><dt><span class="term">Name=<em class="replaceable"><code>Application Name</code></em></span></dt><dd>
+-	    The name of the application.
+-	    For example <span class="emphasis"><em>Mozilla</em></span>
+-	  </dd><dt><span class="term">GenericName=<em class="replaceable"><code>Generic Name</code></em></span></dt><dd>
+-	    A generic description of the application.
+-	    For example <span class="emphasis"><em>Web Browser</em></span>
+-	  </dd><dt><span class="term">Comment=<em class="replaceable"><code>Comment</code></em></span></dt><dd>
+-	    Optional field to specify a tooltip for the application. 
+-	    For example <span class="emphasis"><em>Visit websites on the Internet</em></span>
+-	  </dd><dt><span class="term">Icon=<em class="replaceable"><code>Icon File</code></em></span></dt><dd>
+-	    The icon to use for the application. This can either be
+-	    an absolute path to an image file or an icon-name.
+-	    If an icon-name is provided an image lookup by name is done
+-	    in the user's current icon theme. The <span class="command"><strong>xdg-icon-resource</strong></span>
+-	    command can be used to install image files into icon themes.
+-	    The advantage of using an icon-name instead of an absolute
+-	    path is that with an icon-name the application icon can be
+-	    provided in several different sizes as well as in several
+-	    differently themed styles.
+-	  </dd><dt><span class="term">Exec=<em class="replaceable"><code>Command Line</code></em></span></dt><dd>
+-	    The command line to start the application. If the application
+-	    can open files the %f placeholder should be specified. When
+-	    a file is dropped on the application launcher the %f is replaced
+-	    with the file path of the dropped file. If multiple files
+-	    can be specified on the command line the %F placeholder should
+-	    be used instead of %f. If the application is able to open URLs
+-	    in addition to local files then  %u or %U can be used instead
+-	    of %f or %F.
+-	  </dd><dt><span class="term">Categories=<em class="replaceable"><code>Categories</code></em></span></dt><dd><p class="simpara">
+-	    A list of categories separated by semi-colons. A category is
+-	    a keyword that describes and classifies the application.
+-	    By default applications are organized in the application menu
+-            based on category. When menu entries are explicitly assigned
+-            to a new submenu it is not necassery to list any categories.
+-          </p><p class="simpara">
+-            When using categories it is recommended to include
+-            one of the following categories:
+-            AudioVideo, Development, Education, Game, Graphics, Network, 
+-            Office, Settings, System, Utility.
+-          </p><p class="simpara">
+-            See Appendix A of the XDG Desktop Menu Specification
+-            for information about additional categories. 
+-            http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html
+-	  </p></dd><dt><span class="term">MimeType=<em class="replaceable"><code>Mimetypes</code></em></span></dt><dd>
+-	    A list of mimetypes separated by semi-colons. This field is
+-	    used to indicate which file types the application is able to
+-	    open.
+-	  </dd></dl></div><p>
+-      For a complete oveview of the *.desktop file format please
+-      visit http://www.freedesktop.org/wiki/Standards/desktop-entry-spec
+-    </p></div><div class="refsect1" title="Directory Files"><a name="directoryfiles"></a><h2>Directory Files</h2><p>
+-      The appearance of submenu in the application menu is
+-      provided by a *.directory file. In particular it provides the title
+-      of the submenu and a possible icon. A *.directory file consists of a
+-      <span class="emphasis"><em>[Desktop Entry]</em></span> header followed by several
+-      <em class="replaceable"><code>Key</code></em>=<em class="replaceable"><code>Value</code></em> lines.
+-    </p><p>
+-      A *.directory file can provide a title (name) for the submenu
+-      in several different languages. This is done by adding a language
+-      code as used by LC_MESSAGES in square brackets behind the 
+-      <em class="replaceable"><code>Key</code></em>. This way one can specify different
+-      values for the same <em class="replaceable"><code>Key</code></em> depending on the
+-      currently selected language.
+-    </p><p>
+-      The following keys are relevqnt for submenus:
+-    </p><div class="variablelist"><dl><dt><span class="term">Value=1.0</span></dt><dd>
+-	    This is a mandatory field to indicate that the *.directory file
+-	    follows the 1.0 version of the Desktop Entry specification.
+-	  </dd><dt><span class="term">Type=Directory</span></dt><dd>
+-	    This is a mandatory field that indicates that the *.directory file
+-	    describes a submenu.
+-	  </dd><dt><span class="term">Name=<em class="replaceable"><code>Menu Name</code></em></span></dt><dd>
+-	    The title of submenu.
+-	    For example <span class="emphasis"><em>Mozilla</em></span>
+-	  </dd><dt><span class="term">Comment=<em class="replaceable"><code>Comment</code></em></span></dt><dd>
+-	    Optional field to specify a tooltip for the submenu. 
+-	  </dd><dt><span class="term">Icon=<em class="replaceable"><code>Icon File</code></em></span></dt><dd>
+-	    The icon to use for the submenu. This can either be
+-	    an absolute path to an image file or an icon-name.
+-	    If an icon-name is provided an image lookup by name is done
+-	    in the user's current icon theme.
+-	    The <span class="command"><strong>xdg-icon-resource</strong></span>
+-	    command can be used to install image files into icon themes.
+-	    The advantage of using an icon-name instead of an absolute
+-	    path is that with an icon-name the submenu icon can be
+-	    provided in several different sizes as well as in several
+-	    differently themed styles.
+-	  </dd></dl></div></div><div class="refsect1" title="Environment Variables"><a name="env_vars"></a><h2>Environment Variables</h2><p>
+-      xdg-desktop-menu honours the following environment variables:
+-    </p><div class="variablelist"><dl><dt><span class="term">XDG_UTILS_DEBUG_LEVEL</span></dt><dd>
+-	    Setting this environment variable to a non-zero numerical value
+-	    makes xdg-desktop-menu do more verbose reporting on stderr.
+-	    Setting a higher value increases the verbosity.
+-	  </dd><dt><span class="term">XDG_UTILS_INSTALL_MODE</span></dt><dd>
+-	    This environment variable can be used by the user or
+-            administrator to override the installation mode.
+-	    Valid values are <span class="emphasis"><em>user</em></span> and
+-            <span class="emphasis"><em>system</em></span>.  
+-	  </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-	    One of the files passed on the command line did not exist.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd><dt><span class="term"><code class="option">5</code></span></dt><dd>
+-	    No permission to read one of the files passed on the command
+-            line.
+-	  </dd></dl></div></div><div class="refsect1" title="See Also"><a name="seealso"></a><h2>See Also</h2><p><span class="citerefentry"><span class="refentrytitle">xdg-desktop-icon</span>(1)</span>,
+-      <span class="citerefentry"><span class="refentrytitle">xdg-icon-resource</span>(1)</span>,
+-      <span class="citerefentry"><span class="refentrytitle">xdg-mime</span>(1)</span>
+-    </p></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-      The company ShinyThings Inc. has developed an application named
+-      "WebMirror" and would like to add it to the application menu.
+-      The company will use "shinythings" as its vendor id.
+-      In order to add the application to the menu there needs to be a
+-      .desktop file with a suitable <span class="emphasis"><em>Categories</em></span> entry:
+-</p><pre class="programlisting">
+-shinythings-webmirror.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF-8
+-  Type=Application
+-
+-  Exec=webmirror
+-  Icon=webmirror
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-
+-  Categories=Network;WebDevelopment;
+-</pre><p>
+-    </p><p>Now the xdg-desktop-menu tool can be used to add the
+-    shinythings-webmirror.desktop file to the desktop application menu:
+-</p><pre class="programlisting">
+-xdg-desktop-menu install ./shinythings-webmirror.desktop
+-</pre><p>
+-    </p><p>
+-      Note that for the purpose of this example the menu items are available
+-      in two languages, English and Dutch.
+-      The language code for Dutch is nl.
+-    </p><p>
+-      In the next example the company ShinyThings Inc. will add its own
+-      submenu to the desktop application menu consisting of a
+-      "WebMirror" menu item and a "WebMirror Admin Tool" menu item.
+-    </p><p>
+-      First the company needs to create two .desktop files that describe
+-      the two menu items. Since the items are to be added to a new submenu
+-      it is not necassery to include a Categories= line:
+-</p><pre class="programlisting">
+-shinythings-webmirror.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF-8
+-  Type=Application
+-
+-  Exec=webmirror
+-  Icon=shinythings-webmirror
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-
+-
+-shinythings-webmirror-admin.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF-8
+-  Type=Application
+-
+-  Exec=webmirror-admintool
+-  Icon=shinythings-webmirror-admintool
+-
+-  Name=WebMirror Admin Tool
+-  Name[nl]=WebSpiegel Administratie Tool
+-</pre><p>
+-    </p><p>
+-      In addition a .directory file needs to be created to provide a title and icon
+-      for the sub-menu itself:
+-</p><pre class="programlisting">
+-shinythings-webmirror.directory:
+-
+-  [Desktop Entry]
+-  Encoding=UTF-8
+-
+-  Icon=shinythings-webmirror-menu
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-</pre><p>
+-    </p><p>
+-      These file can now be installed with:
+-</p><pre class="programlisting">
+-xdg-desktop-menu install ./shinythings-webmirror.directory \
+-      ./shinythings-webmirror.desktop ./shinythings-webmirror-admin.desktop
+-</pre><p>
+-    </p><p>
+-      The menu entries could also be installed one by one:
+-</p><pre class="programlisting">
+-xdg-desktop-menu install --noupdate ./shinythings-webmirror.directory \
+-      ./shinythings-webmirror.desktop
+-xdg-desktop-menu install --noupdate ./shinythings-webmirror.directory \
+-      ./shinythings-webmirror-admin.desktop
+-xdg-desktop-menu forceupdate
+-</pre><p>
+-    </p><p>
+-      Although the result is the same it is slightly more efficient to
+-      install all files at the same time.
+-    </p><p>
+-      The *.desktop and *.directory files reference icons with the names
+-      webmirror, webmirror-admin and webmirror-menu which should also be
+-      installed. In this example the icons are installed in two different
+-      sizes, once with a size of 22x22 pixels and once with a size
+-      of 64x64 pixels:
+-</p><pre class="programlisting">
+-xdg-icon-resource install --size 22 ./wmicon-22.png shinythings-webmirror
+-xdg-icon-resource install --size 22 ./wmicon-menu-22.png shinythings-webmirror-menu
+-xdg-icon-resource install --size 22 ./wmicon-admin-22.png shinythings-webmirror-admin
+-xdg-icon-resource install --size 64 ./wmicon-64.png shinythings-webmirror
+-xdg-icon-resource install --size 64 ./wmicon-menu-64.png shinythings-webmirror-menu
+-xdg-icon-resource install --size 64 ./wmicon-admin-64.png shinythings-webmirror-admin
+-</pre><p>
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-email.html b/scripts/html/xdg-email.html
+deleted file mode 100644
+index a3854af..0000000
+--- a/scripts/html/xdg-email.html
++++ /dev/null
+@@ -1,89 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-email</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-email"><a name="xdg-email"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-email &#8212; command line tool for sending mail using the user's preferred e-mail composer</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-email</code>  [<code class="option">--utf8</code>] [<code class="option">--cc</code> <em class="replaceable"><code>address</code></em>] [<code class="option">--bcc</code> <em class="replaceable"><code>address</code></em>] [<code class="option">--subject</code> <em class="replaceable"><code>text</code></em>] [<code class="option">--body</code> <em class="replaceable"><co
 de>text</code></em>] [<code class="option">--attach</code> <em class="replaceable"><code>file</code></em>] [ <em class="replaceable"><code>mailto-uri</code></em>  |   <em class="replaceable"><code>address(es)</code></em> ]</p></div><div class="cmdsynopsis"><p><code class="command">xdg-email</code>  { <code class="option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      xdg-email opens the user's preferred e-mail composer in order to send
+-      a mail to <em class="replaceable"><code>address(es)</code></em> or
+-      <em class="replaceable"><code>mailto-uri</code></em>. RFC2368 defines mailto:
+-      URIs. xdg-email limits support to, cc, subject and body fields in
+-      <em class="replaceable"><code>mailto-uri</code></em>, all other fields are silently
+-      ignored. <em class="replaceable"><code>address(es)</code></em> must follow the
+-      syntax of RFC822. Multiple addresses may be provided as 
+-      separate arguments.
+-    </p><p>
+-      All information provided on the command line is used to
+-      prefill corresponding fields in the user's e-mail composer. The user
+-      will have the opportunity to change any of this information before
+-      actually sending the e-mail.
+-    </p><p>
+-      xdg-email is for use inside a desktop session only.
+-      It is not recommended to use xdg-email as root.
+-    </p><p>
+-      See http://portland.freedesktop.org/EmailConfig for information on
+-      how the user can change the e-mail composer that is used.
+-    </p></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--utf8</code></span></dt><dd>
+-	    Indicates that all command line options that follow are in utf8.
+-	    Without this option, command line options are expected to be
+-	    encoded according to locale.
+-            If the locale already specifies utf8 this option has no effect.
+-            This option does not affect mailto URIs that are passed on the
+-            command line.
+-	  </dd><dt><span class="term"><code class="option">--cc</code> <em class="replaceable"><code>address</code></em></span></dt><dd>
+-	    Specify a recipient to be copied on the e-mail.
+-	  </dd><dt><span class="term"><code class="option">--bcc</code> <em class="replaceable"><code>address</code></em></span></dt><dd>
+-	    Specify a recipient to be blindly copied on the e-mail.
+-	  </dd><dt><span class="term"><code class="option">--subject</code> <em class="replaceable"><code>text</code></em></span></dt><dd>
+-	    Specify a subject for the e-mail.
+-	  </dd><dt><span class="term"><code class="option">--body</code> <em class="replaceable"><code>text</code></em></span></dt><dd>
+-	    Specify a body for the e-mail. Since the user will be able to 
+-	    make changes before actually sending the e-mail, this can be 
+-	    used to provide the user with a template for the e-mail.
+-	    <em class="replaceable"><code>text</code></em> may contain linebreaks. 
+-	  </dd><dt><span class="term"><code class="option">--attach</code> <em class="replaceable"><code>file</code></em></span></dt><dd><p class="simpara">
+-	    Specify an attachment for the e-mail. <em class="replaceable"><code>file</code></em>
+-	    must point to an existing file.
+-	  </p><p class="simpara">
+-	    Some e-mail applications require the file to remain present
+-            after xdg-email returns.
+-	  </p></dd><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Environment Variables"><a name="env_vars"></a><h2>Environment Variables</h2><p>
+-      xdg-email honours the following environment variables:
+-    </p><div class="variablelist"><dl><dt><span class="term">XDG_UTILS_DEBUG_LEVEL</span></dt><dd>
+-	    Setting this environment variable to a non-zero numerical value
+-	    makes xdg-email do more verbose reporting on stderr.
+-	    Setting a higher value increases the verbosity.
+-	  </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-	    One of the files passed on the command line did not exist.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd><dt><span class="term"><code class="option">5</code></span></dt><dd>
+-	    No permission to read one of the files passed on the command
+-            line.
+-	  </dd></dl></div></div><div class="refsect1" title="Configuration"><a name="configuration"></a><h2>Configuration</h2><p>Visit http://portland.freedesktop.org/EmailConfig for information
+-      how to configure xdg-email to use the email client of your choice.
+-    </p></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-</p><pre class="programlisting">
+-xdg-email 'Jeremy White &lt;jwhite at example.com&gt;'
+-</pre><p>
+-    </p><p>
+-</p><pre class="programlisting">
+-xdg-email --attach /tmp/logo.png \
+-          --subject 'Logo contest' \
+-          --body 'Attached you find the logo for the contest.' \
+-          'jwhite at example.com'
+-</pre><p>
+-    </p><p>
+-</p><pre class="programlisting">
+-xdg-email --subject 'Your password is about to expire' \
+-          'jwhite at example.com' 'bastian at example.com' 'whipple at example.com'
+-</pre><p>
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-icon-resource.html b/scripts/html/xdg-icon-resource.html
+deleted file mode 100644
+index a734033..0000000
+--- a/scripts/html/xdg-icon-resource.html
++++ /dev/null
+@@ -1,128 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-icon-resource</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-icon-resource"><a name="xdg-icon-resource"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-icon-resource &#8212; command line tool for (un)installing icon resources</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-icon-resource</code>   install  [<code class="option">--noupdate</code>] [<code class="option">--novendor</code>] [<code class="option">--theme <em class="replaceable"><code>theme</code></em></code>] [<code class="option">--context <em class="replaceable"><code>context</code></em></code>] [<code class="option">--mode <em class="replaceable"><code>mode</code></em><
 /code>]  <code class="option">--size <em class="replaceable"><code>size</code></em></code>   <em class="replaceable"><code>icon-file</code></em>  [<em class="replaceable"><code>icon-name</code></em>]</p></div><div class="cmdsynopsis"><p><code class="command">xdg-icon-resource</code>   uninstall  [<code class="option">--noupdate</code>] [<code class="option">--theme <em class="replaceable"><code>theme</code></em></code>] [<code class="option">--context <em class="replaceable"><code>context</code></em></code>] [<code class="option">--mode <em class="replaceable"><code>mode</code></em></code>]  <code class="option">--size <em class="replaceable"><code>size</code></em></code>   <em class="replaceable"><code>icon-name</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-icon-resource</code>   forceupdate  [<code class="option">--theme <em class="replaceable"><code>theme</code></em></code>] [<code class="option">--mode <em class="replaceable"><code>mode</cod
 e></em></code>]</p></div><div class="cmdsynopsis"><p><code class="command">xdg-icon-resource</code>  { <code class="option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      The xdg-icon-resource program can be used to install icon resources
+-      into the desktop icon system in order to illustrate menu entries,
+-      to depict desktop icons or to graphically represent file types.
+-    </p><p>
+-      The desktop icon system identifies icons by name. Depending on the
+-      required size, the choice of icon theme and the context in which the
+-      icon is used, the desktop icon system locates an appropriate
+-      icon resource to depict an icon. Icon resources can be XPM files or
+-      PNG files. 
+-    </p><p>
+-      The desktop icon system works according to the
+-      XDG Icon Theme Specification at
+-      http://www.freedesktop.org/Standards/icon-theme-spec
+-    </p></div><div class="refsect1" title="Commands"><a name="commands"></a><h2>Commands</h2><div class="variablelist"><dl><dt><span class="term">install</span></dt><dd>
+-	    Installs the icon file indicated by <em class="replaceable"><code>icon-file</code></em>
+-            to the desktop icon system under the name 
+-            <em class="replaceable"><code>icon-name</code></em>. 
+-            Icon names do not have an extension.
+-            If <em class="replaceable"><code>icon-name</code></em> is not provided the name is
+-            derived from <em class="replaceable"><code>icon-file</code></em>.
+-            The icon file must have
+-            <span class="emphasis"><em>.png</em></span> or <span class="emphasis"><em>.xpm</em></span>
+-            as extension. If a corresponding <span class="emphasis"><em>.icon</em></span>
+-            file exists in the same location as <em class="replaceable"><code>icon-file</code></em>
+-            it will be installed as well.
+-	  </dd><dt><span class="term">uninstall</span></dt><dd>
+-	    Removes the icon indicated by <em class="replaceable"><code>icon-name</code></em>
+-            from the desktop icon system. Note that icon names do not have
+-            an extension.
+-	  </dd><dt><span class="term">forceupdate</span></dt><dd>
+-	    Force an update of the desktop icon system. This is only useful if
+-	    the last call to xdg-icon-resource included the <code class="option">--noupdate</code> option.
+-	  </dd></dl></div></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--noupdate</code></span></dt><dd>
+-	    Postpone updating the desktop icon system. If multiple icons are
+-	    added in sequence this flag can be used to indicate that
+-	    additional changes will follow and that it is not
+-            necassery to update the desktop icon system right away.
+-	  </dd><dt><span class="term"><code class="option">--novendor</code></span></dt><dd><p class="simpara">
+-	    Normally, xdg-icon-resource checks to ensure that an icon file
+-	    to be installed in the <span class="emphasis"><em>apps</em></span> context has
+-	    a proper vendor prefix. This option can be used to disable
+-	    that check.
+-	  </p><p class="simpara">
+-            A vendor prefix consists of alpha characters ([a-zA-Z]) and is
+-            terminated with a dash ("-").
+-            Companies and organizations are encouraged to use a word
+-            or phrase, preferably the organizations name, for which they hold
+-            a trademark as their vendor prefix.
+-            The purpose of the vendor prefix is to prevent name conflicts.
+-          </p></dd><dt><span class="term"><code class="option">--theme</code> <em class="replaceable"><code>theme</code></em></span></dt><dd>
+-	    Installs or removes the icon file as part of 
+-	    <em class="replaceable"><code>theme</code></em>. If no theme is specified the
+-	    icons will be installed as part of the default <span class="emphasis"><em>hicolor</em></span> theme.
+-	    Applications may install icons under multiple themes but should
+-	    at least install icons for the default <span class="emphasis"><em>hicolor</em></span> theme.
+-	  </dd><dt><span class="term"><code class="option">--context</code> <em class="replaceable"><code>context</code></em></span></dt><dd>
+-	    Specifies the context for the icon. Icons to be used in the
+-            application menu and as desktop icon should use
+-            <span class="emphasis"><em>apps</em></span> as context which is the default
+-            context. Icons to be used as file icons should use
+-            <span class="emphasis"><em>mimetypes</em></span> as context.
+-            Other common contexts are <span class="emphasis"><em>actions</em></span>,
+-            <span class="emphasis"><em>devices</em></span>, <span class="emphasis"><em>emblems</em></span>,
+-            <span class="emphasis"><em>filesystems</em></span> and <span class="emphasis"><em>stock</em></span>.
+-	  </dd><dt><span class="term"><code class="option">--size</code> <em class="replaceable"><code>size</code></em></span></dt><dd>
+-	    Specifies the size of the icon. All icons must be square.
+-	    Common sizes for icons in the apps context are:
+-	    16, 22, 32, 48, 64 and 128.  
+-	    Common sizes for icons in the mimetypes context are:
+-	    16, 22, 32, 48, 64 and 128
+-	  </dd><dt><span class="term"><code class="option">--mode</code> <em class="replaceable"><code>mode</code></em></span></dt><dd><p class="simpara"><em class="replaceable"><code>mode</code></em> can be
+-            <span class="emphasis"><em>user</em></span> or <span class="emphasis"><em>system</em></span>.
+-            In user mode the file is (un)installed for the current user
+-            only. In system mode the file is (un)installed for all users
+-            on the system. Usually only root is allowed to install in
+-            system mode.
+-	  </p><p class="simpara">
+-	    The default is to use system mode when called by root
+-	    and to use user mode when called by a non-root user.
+-	  </p></dd><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Environment Variables"><a name="env_vars"></a><h2>Environment Variables</h2><p>
+-      xdg-icon-resource honours the following environment variables:
+-    </p><div class="variablelist"><dl><dt><span class="term">XDG_UTILS_DEBUG_LEVEL</span></dt><dd>
+-	    Setting this environment variable to a non-zero numerical value
+-	    makes xdg-icon-resource do more verbose reporting on stderr.
+-	    Setting a higher value increases the verbosity.
+-	  </dd><dt><span class="term">XDG_UTILS_INSTALL_MODE</span></dt><dd>
+-	    This environment variable can be used by the user or
+-            administrator to override the installation mode.
+-	    Valid values are <span class="emphasis"><em>user</em></span> and
+-            <span class="emphasis"><em>system</em></span>.  
+-	  </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-	    One of the files passed on the command line did not exist.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd><dt><span class="term"><code class="option">5</code></span></dt><dd>
+-	    No permission to read one of the files passed on the command
+-            line.
+-	  </dd></dl></div></div><div class="refsect1" title="See Also"><a name="seealso"></a><h2>See Also</h2><p><span class="citerefentry"><span class="refentrytitle">xdg-desktop-icon</span>(1)</span>,
+-      <span class="citerefentry"><span class="refentrytitle">xdg-desktop-menu</span>(1)</span>,
+-      <span class="citerefentry"><span class="refentrytitle">xdg-mime</span>(1)</span>
+-    </p></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-To install an icon resource to depict a launcher for the application
+-myfoobar, the company ShinyThings Inc. can use:
+-</p><pre class="programlisting">
+-xdg-icon-resource install --size 64 shinythings-myfoobar.png
+-</pre><p>
+-    </p><p>
+-To install an icon for a new application/x-foobar file type one can use:
+-</p><pre class="programlisting">
+-xdg-icon-resource install --context mimetypes --size 48 ./mime-foobar-48.png application-x-foobar
+-xdg-icon-resource install --context mimetypes --size 64 ./mime-foobar-64.png application-x-foobar
+-</pre><p>This will install two icons with the name application-x-foobar
+-but with different sizes.
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-mime.html b/scripts/html/xdg-mime.html
+deleted file mode 100644
+index 53bb99c..0000000
+--- a/scripts/html/xdg-mime.html
++++ /dev/null
+@@ -1,145 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-mime</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-mime"><a name="xdg-mime"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-mime &#8212; command line tool for querying information about file type handling
+-and adding descriptions for new file types</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-mime</code>   query  { filetype  |   default }  ... </p></div><div class="cmdsynopsis"><p><code class="command">xdg-mime</code>   default   <em class="replaceable"><code>application</code></em>   <em class="replaceable"><code>mimetype(s)</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-mime</code>   install  [<code class="option">--mode <em class="replaceable"><code>mode</code></em></code>] [<code class="option">--novendor</code>]  <em class="replaceable"><code>mimetypes-file</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-mime</code>   uninstall  [<code class="option">--mode <em class="replaceable"><code>mode</code></em></code>]  <em class="replaceable"><code>mimetypes-file</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-mime<
 /code>  { <code class="option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      The xdg-mime program can be used to query information about file types
+-      and to add descriptions for new file types.
+-    </p></div><div class="refsect1" title="Commands"><a name="commands"></a><h2>Commands</h2><div class="variablelist"><dl><dt><span class="term">query</span></dt><dd><p class="simpara">
+-	    Returns information related to file types.
+-	  </p><p class="simpara">
+-            The <span class="emphasis"><em>query</em></span> option is for use inside a desktop session only.
+-            It is not recommended to use xdg-mime query as root.
+-	  </p><p class="simpara">
+-            The following queries are supported:
+-	  </p><p class="simpara">query filetype <em class="replaceable"><code>FILE</code></em>:
+-	    Returns the file type of <em class="replaceable"><code>FILE</code></em> in the form of a MIME type.
+-	  </p><p class="simpara">query default <em class="replaceable"><code>mimetype</code></em>:
+-	    Returns the default application that the desktop environment uses for opening
+-	    files of type <em class="replaceable"><code>mimetype</code></em>. The default application is
+-            identified by its *.desktop file.
+-	  </p></dd><dt><span class="term">default</span></dt><dd><p class="simpara">
+-	    Ask the desktop environment to make <em class="replaceable"><code>application</code></em>
+-	    the default application for opening
+-	    files of type <em class="replaceable"><code>mimetype</code></em>. An
+-            application can be made the default for several file types by
+-            specifying multiple mimetypes.
+-	  </p><p class="simpara">
+-	    <em class="replaceable"><code>application</code></em> is the desktop file
+-	    id of the application and has the form vendor-name.desktop
+-	    <em class="replaceable"><code>application</code></em> must already be installed
+-	    in the desktop menu before it can be made the default handler.
+-	    The aplication's desktop file must list support for all the
+-	    MIME types that it wishes to be the default handler for.
+-	  </p><p class="simpara">
+-	    Requests to make an application a default handler may be
+-	    subject to system policy or approval by the end-user. xdg-mime
+-            query can be used to verify whether an application is the
+-            actual default handler for a specific file type.   
+-	  </p><p class="simpara">
+-            The <span class="emphasis"><em>default</em></span> option is for use inside a desktop session only.
+-            It is not recommended to use xdg-mime default as root.
+-	  </p></dd><dt><span class="term">install</span></dt><dd>
+-	    Adds the file type descriptions provided in <em class="replaceable"><code>mimetypes-file</code></em>
+-            to the desktop environment. <em class="replaceable"><code>mimetypes-file</code></em>
+-            must be a XML file that follows the freedesktop.org
+-            Shared MIME-info Database specification
+-            and that has a mime-info element as its document root. For
+-            each new file type one or more icons with name
+-            <em class="replaceable"><code>type</code></em>-<em class="replaceable"><code>subtype</code></em>
+-            must be installed with the <span class="command"><strong>xdg-icon-resource</strong></span>
+-            command in the <span class="emphasis"><em>mimetypes</em></span> context. For example the
+-            filetype application/vnd.oasis.opendocument.text requires an
+-            icon named application-vnd.oasis.opendocument.text
+-            to be installed (unless the file type recommends another icon name).
+-	  </dd><dt><span class="term">uninstall</span></dt><dd>
+-	    Removes the file type descriptions provided in <em class="replaceable"><code>mimetypes-file</code></em>
+-            and previously added with <span class="command"><strong>xdg-mime install</strong></span> from the
+-            desktop environment. <em class="replaceable"><code>mimetypes-file</code></em>
+-            must be a XML file that follows the freedesktop.org
+-            Shared MIME-info Database specification
+-            and that has a mime-info element as its document root.
+-	  </dd></dl></div></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--mode</code> <em class="replaceable"><code>mode</code></em></span></dt><dd><p class="simpara"><em class="replaceable"><code>mode</code></em> can be
+-            <span class="emphasis"><em>user</em></span> or <span class="emphasis"><em>system</em></span>.
+-            In user mode the file is (un)installed for the current user
+-            only. In system mode the file is (un)installed for all users
+-            on the system. Usually only root is allowed to install in
+-            system mode.
+-	  </p><p class="simpara">
+-	    The default is to use system mode when called by root
+-	    and to use user mode when called by a non-root user.
+-	  </p></dd><dt><span class="term"><code class="option">--novendor</code></span></dt><dd><p class="simpara">
+-	    Normally, xdg-mime checks to ensure that the
+-	    <em class="replaceable"><code>mimetypes-file</code></em> to be installed
+-	    has a proper vendor prefix. This option can be
+-	    used to disable that check.
+-	  </p><p class="simpara">
+-            A vendor prefix consists of alpha characters ([a-zA-Z]) and is
+-            terminated with a dash ("-").
+-            Companies and organizations are encouraged to use a word
+-            or phrase, preferably the organizations name, for which they hold
+-            a trademark as their vendor prefix.
+-            The purpose of the vendor prefix is to prevent name conflicts.
+-          </p></dd><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Environment Variables"><a name="env_vars"></a><h2>Environment Variables</h2><p>
+-      xdg-mime honours the following environment variables:
+-    </p><div class="variablelist"><dl><dt><span class="term">XDG_UTILS_DEBUG_LEVEL</span></dt><dd>
+-	    Setting this environment variable to a non-zero numerical value
+-	    makes xdg-mime do more verbose reporting on stderr.
+-	    Setting a higher value increases the verbosity.
+-	  </dd><dt><span class="term">XDG_UTILS_INSTALL_MODE</span></dt><dd>
+-	    This environment variable can be used by the user or
+-            administrator to override the installation mode.
+-	    Valid values are <span class="emphasis"><em>user</em></span> and
+-            <span class="emphasis"><em>system</em></span>.  
+-	  </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-	    One of the files passed on the command line did not exist.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd><dt><span class="term"><code class="option">5</code></span></dt><dd>
+-	    No permission to read one of the files passed on the command
+-            line.
+-	  </dd></dl></div></div><div class="refsect1" title="See Also"><a name="seealso"></a><h2>See Also</h2><p><span class="citerefentry"><span class="refentrytitle">xdg-icon-resource</span>(1)</span>,
+-      <span class="citerefentry"><span class="refentrytitle">xdg-desktop-menu</span>(1)</span>
+-    </p></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-</p><pre class="programlisting">
+-xdg-mime query filetype /tmp/foobar.png
+-</pre><p>Prints the MIME type of the file /tmp/foobar.png, in this
+-case image/png
+-    </p><p>
+-</p><pre class="programlisting">
+-xdg-mime query default image/png
+-</pre><p>Prints the .desktop filename of the application which is
+-      registered to open PNG files.
+-    </p><p>
+-</p><pre class="programlisting">
+-xdg-mime install shinythings-shiny.xml
+-</pre><p>Adds a file type description for "shiny"-files.
+-      "shinythings-" is used as the vendor prefix.
+-      The file type description could look as folows.  
+-</p><pre class="programlisting">
+-shinythings-shiny.xml:
+-
+-&lt;?xml version="1.0"?&gt;
+-&lt;mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'&gt;
+-  &lt;mime-type type="text/x-shiny"&gt;
+-    &lt;comment&gt;Shiny new file type&lt;/comment&gt;
+-    &lt;glob pattern="*.shiny"/&gt;
+-    &lt;glob pattern="*.shi"/&gt;
+-  &lt;/mime-type&gt;
+-&lt;/mime-info&gt;
+-</pre><p>An icon for this new file type must also be installed, for
+-example with:
+-</p><pre class="programlisting">
+-xdg-icon-resource install --context mimetypes --size 64 shiny-file-icon.png text-x-shiny
+-</pre><p>
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-open.html b/scripts/html/xdg-open.html
+deleted file mode 100644
+index 2433500..0000000
+--- a/scripts/html/xdg-open.html
++++ /dev/null
+@@ -1,38 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-open</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-open"><a name="xdg-open"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-open &#8212; opens a file or URL in the user's preferred application</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-open</code>  { <code class="option"><em class="replaceable"><code>file</code></em></code>  |   <code class="option"><em class="replaceable"><code>URL</code></em></code> }</p></div><div class="cmdsynopsis"><p><code class="command">xdg-open</code>  { <code class="option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="
 refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      xdg-open opens a file or URL in the user's preferred application.
+-      If a URL is provided the URL will be opened in the user's preferred
+-      web browser. If a file is provided the file will be opened in the
+-      preferred application for files of that type. xdg-open supports
+-      file, ftp, http and https URLs.
+-    </p><p>
+-      xdg-open is for use inside a desktop session only.
+-      It is not recommended to use xdg-open as root.
+-    </p></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-	    One of the files passed on the command line did not exist.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd></dl></div></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-</p><pre class="programlisting">
+-xdg-open 'http://www.freedesktop.org/'
+-</pre><p>
+-      Opens the Freedesktop.org website in the user's default browser
+-    </p><p>
+-</p><pre class="programlisting">
+-xdg-open /tmp/foobar.png
+-</pre><p>
+-      Opens the PNG image file /tmp/foobar.png in the user's default image
+-      viewing application.
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-screensaver.html b/scripts/html/xdg-screensaver.html
+deleted file mode 100644
+index 219f48c..0000000
+--- a/scripts/html/xdg-screensaver.html
++++ /dev/null
+@@ -1,63 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-screensaver</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-screensaver"><a name="xdg-screensaver"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-screensaver &#8212; command line tool for controlling the screensaver</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-screensaver</code>   <code class="option">suspend <em class="replaceable"><code>WindowID</code></em></code> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-screensaver</code>   <code class="option">resume <em class="replaceable"><code>WindowID</code></em></code> </p></div><div class="cmdsynopsis"><p><code class="command">xdg-screensaver</code>  { <code class
 ="option">activate</code>  |   <code class="option">lock</code>  |   <code class="option">reset</code>  |   <code class="option">status</code> }</p></div><div class="cmdsynopsis"><p><code class="command">xdg-screensaver</code>  { <code class="option">--help</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      xdg-screensaver provides commands to control the screensaver.
+-    </p><p>
+-      xdg-screensaver is for use inside a desktop session only.
+-      It is not recommended to use xdg-screensaver as root.
+-    </p></div><div class="refsect1" title="Commands"><a name="commands"></a><h2>Commands</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">suspend <em class="replaceable"><code>WindowID</code></em></code></span></dt><dd><p class="simpara">
+-            Suspends the screensaver and monitor power management.
+-            <em class="replaceable"><code>WindowID</code></em> must be the X Window ID
+-            of an existing window of the calling application. The window
+-            must remain in existance for the duration of the suspension.
+-          </p><p class="simpara">
+-            WindowID can be represented as either a decimal number
+-            or as a hexadecimal number consisting of the prefix
+-            <span class="emphasis"><em>0x</em></span> followed by one or more hexadecimal
+-            digits. 
+-          </p><p class="simpara">
+-            The screensaver can be suspended in relation to multiple
+-            windows at the same time. In that case screensaver
+-            operation is only restored once the screensaver has been
+-            resumed in relation to each of the windows
+-          </p></dd><dt><span class="term"><code class="option">resume <em class="replaceable"><code>WindowID</code></em></code></span></dt><dd>
+-            Resume the screensaver and monitor power management after being
+-            suspended.
+-            <em class="replaceable"><code>WindowID</code></em>
+-            must be the same X Window ID that was passed to a previous call
+-            of <span class="command"><strong>xdg-screensaver suspend</strong></span>
+-          </dd><dt><span class="term"><code class="option">activate</code></span></dt><dd>
+-            Turns the screensaver on immediately. This may result in the
+-            screen getting locked, depending on existing system policies.
+-          </dd><dt><span class="term"><code class="option">lock</code></span></dt><dd>
+-            Lock the screen immediately.
+-          </dd><dt><span class="term"><code class="option">reset</code></span></dt><dd>
+-            Turns the screensaver off immediately. If the screen was locked
+-            the user may be asked to authenticate first.
+-          </dd><dt><span class="term"><code class="option">status</code></span></dt><dd>
+-            Prints <span class="emphasis"><em>enabled</em></span> to stdout if the
+-            screensaver is enabled to turn on after a period of
+-            inactivity and prints
+-            <span class="emphasis"><em>disabled</em></span> if the screensaver is
+-            not enabled.
+-          </dd></dl></div></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-	    Show command synopsis.
+-	  </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-	    Show this manualpage.
+-	  </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-	    Error in command line syntax.
+-	  </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-	    A required tool could not be found. 
+-	  </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-	    The action failed. 
+-	  </dd></dl></div></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-</p><pre class="programlisting">
+-xdg-screensaver suspend 0x1c00007
+-</pre><p>Causes the screensaver to be disabled till
+-        <span class="command"><strong>xdg-screensaver resume 0x1c00007</strong></span> is called.
+-        <span class="emphasis"><em>0x1c00007</em></span> must be the X Window ID of an
+-        existing window.
+-    </p></div></div></body></html>
+diff --git a/scripts/html/xdg-settings.html b/scripts/html/xdg-settings.html
+deleted file mode 100644
+index 380ad2a..0000000
+--- a/scripts/html/xdg-settings.html
++++ /dev/null
+@@ -1,59 +0,0 @@
+-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xdg-settings</title><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="xdg-settings"><a name="xdg-settings"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xdg-settings &#8212; get various settings from the desktop environment</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xdg-settings</code>  { <code class="option"><em class="replaceable"><code>get</code></em></code>  |   <code class="option"><em class="replaceable"><code>check</code></em></code>  |   <code class="option"><em class="replaceable"><code>set</code></em></code> } {<code class="option">property</code>} [<code class="option">subproperty</code>] [<code class="option">value</code>]</p></div><div cl
 ass="cmdsynopsis"><p><code class="command">xdg-settings</code>  { <code class="option">--help</code>  |   <code class="option">--list</code>  |   <code class="option">--manual</code>  |   <code class="option">--version</code> }</p></div></div><div class="refsect1" title="Description"><a name="description"></a><h2>Description</h2><p>
+-      xdg-settings gets various settings from the desktop environment.
+-      For instance, desktop environments often provide proxy configuration
+-      and default web browser settings. Using xdg-settings these parameters
+-      can be extracted for use by applications that do not use the desktop
+-      environment's libraries (which would use the settings natively).
+-    </p><p>
+-      xdg-settings is for use inside a desktop session only.
+-      It is not recommended to use xdg-settings as root.
+-    </p></div><div class="refsect1" title="Options"><a name="options"></a><h2>Options</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">--help</code></span></dt><dd>
+-            Show command synopsis.
+-          </dd><dt><span class="term"><code class="option">--list</code></span></dt><dd>
+-            List all properties xdg-settings knows about.
+-          </dd><dt><span class="term"><code class="option">--manual</code></span></dt><dd>
+-            Show this manualpage.
+-          </dd><dt><span class="term"><code class="option">--version</code></span></dt><dd>
+-            Show the xdg-utils version information.
+-          </dd></dl></div></div><div class="refsect1" title="Properties"><a name="properties"></a><h2>Properties</h2><p>
+-      When using xdg-settings to get, check or set a destkop setting, properties
+-      and possibly sub-properties are used to specify the setting to be changed.
+-    </p><p>
+-      Some properties (such as default-web-browser) fully describe the setting
+-      to be changed. Other properties (such as default-url-scheme-handler) require
+-      more information (in this case the actual scheme to set the default handler
+-      for) which must be provided in a sub-property.
+-    </p></div><div class="refsect1" title="Exit Codes"><a name="exitcodes"></a><h2>Exit Codes</h2><p>
+-      An exit code of 0 indicates success while a non-zero exit code
+-      indicates failure. The following failure codes can be returned:
+-    </p><div class="variablelist"><dl><dt><span class="term"><code class="option">1</code></span></dt><dd>
+-            Error in command line syntax.
+-          </dd><dt><span class="term"><code class="option">2</code></span></dt><dd>
+-            One of the files passed on the command line did not exist.
+-          </dd><dt><span class="term"><code class="option">3</code></span></dt><dd>
+-            A required tool could not be found. 
+-          </dd><dt><span class="term"><code class="option">4</code></span></dt><dd>
+-            The action failed. 
+-          </dd></dl></div></div><div class="refsect1" title="Examples"><a name="examples"></a><h2>Examples</h2><p>
+-      Get the desktop file name of the current default web browser
+-      </p><pre class="programlisting">
+-        xdg-settings get default-web-browser
+-      </pre><p>
+-    </p><p>
+-      Check whether the default web browser is firefox.desktop, which can be
+-      false even if "get default-web-browser" says that is the current value
+-      (if only some of the underlying settings actually reflect that value)
+-      </p><pre class="programlisting">
+-        xdg-settings check default-web-browser firefox.desktop
+-      </pre><p>
+-    </p><p>
+-      Set the default web browser to google-chrome.desktop
+-      </p><pre class="programlisting">
+-        xdg-settings set default-web-browser google-chrome.desktop
+-      </pre><p>
+-    </p><p>
+-      Set the default mailto URL scheme handler to be evolution.desktop
+-      </p><pre class="programlisting">
+-        xdg-settings set default-url-scheme-handler mailto evolution.desktop
+-      </pre><p>
+-    </p></div></div></body></html>
+-- 
+1.9.0
+
diff --git a/0005-remove-generated-man-pages.patch b/0005-remove-generated-man-pages.patch
new file mode 100644
index 0000000..850993a
--- /dev/null
+++ b/0005-remove-generated-man-pages.patch
@@ -0,0 +1,1939 @@
+From 668c5e140a07a4b739d791caba3232e590a3e26c Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 7 Feb 2014 12:25:28 -0600
+Subject: [PATCH 5/9] remove generated man pages
+
+---
+ scripts/man/.gitignore          |   8 +
+ scripts/man/xdg-desktop-icon.1  | 241 ---------------------
+ scripts/man/xdg-desktop-menu.1  | 448 ----------------------------------------
+ scripts/man/xdg-email.1         | 199 ------------------
+ scripts/man/xdg-icon-resource.1 | 244 ----------------------
+ scripts/man/xdg-mime.1          | 286 -------------------------
+ scripts/man/xdg-open.1          | 124 -----------
+ scripts/man/xdg-screensaver.1   | 154 --------------
+ scripts/man/xdg-settings.1      | 154 --------------
+ 9 files changed, 8 insertions(+), 1850 deletions(-)
+ delete mode 100644 scripts/man/xdg-desktop-icon.1
+ delete mode 100644 scripts/man/xdg-desktop-menu.1
+ delete mode 100644 scripts/man/xdg-email.1
+ delete mode 100644 scripts/man/xdg-icon-resource.1
+ delete mode 100644 scripts/man/xdg-mime.1
+ delete mode 100644 scripts/man/xdg-open.1
+ delete mode 100644 scripts/man/xdg-screensaver.1
+ delete mode 100644 scripts/man/xdg-settings.1
+
+diff --git a/scripts/man/.gitignore b/scripts/man/.gitignore
+index e69de29..43c7914 100644
+--- a/scripts/man/.gitignore
++++ b/scripts/man/.gitignore
+@@ -0,0 +1,8 @@
++xdg-desktop-icon.1
++xdg-desktop-menu.1
++xdg-email.1
++xdg-icon-resource.1
++xdg-mime.1
++xdg-open.1
++xdg-screensaver.1
++xdg-settings.1
+diff --git a/scripts/man/xdg-desktop-icon.1 b/scripts/man/xdg-desktop-icon.1
+deleted file mode 100644
+index 0b062d2..0000000
+--- a/scripts/man/xdg-desktop-icon.1
++++ /dev/null
+@@ -1,241 +0,0 @@
+-'\" t
+-.\"     Title: xdg-desktop-icon
+-.\"    Author: Kevin Krammer
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-desktop-icon Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-DESKTOP\-ICON" "1" "12/31/2010" "xdg-utils 1.0" "xdg-desktop-icon Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-desktop-icon \- command line tool for (un)installing icons to the desktop
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-desktop\-icon\fR\ 'u
+-\fBxdg\-desktop\-icon\fR install [\fB\-\-novendor\fR] \fIFILE\fR
+-.HP \w'\fBxdg\-desktop\-icon\fR\ 'u
+-\fBxdg\-desktop\-icon\fR uninstall \fIFILE\fR
+-.HP \w'\fBxdg\-desktop\-icon\fR\ 'u
+-\fBxdg\-desktop\-icon\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-The xdg\-desktop\-icon program can be used to install an application launcher or other file on the desktop of the current user\&.
+-.PP
+-An application launcher is represented by a *\&.desktop file\&. Desktop files are defined by the freedesktop\&.org Desktop Entry Specification\&. The most important aspects of *\&.desktop files are summarized below\&.
+-.SH "COMMANDS"
+-.PP
+-install
+-.RS 4
+-Installs
+-\fIFILE\fR
+-to the desktop of the current user\&.
+-\fIFILE\fR
+-can be a *\&.desktop file or any other type of file\&.
+-.RE
+-.PP
+-uninstall
+-.RS 4
+-Removes
+-\fIFILE\fR
+-from the desktop of the current user\&.
+-.RE
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-novendor\fR
+-.RS 4
+-Normally, xdg\-desktop\-icon checks to ensure that a *\&.desktop file to be installed has a vendor prefix\&. This option can be used to disable that check\&.
+-.sp
+-A vendor prefix consists of alpha characters ([a\-zA\-Z]) and is terminated with a dash ("\-")\&. Companies and organizations are encouraged to use a word or phrase, preferably the organizations name, for which they hold a trademark as their vendor prefix\&. The purpose of the vendor prefix is to prevent name conflicts\&.
+-.RE
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "DESKTOP FILES"
+-.PP
+-An application launcher can be added to the desktop by installing a *\&.desktop file\&. A *\&.desktop file consists of a
+-\fI[Desktop Entry]\fR
+-header followed by several
+-\fIKey\fR=\fIValue\fR
+-lines\&.
+-.PP
+-A *\&.desktop file can provide a name and description for an application in several different languages\&. This is done by adding a language code as used by LC_MESSAGES in square brackets behind the
+-\fIKey\fR\&. This way one can specify different values for the same
+-\fIKey\fR
+-depending on the currently selected language\&.
+-.PP
+-The following keys are often used:
+-.PP
+-Value=1\&.0
+-.RS 4
+-This is a mandatory field to indicate that the *\&.desktop file follows the 1\&.0 version of the specification\&.
+-.RE
+-.PP
+-Type=Application
+-.RS 4
+-This is a mandatory field that indicates that the *\&.desktop file describes an application launcher\&.
+-.RE
+-.PP
+-Name=\fIApplication Name\fR
+-.RS 4
+-The name of the application\&. For example
+-\fIMozilla\fR
+-.RE
+-.PP
+-GenericName=\fIGeneric Name\fR
+-.RS 4
+-A generic description of the application\&. For example
+-\fIWeb Browser\fR
+-.RE
+-.PP
+-Comment=\fIComment\fR
+-.RS 4
+-Optional field to specify a tooltip for the application\&. For example
+-\fIVisit websites on the Internet\fR
+-.RE
+-.PP
+-Icon=\fIIcon File\fR
+-.RS 4
+-The icon to use for the application\&. This can either be an absolute path to an image file or an icon\-name\&. If an icon\-name is provided an image lookup by name is done in the user\*(Aqs current icon theme\&. The
+-\fBxdg\-icon\-resource\fR
+-command can be used to install image files into icon themes\&. The advantage of using an icon\-name instead of an absolute path is that with an icon\-name the application icon can be provided in several different sizes as well as in several differently themed styles\&.
+-.RE
+-.PP
+-Exec=\fICommand Line\fR
+-.RS 4
+-The command line to start the application\&. If the application can open files the %f placeholder should be specified\&. When a file is dropped on the application launcher the %f is replaced with the file path of the dropped file\&. If multiple files can be specified on the command line the %F placeholder should be used instead of %f\&. If the application is able to open URLs in addition to local files then %u or %U can be used instead of %f or %F\&.
+-.RE
+-.PP
+-For a complete oveview of the *\&.desktop file format please visit http://www\&.freedesktop\&.org/wiki/Standards/desktop\-entry\-spec
+-.SH "ENVIRONMENT VARIABLES"
+-.PP
+-xdg\-desktop\-icon honours the following environment variables:
+-.PP
+-XDG_UTILS_DEBUG_LEVEL
+-.RS 4
+-Setting this environment variable to a non\-zero numerical value makes xdg\-desktop\-icon do more verbose reporting on stderr\&. Setting a higher value increases the verbosity\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.PP
+-\fB5\fR
+-.RS 4
+-No permission to read one of the files passed on the command line\&.
+-.RE
+-.SH "SEE ALSO"
+-.PP
+-\fBxdg-icon-resource\fR(1)
+-.SH "EXAMPLES"
+-.PP
+-The company ShinyThings Inc\&. has developed an application named "WebMirror" and would like to add a launcher for for on the desktop\&. The company will use "shinythings" as its vendor id\&. In order to add the application to the desktop there needs to be a \&.desktop file for the application:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-shinythings\-webmirror\&.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF\-8
+-  Type=Application
+-
+-  Exec=webmirror
+-  Icon=shinythings\-webmirror
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Now the xdg\-desktop\-icon tool can be used to add the webmirror\&.desktop file to the desktop:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-desktop\-icon install \&./shinythings\-webmirror\&.desktop
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-To add a README file to the desktop as well, the following command can be used:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-desktop\-icon install \&./shinythings\-README
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-.SH "AUTHORS"
+-.PP
+-\fBKevin Krammer\fR
+-.RS 4
+-Author.
+-.RE
+-.PP
+-\fBJeremy White\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-desktop-menu.1 b/scripts/man/xdg-desktop-menu.1
+deleted file mode 100644
+index b5ca38a..0000000
+--- a/scripts/man/xdg-desktop-menu.1
++++ /dev/null
+@@ -1,448 +0,0 @@
+-'\" t
+-.\"     Title: xdg-desktop-menu
+-.\"    Author: Kevin Krammer
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-desktop-menu Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-DESKTOP\-MENU" "1" "12/31/2010" "xdg-utils 1.0" "xdg-desktop-menu Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-desktop-menu \- command line tool for (un)installing desktop menu items
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-desktop\-menu\fR\ 'u
+-\fBxdg\-desktop\-menu\fR install [\fB\-\-noupdate\fR] [\fB\-\-novendor\fR] [\fB\-\-mode\ \fR\fB\fImode\fR\fR] \fIdirectory\-file(s)\fR \fIdesktop\-file(s)\fR
+-.HP \w'\fBxdg\-desktop\-menu\fR\ 'u
+-\fBxdg\-desktop\-menu\fR uninstall [\fB\-\-noupdate\fR] [\fB\-\-mode\ \fR\fB\fImode\fR\fR] \fIdirectory\-file(s)\fR \fIdesktop\-file(s)\fR
+-.HP \w'\fBxdg\-desktop\-menu\fR\ 'u
+-\fBxdg\-desktop\-menu\fR forceupdate [\fB\-\-mode\ \fR\fB\fImode\fR\fR]
+-.HP \w'\fBxdg\-desktop\-menu\fR\ 'u
+-\fBxdg\-desktop\-menu\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-The xdg\-desktop\-menu program can be used to install new menu entries to the desktop\*(Aqs application menu\&.
+-.PP
+-The application menu works according to the XDG Desktop Menu Specification at http://www\&.freedesktop\&.org/Standards/menu\-spec
+-.SH "COMMANDS"
+-.PP
+-install
+-.RS 4
+-Install one or more applications in a submenu of the desktop menu system\&.
+-.sp
+-\fIdesktop\-file\fR: A desktop file represents a single menu entry in the menu\&. Desktop files are defined by the freedesktop\&.org Desktop Entry Specification\&. The most important aspects of *\&.desktop files are summarized below\&.
+-.sp
+-Menu entries can be added to the menu system in two different ways\&. They can either be added to a predefined submenu in the menu system based on one or more category keywords, or they can be added to a new submenu\&.
+-.sp
+-To add a menu entry to a predefined submenu the desktop file that represents the menu entry must have a Categories= entry that lists one or more keywords\&. The menu item will be included in an appropriate submenu based on the included keywords\&.
+-.sp
+-To add menu items to a new submenu the desktop\-files must be preceded by a directory\-file that describes the submenu\&. If multiple desktop\-files are specified, all entries will be added to the same menu\&. If entries are installed to a menu that has been created with a previous call to
+-\fBxdg\-desktop\-menu\fR
+-the entries will be installed in addition to any already existing entries\&.
+-.sp
+-\fIdirectory\-file\fR: The *\&.directory file indicated by
+-\fIdirectory\-file\fR
+-represents a submenu\&. The directory file provides the name and icon for a submenu\&. The name of the directory file is used to identify the submenu\&.
+-.sp
+-If multiple directory files are provided each file will represent a submenu within the menu that preceeds it, creating a nested menu hierarchy (sub\-sub\-menus)\&. The menu entries themselves will be added to the last submenu\&.
+-.sp
+-Directory files follow the syntax defined by the freedesktop\&.org Desktop Entry Specification\&.
+-.RE
+-.PP
+-uninstall
+-.RS 4
+-Remove applications or submenus from the desktop menu system previously installed with
+-\fBxdg\-desktop\-menu install\fR\&.
+-.sp
+-A submenu and the associated directory file is only removed when the submenu no longer contains any menu entries\&.
+-.RE
+-.PP
+-forceupdate
+-.RS 4
+-Force an update of the menu system\&.
+-.sp
+-This command is only useful if the last call to xdg\-desktop\-menu included the
+-\fB\-\-noupdate\fR
+-option\&.
+-.RE
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-noupdate\fR
+-.RS 4
+-Postpone updating the menu system\&. If multiple updates to the menu system are made in sequence this flag can be used to indicate that additional changes will follow and that it is not necassery to update the menu system right away\&.
+-.RE
+-.PP
+-\fB\-\-novendor\fR
+-.RS 4
+-Normally, xdg\-desktop\-menu checks to ensure that any *\&.directory and *\&.desktop files to be installed has a vendor prefix\&. This option can be used to disable that check\&.
+-.sp
+-A vendor prefix consists of alpha characters ([a\-zA\-Z]) and is terminated with a dash ("\-")\&. Companies and organizations are encouraged to use a word or phrase, preferably the organizations name, for which they hold a trademark as their vendor prefix\&. The purpose of the vendor prefix is to prevent name conflicts\&.
+-.RE
+-.PP
+-\fB\-\-mode\fR \fImode\fR
+-.RS 4
+-\fImode\fR
+-can be
+-\fIuser\fR
+-or
+-\fIsystem\fR\&. In user mode the file is (un)installed for the current user only\&. In system mode the file is (un)installed for all users on the system\&. Usually only root is allowed to install in system mode\&.
+-.sp
+-The default is to use system mode when called by root and to use user mode when called by a non\-root user\&.
+-.RE
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "DESKTOP FILES"
+-.PP
+-An application item in the application menu is represented by a *\&.desktop file\&. A *\&.desktop file consists of a
+-\fI[Desktop Entry]\fR
+-header followed by several
+-\fIKey\fR=\fIValue\fR
+-lines\&.
+-.PP
+-A *\&.desktop file can provide a name and description for an application in several different languages\&. This is done by adding a language code as used by LC_MESSAGES in square brackets behind the
+-\fIKey\fR\&. This way one can specify different values for the same
+-\fIKey\fR
+-depending on the currently selected language\&.
+-.PP
+-The following keys are often used:
+-.PP
+-Value=1\&.0
+-.RS 4
+-This is a mandatory field to indicate that the *\&.desktop file follows the 1\&.0 version of the specification\&.
+-.RE
+-.PP
+-Type=Application
+-.RS 4
+-This is a mandatory field that indicates that the *\&.desktop file describes an application launcher\&.
+-.RE
+-.PP
+-Name=\fIApplication Name\fR
+-.RS 4
+-The name of the application\&. For example
+-\fIMozilla\fR
+-.RE
+-.PP
+-GenericName=\fIGeneric Name\fR
+-.RS 4
+-A generic description of the application\&. For example
+-\fIWeb Browser\fR
+-.RE
+-.PP
+-Comment=\fIComment\fR
+-.RS 4
+-Optional field to specify a tooltip for the application\&. For example
+-\fIVisit websites on the Internet\fR
+-.RE
+-.PP
+-Icon=\fIIcon File\fR
+-.RS 4
+-The icon to use for the application\&. This can either be an absolute path to an image file or an icon\-name\&. If an icon\-name is provided an image lookup by name is done in the user\*(Aqs current icon theme\&. The
+-\fBxdg\-icon\-resource\fR
+-command can be used to install image files into icon themes\&. The advantage of using an icon\-name instead of an absolute path is that with an icon\-name the application icon can be provided in several different sizes as well as in several differently themed styles\&.
+-.RE
+-.PP
+-Exec=\fICommand Line\fR
+-.RS 4
+-The command line to start the application\&. If the application can open files the %f placeholder should be specified\&. When a file is dropped on the application launcher the %f is replaced with the file path of the dropped file\&. If multiple files can be specified on the command line the %F placeholder should be used instead of %f\&. If the application is able to open URLs in addition to local files then %u or %U can be used instead of %f or %F\&.
+-.RE
+-.PP
+-Categories=\fICategories\fR
+-.RS 4
+-A list of categories separated by semi\-colons\&. A category is a keyword that describes and classifies the application\&. By default applications are organized in the application menu based on category\&. When menu entries are explicitly assigned to a new submenu it is not necassery to list any categories\&.
+-.sp
+-When using categories it is recommended to include one of the following categories: AudioVideo, Development, Education, Game, Graphics, Network, Office, Settings, System, Utility\&.
+-.sp
+-See Appendix A of the XDG Desktop Menu Specification for information about additional categories\&. http://standards\&.freedesktop\&.org/menu\-spec/menu\-spec\-1\&.0\&.html
+-.RE
+-.PP
+-MimeType=\fIMimetypes\fR
+-.RS 4
+-A list of mimetypes separated by semi\-colons\&. This field is used to indicate which file types the application is able to open\&.
+-.RE
+-.PP
+-For a complete oveview of the *\&.desktop file format please visit http://www\&.freedesktop\&.org/wiki/Standards/desktop\-entry\-spec
+-.SH "DIRECTORY FILES"
+-.PP
+-The appearance of submenu in the application menu is provided by a *\&.directory file\&. In particular it provides the title of the submenu and a possible icon\&. A *\&.directory file consists of a
+-\fI[Desktop Entry]\fR
+-header followed by several
+-\fIKey\fR=\fIValue\fR
+-lines\&.
+-.PP
+-A *\&.directory file can provide a title (name) for the submenu in several different languages\&. This is done by adding a language code as used by LC_MESSAGES in square brackets behind the
+-\fIKey\fR\&. This way one can specify different values for the same
+-\fIKey\fR
+-depending on the currently selected language\&.
+-.PP
+-The following keys are relevqnt for submenus:
+-.PP
+-Value=1\&.0
+-.RS 4
+-This is a mandatory field to indicate that the *\&.directory file follows the 1\&.0 version of the Desktop Entry specification\&.
+-.RE
+-.PP
+-Type=Directory
+-.RS 4
+-This is a mandatory field that indicates that the *\&.directory file describes a submenu\&.
+-.RE
+-.PP
+-Name=\fIMenu Name\fR
+-.RS 4
+-The title of submenu\&. For example
+-\fIMozilla\fR
+-.RE
+-.PP
+-Comment=\fIComment\fR
+-.RS 4
+-Optional field to specify a tooltip for the submenu\&.
+-.RE
+-.PP
+-Icon=\fIIcon File\fR
+-.RS 4
+-The icon to use for the submenu\&. This can either be an absolute path to an image file or an icon\-name\&. If an icon\-name is provided an image lookup by name is done in the user\*(Aqs current icon theme\&. The
+-\fBxdg\-icon\-resource\fR
+-command can be used to install image files into icon themes\&. The advantage of using an icon\-name instead of an absolute path is that with an icon\-name the submenu icon can be provided in several different sizes as well as in several differently themed styles\&.
+-.RE
+-.SH "ENVIRONMENT VARIABLES"
+-.PP
+-xdg\-desktop\-menu honours the following environment variables:
+-.PP
+-XDG_UTILS_DEBUG_LEVEL
+-.RS 4
+-Setting this environment variable to a non\-zero numerical value makes xdg\-desktop\-menu do more verbose reporting on stderr\&. Setting a higher value increases the verbosity\&.
+-.RE
+-.PP
+-XDG_UTILS_INSTALL_MODE
+-.RS 4
+-This environment variable can be used by the user or administrator to override the installation mode\&. Valid values are
+-\fIuser\fR
+-and
+-\fIsystem\fR\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.PP
+-\fB5\fR
+-.RS 4
+-No permission to read one of the files passed on the command line\&.
+-.RE
+-.SH "SEE ALSO"
+-.PP
+-\fBxdg-desktop-icon\fR(1),
+-\fBxdg-icon-resource\fR(1),
+-\fBxdg-mime\fR(1)
+-.SH "EXAMPLES"
+-.PP
+-The company ShinyThings Inc\&. has developed an application named "WebMirror" and would like to add it to the application menu\&. The company will use "shinythings" as its vendor id\&. In order to add the application to the menu there needs to be a \&.desktop file with a suitable
+-\fICategories\fR
+-entry:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-shinythings\-webmirror\&.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF\-8
+-  Type=Application
+-
+-  Exec=webmirror
+-  Icon=webmirror
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-
+-  Categories=Network;WebDevelopment;
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Now the xdg\-desktop\-menu tool can be used to add the shinythings\-webmirror\&.desktop file to the desktop application menu:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-desktop\-menu install \&./shinythings\-webmirror\&.desktop
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Note that for the purpose of this example the menu items are available in two languages, English and Dutch\&. The language code for Dutch is nl\&.
+-.PP
+-In the next example the company ShinyThings Inc\&. will add its own submenu to the desktop application menu consisting of a "WebMirror" menu item and a "WebMirror Admin Tool" menu item\&.
+-.PP
+-First the company needs to create two \&.desktop files that describe the two menu items\&. Since the items are to be added to a new submenu it is not necassery to include a Categories= line:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-shinythings\-webmirror\&.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF\-8
+-  Type=Application
+-
+-  Exec=webmirror
+-  Icon=shinythings\-webmirror
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-
+-
+-shinythings\-webmirror\-admin\&.desktop:
+-
+-  [Desktop Entry]
+-  Encoding=UTF\-8
+-  Type=Application
+-
+-  Exec=webmirror\-admintool
+-  Icon=shinythings\-webmirror\-admintool
+-
+-  Name=WebMirror Admin Tool
+-  Name[nl]=WebSpiegel Administratie Tool
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-In addition a \&.directory file needs to be created to provide a title and icon for the sub\-menu itself:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-shinythings\-webmirror\&.directory:
+-
+-  [Desktop Entry]
+-  Encoding=UTF\-8
+-
+-  Icon=shinythings\-webmirror\-menu
+-
+-  Name=WebMirror
+-  Name[nl]=WebSpiegel
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-These file can now be installed with:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-desktop\-menu install \&./shinythings\-webmirror\&.directory \e
+-      \&./shinythings\-webmirror\&.desktop \&./shinythings\-webmirror\-admin\&.desktop
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-The menu entries could also be installed one by one:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-desktop\-menu install \-\-noupdate \&./shinythings\-webmirror\&.directory \e
+-      \&./shinythings\-webmirror\&.desktop
+-xdg\-desktop\-menu install \-\-noupdate \&./shinythings\-webmirror\&.directory \e
+-      \&./shinythings\-webmirror\-admin\&.desktop
+-xdg\-desktop\-menu forceupdate
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Although the result is the same it is slightly more efficient to install all files at the same time\&.
+-.PP
+-The *\&.desktop and *\&.directory files reference icons with the names webmirror, webmirror\-admin and webmirror\-menu which should also be installed\&. In this example the icons are installed in two different sizes, once with a size of 22x22 pixels and once with a size of 64x64 pixels:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-icon\-resource install \-\-size 22 \&./wmicon\-22\&.png shinythings\-webmirror
+-xdg\-icon\-resource install \-\-size 22 \&./wmicon\-menu\-22\&.png shinythings\-webmirror\-menu
+-xdg\-icon\-resource install \-\-size 22 \&./wmicon\-admin\-22\&.png shinythings\-webmirror\-admin
+-xdg\-icon\-resource install \-\-size 64 \&./wmicon\-64\&.png shinythings\-webmirror
+-xdg\-icon\-resource install \-\-size 64 \&./wmicon\-menu\-64\&.png shinythings\-webmirror\-menu
+-xdg\-icon\-resource install \-\-size 64 \&./wmicon\-admin\-64\&.png shinythings\-webmirror\-admin
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-.SH "AUTHORS"
+-.PP
+-\fBKevin Krammer\fR
+-.RS 4
+-Author.
+-.RE
+-.PP
+-\fBJeremy White\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-email.1 b/scripts/man/xdg-email.1
+deleted file mode 100644
+index 09d1709..0000000
+--- a/scripts/man/xdg-email.1
++++ /dev/null
+@@ -1,199 +0,0 @@
+-'\" t
+-.\"     Title: xdg-email
+-.\"    Author: Kevin Krammer
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-email Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-EMAIL" "1" "12/31/2010" "xdg-utils 1.0" "xdg-email Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-email \- command line tool for sending mail using the user\*(Aqs preferred e\-mail composer
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-email\fR\ 'u
+-\fBxdg\-email\fR [\fB\-\-utf8\fR] [\fB\-\-cc\fR\ \fIaddress\fR] [\fB\-\-bcc\fR\ \fIaddress\fR] [\fB\-\-subject\fR\ \fItext\fR] [\fB\-\-body\fR\ \fItext\fR] [\fB\-\-attach\fR\ \fIfile\fR] [\fImailto\-uri\fR | \fIaddress(es)\fR]
+-.HP \w'\fBxdg\-email\fR\ 'u
+-\fBxdg\-email\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-xdg\-email opens the user\*(Aqs preferred e\-mail composer in order to send a mail to
+-\fIaddress(es)\fR
+-or
+-\fImailto\-uri\fR\&. RFC2368 defines mailto: URIs\&. xdg\-email limits support to, cc, subject and body fields in
+-\fImailto\-uri\fR, all other fields are silently ignored\&.
+-\fIaddress(es)\fR
+-must follow the syntax of RFC822\&. Multiple addresses may be provided as separate arguments\&.
+-.PP
+-All information provided on the command line is used to prefill corresponding fields in the user\*(Aqs e\-mail composer\&. The user will have the opportunity to change any of this information before actually sending the e\-mail\&.
+-.PP
+-xdg\-email is for use inside a desktop session only\&. It is not recommended to use xdg\-email as root\&.
+-.PP
+-See http://portland\&.freedesktop\&.org/EmailConfig for information on how the user can change the e\-mail composer that is used\&.
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-utf8\fR
+-.RS 4
+-Indicates that all command line options that follow are in utf8\&. Without this option, command line options are expected to be encoded according to locale\&. If the locale already specifies utf8 this option has no effect\&. This option does not affect mailto URIs that are passed on the command line\&.
+-.RE
+-.PP
+-\fB\-\-cc\fR \fIaddress\fR
+-.RS 4
+-Specify a recipient to be copied on the e\-mail\&.
+-.RE
+-.PP
+-\fB\-\-bcc\fR \fIaddress\fR
+-.RS 4
+-Specify a recipient to be blindly copied on the e\-mail\&.
+-.RE
+-.PP
+-\fB\-\-subject\fR \fItext\fR
+-.RS 4
+-Specify a subject for the e\-mail\&.
+-.RE
+-.PP
+-\fB\-\-body\fR \fItext\fR
+-.RS 4
+-Specify a body for the e\-mail\&. Since the user will be able to make changes before actually sending the e\-mail, this can be used to provide the user with a template for the e\-mail\&.
+-\fItext\fR
+-may contain linebreaks\&.
+-.RE
+-.PP
+-\fB\-\-attach\fR \fIfile\fR
+-.RS 4
+-Specify an attachment for the e\-mail\&.
+-\fIfile\fR
+-must point to an existing file\&.
+-.sp
+-Some e\-mail applications require the file to remain present after xdg\-email returns\&.
+-.RE
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "ENVIRONMENT VARIABLES"
+-.PP
+-xdg\-email honours the following environment variables:
+-.PP
+-XDG_UTILS_DEBUG_LEVEL
+-.RS 4
+-Setting this environment variable to a non\-zero numerical value makes xdg\-email do more verbose reporting on stderr\&. Setting a higher value increases the verbosity\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.PP
+-\fB5\fR
+-.RS 4
+-No permission to read one of the files passed on the command line\&.
+-.RE
+-.SH "CONFIGURATION"
+-.PP
+-Visit http://portland\&.freedesktop\&.org/EmailConfig for information how to configure xdg\-email to use the email client of your choice\&.
+-.SH "EXAMPLES"
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-email \*(AqJeremy White <jwhite at example\&.com>\*(Aq
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-email \-\-attach /tmp/logo\&.png \e
+-          \-\-subject \*(AqLogo contest\*(Aq \e
+-          \-\-body \*(AqAttached you find the logo for the contest\&.\*(Aq \e
+-          \*(Aqjwhite at example\&.com\*(Aq
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-email \-\-subject \*(AqYour password is about to expire\*(Aq \e
+-          \*(Aqjwhite at example\&.com\*(Aq \*(Aqbastian at example\&.com\*(Aq \*(Aqwhipple at example\&.com\*(Aq
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-.SH "AUTHORS"
+-.PP
+-\fBKevin Krammer\fR
+-.RS 4
+-Author.
+-.RE
+-.PP
+-\fBJeremy White\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-icon-resource.1 b/scripts/man/xdg-icon-resource.1
+deleted file mode 100644
+index 283b903..0000000
+--- a/scripts/man/xdg-icon-resource.1
++++ /dev/null
+@@ -1,244 +0,0 @@
+-'\" t
+-.\"     Title: xdg-icon-resource
+-.\"    Author: Kevin Krammer
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-icon-resource Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-ICON\-RESOURCE" "1" "12/31/2010" "xdg-utils 1.0" "xdg-icon-resource Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-icon-resource \- command line tool for (un)installing icon resources
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-icon\-resource\fR\ 'u
+-\fBxdg\-icon\-resource\fR install [\fB\-\-noupdate\fR] [\fB\-\-novendor\fR] [\fB\-\-theme\ \fR\fB\fItheme\fR\fR] [\fB\-\-context\ \fR\fB\fIcontext\fR\fR] [\fB\-\-mode\ \fR\fB\fImode\fR\fR] \fB\-\-size\ \fR\fB\fIsize\fR\fR \fIicon\-file\fR [\fIicon\-name\fR]
+-.HP \w'\fBxdg\-icon\-resource\fR\ 'u
+-\fBxdg\-icon\-resource\fR uninstall [\fB\-\-noupdate\fR] [\fB\-\-theme\ \fR\fB\fItheme\fR\fR] [\fB\-\-context\ \fR\fB\fIcontext\fR\fR] [\fB\-\-mode\ \fR\fB\fImode\fR\fR] \fB\-\-size\ \fR\fB\fIsize\fR\fR \fIicon\-name\fR
+-.HP \w'\fBxdg\-icon\-resource\fR\ 'u
+-\fBxdg\-icon\-resource\fR forceupdate [\fB\-\-theme\ \fR\fB\fItheme\fR\fR] [\fB\-\-mode\ \fR\fB\fImode\fR\fR]
+-.HP \w'\fBxdg\-icon\-resource\fR\ 'u
+-\fBxdg\-icon\-resource\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-The xdg\-icon\-resource program can be used to install icon resources into the desktop icon system in order to illustrate menu entries, to depict desktop icons or to graphically represent file types\&.
+-.PP
+-The desktop icon system identifies icons by name\&. Depending on the required size, the choice of icon theme and the context in which the icon is used, the desktop icon system locates an appropriate icon resource to depict an icon\&. Icon resources can be XPM files or PNG files\&.
+-.PP
+-The desktop icon system works according to the XDG Icon Theme Specification at http://www\&.freedesktop\&.org/Standards/icon\-theme\-spec
+-.SH "COMMANDS"
+-.PP
+-install
+-.RS 4
+-Installs the icon file indicated by
+-\fIicon\-file\fR
+-to the desktop icon system under the name
+-\fIicon\-name\fR\&. Icon names do not have an extension\&. If
+-\fIicon\-name\fR
+-is not provided the name is derived from
+-\fIicon\-file\fR\&. The icon file must have
+-\fI\&.png\fR
+-or
+-\fI\&.xpm\fR
+-as extension\&. If a corresponding
+-\fI\&.icon\fR
+-file exists in the same location as
+-\fIicon\-file\fR
+-it will be installed as well\&.
+-.RE
+-.PP
+-uninstall
+-.RS 4
+-Removes the icon indicated by
+-\fIicon\-name\fR
+-from the desktop icon system\&. Note that icon names do not have an extension\&.
+-.RE
+-.PP
+-forceupdate
+-.RS 4
+-Force an update of the desktop icon system\&. This is only useful if the last call to xdg\-icon\-resource included the
+-\fB\-\-noupdate\fR
+-option\&.
+-.RE
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-noupdate\fR
+-.RS 4
+-Postpone updating the desktop icon system\&. If multiple icons are added in sequence this flag can be used to indicate that additional changes will follow and that it is not necassery to update the desktop icon system right away\&.
+-.RE
+-.PP
+-\fB\-\-novendor\fR
+-.RS 4
+-Normally, xdg\-icon\-resource checks to ensure that an icon file to be installed in the
+-\fIapps\fR
+-context has a proper vendor prefix\&. This option can be used to disable that check\&.
+-.sp
+-A vendor prefix consists of alpha characters ([a\-zA\-Z]) and is terminated with a dash ("\-")\&. Companies and organizations are encouraged to use a word or phrase, preferably the organizations name, for which they hold a trademark as their vendor prefix\&. The purpose of the vendor prefix is to prevent name conflicts\&.
+-.RE
+-.PP
+-\fB\-\-theme\fR \fItheme\fR
+-.RS 4
+-Installs or removes the icon file as part of
+-\fItheme\fR\&. If no theme is specified the icons will be installed as part of the default
+-\fIhicolor\fR
+-theme\&. Applications may install icons under multiple themes but should at least install icons for the default
+-\fIhicolor\fR
+-theme\&.
+-.RE
+-.PP
+-\fB\-\-context\fR \fIcontext\fR
+-.RS 4
+-Specifies the context for the icon\&. Icons to be used in the application menu and as desktop icon should use
+-\fIapps\fR
+-as context which is the default context\&. Icons to be used as file icons should use
+-\fImimetypes\fR
+-as context\&. Other common contexts are
+-\fIactions\fR,
+-\fIdevices\fR,
+-\fIemblems\fR,
+-\fIfilesystems\fR
+-and
+-\fIstock\fR\&.
+-.RE
+-.PP
+-\fB\-\-size\fR \fIsize\fR
+-.RS 4
+-Specifies the size of the icon\&. All icons must be square\&. Common sizes for icons in the apps context are: 16, 22, 32, 48, 64 and 128\&. Common sizes for icons in the mimetypes context are: 16, 22, 32, 48, 64 and 128
+-.RE
+-.PP
+-\fB\-\-mode\fR \fImode\fR
+-.RS 4
+-\fImode\fR
+-can be
+-\fIuser\fR
+-or
+-\fIsystem\fR\&. In user mode the file is (un)installed for the current user only\&. In system mode the file is (un)installed for all users on the system\&. Usually only root is allowed to install in system mode\&.
+-.sp
+-The default is to use system mode when called by root and to use user mode when called by a non\-root user\&.
+-.RE
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "ENVIRONMENT VARIABLES"
+-.PP
+-xdg\-icon\-resource honours the following environment variables:
+-.PP
+-XDG_UTILS_DEBUG_LEVEL
+-.RS 4
+-Setting this environment variable to a non\-zero numerical value makes xdg\-icon\-resource do more verbose reporting on stderr\&. Setting a higher value increases the verbosity\&.
+-.RE
+-.PP
+-XDG_UTILS_INSTALL_MODE
+-.RS 4
+-This environment variable can be used by the user or administrator to override the installation mode\&. Valid values are
+-\fIuser\fR
+-and
+-\fIsystem\fR\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.PP
+-\fB5\fR
+-.RS 4
+-No permission to read one of the files passed on the command line\&.
+-.RE
+-.SH "SEE ALSO"
+-.PP
+-\fBxdg-desktop-icon\fR(1),
+-\fBxdg-desktop-menu\fR(1),
+-\fBxdg-mime\fR(1)
+-.SH "EXAMPLES"
+-.PP
+-To install an icon resource to depict a launcher for the application myfoobar, the company ShinyThings Inc\&. can use:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-icon\-resource install \-\-size 64 shinythings\-myfoobar\&.png
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-To install an icon for a new application/x\-foobar file type one can use:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-icon\-resource install \-\-context mimetypes \-\-size 48 \&./mime\-foobar\-48\&.png application\-x\-foobar
+-xdg\-icon\-resource install \-\-context mimetypes \-\-size 64 \&./mime\-foobar\-64\&.png application\-x\-foobar
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-This will install two icons with the name application\-x\-foobar but with different sizes\&.
+-.SH "AUTHORS"
+-.PP
+-\fBKevin Krammer\fR
+-.RS 4
+-Author.
+-.RE
+-.PP
+-\fBJeremy White\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-mime.1 b/scripts/man/xdg-mime.1
+deleted file mode 100644
+index 50811e4..0000000
+--- a/scripts/man/xdg-mime.1
++++ /dev/null
+@@ -1,286 +0,0 @@
+-'\" t
+-.\"     Title: xdg-mime
+-.\"    Author: Kevin Krammer
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-mime Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-MIME" "1" "12/31/2010" "xdg-utils 1.0" "xdg-mime Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-mime \- command line tool for querying information about file type handling and adding descriptions for new file types
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-mime\fR\ 'u
+-\fBxdg\-mime\fR query {filetype | default} \&.\&.\&.
+-.HP \w'\fBxdg\-mime\fR\ 'u
+-\fBxdg\-mime\fR default \fIapplication\fR \fImimetype(s)\fR
+-.HP \w'\fBxdg\-mime\fR\ 'u
+-\fBxdg\-mime\fR install [\fB\-\-mode\ \fR\fB\fImode\fR\fR] [\fB\-\-novendor\fR] \fImimetypes\-file\fR
+-.HP \w'\fBxdg\-mime\fR\ 'u
+-\fBxdg\-mime\fR uninstall [\fB\-\-mode\ \fR\fB\fImode\fR\fR] \fImimetypes\-file\fR
+-.HP \w'\fBxdg\-mime\fR\ 'u
+-\fBxdg\-mime\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-The xdg\-mime program can be used to query information about file types and to add descriptions for new file types\&.
+-.SH "COMMANDS"
+-.PP
+-query
+-.RS 4
+-Returns information related to file types\&.
+-.sp
+-The
+-\fIquery\fR
+-option is for use inside a desktop session only\&. It is not recommended to use xdg\-mime query as root\&.
+-.sp
+-The following queries are supported:
+-.sp
+-query filetype
+-\fIFILE\fR: Returns the file type of
+-\fIFILE\fR
+-in the form of a MIME type\&.
+-.sp
+-query default
+-\fImimetype\fR: Returns the default application that the desktop environment uses for opening files of type
+-\fImimetype\fR\&. The default application is identified by its *\&.desktop file\&.
+-.RE
+-.PP
+-default
+-.RS 4
+-Ask the desktop environment to make
+-\fIapplication\fR
+-the default application for opening files of type
+-\fImimetype\fR\&. An application can be made the default for several file types by specifying multiple mimetypes\&.
+-.sp
+-
+-\fIapplication\fR
+-is the desktop file id of the application and has the form vendor\-name\&.desktop
+-\fIapplication\fR
+-must already be installed in the desktop menu before it can be made the default handler\&. The aplication\*(Aqs desktop file must list support for all the MIME types that it wishes to be the default handler for\&.
+-.sp
+-Requests to make an application a default handler may be subject to system policy or approval by the end\-user\&. xdg\-mime query can be used to verify whether an application is the actual default handler for a specific file type\&.
+-.sp
+-The
+-\fIdefault\fR
+-option is for use inside a desktop session only\&. It is not recommended to use xdg\-mime default as root\&.
+-.RE
+-.PP
+-install
+-.RS 4
+-Adds the file type descriptions provided in
+-\fImimetypes\-file\fR
+-to the desktop environment\&.
+-\fImimetypes\-file\fR
+-must be a XML file that follows the freedesktop\&.org Shared MIME\-info Database specification and that has a mime\-info element as its document root\&. For each new file type one or more icons with name
+-\fItype\fR\-\fIsubtype\fR
+-must be installed with the
+-\fBxdg\-icon\-resource\fR
+-command in the
+-\fImimetypes\fR
+-context\&. For example the filetype application/vnd\&.oasis\&.opendocument\&.text requires an icon named application\-vnd\&.oasis\&.opendocument\&.text to be installed (unless the file type recommends another icon name)\&.
+-.RE
+-.PP
+-uninstall
+-.RS 4
+-Removes the file type descriptions provided in
+-\fImimetypes\-file\fR
+-and previously added with
+-\fBxdg\-mime install\fR
+-from the desktop environment\&.
+-\fImimetypes\-file\fR
+-must be a XML file that follows the freedesktop\&.org Shared MIME\-info Database specification and that has a mime\-info element as its document root\&.
+-.RE
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-mode\fR \fImode\fR
+-.RS 4
+-\fImode\fR
+-can be
+-\fIuser\fR
+-or
+-\fIsystem\fR\&. In user mode the file is (un)installed for the current user only\&. In system mode the file is (un)installed for all users on the system\&. Usually only root is allowed to install in system mode\&.
+-.sp
+-The default is to use system mode when called by root and to use user mode when called by a non\-root user\&.
+-.RE
+-.PP
+-\fB\-\-novendor\fR
+-.RS 4
+-Normally, xdg\-mime checks to ensure that the
+-\fImimetypes\-file\fR
+-to be installed has a proper vendor prefix\&. This option can be used to disable that check\&.
+-.sp
+-A vendor prefix consists of alpha characters ([a\-zA\-Z]) and is terminated with a dash ("\-")\&. Companies and organizations are encouraged to use a word or phrase, preferably the organizations name, for which they hold a trademark as their vendor prefix\&. The purpose of the vendor prefix is to prevent name conflicts\&.
+-.RE
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "ENVIRONMENT VARIABLES"
+-.PP
+-xdg\-mime honours the following environment variables:
+-.PP
+-XDG_UTILS_DEBUG_LEVEL
+-.RS 4
+-Setting this environment variable to a non\-zero numerical value makes xdg\-mime do more verbose reporting on stderr\&. Setting a higher value increases the verbosity\&.
+-.RE
+-.PP
+-XDG_UTILS_INSTALL_MODE
+-.RS 4
+-This environment variable can be used by the user or administrator to override the installation mode\&. Valid values are
+-\fIuser\fR
+-and
+-\fIsystem\fR\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.PP
+-\fB5\fR
+-.RS 4
+-No permission to read one of the files passed on the command line\&.
+-.RE
+-.SH "SEE ALSO"
+-.PP
+-\fBxdg-icon-resource\fR(1),
+-\fBxdg-desktop-menu\fR(1)
+-.SH "EXAMPLES"
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-mime query filetype /tmp/foobar\&.png
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-Prints the MIME type of the file /tmp/foobar\&.png, in this case image/png
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-mime query default image/png
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-Prints the \&.desktop filename of the application which is registered to open PNG files\&.
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-mime install shinythings\-shiny\&.xml
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-Adds a file type description for "shiny"\-files\&. "shinythings\-" is used as the vendor prefix\&. The file type description could look as folows\&.
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-shinythings\-shiny\&.xml:
+-
+-<?xml version="1\&.0"?>
+-<mime\-info xmlns=\*(Aqhttp://www\&.freedesktop\&.org/standards/shared\-mime\-info\*(Aq>
+-  <mime\-type type="text/x\-shiny">
+-    <comment>Shiny new file type</comment>
+-    <glob pattern="*\&.shiny"/>
+-    <glob pattern="*\&.shi"/>
+-  </mime\-type>
+-</mime\-info>
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-An icon for this new file type must also be installed, for example with:
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-icon\-resource install \-\-context mimetypes \-\-size 64 shiny\-file\-icon\&.png text\-x\-shiny
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-.SH "AUTHORS"
+-.PP
+-\fBKevin Krammer\fR
+-.RS 4
+-Author.
+-.RE
+-.PP
+-\fBJeremy White\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-open.1 b/scripts/man/xdg-open.1
+deleted file mode 100644
+index 984c58c..0000000
+--- a/scripts/man/xdg-open.1
++++ /dev/null
+@@ -1,124 +0,0 @@
+-'\" t
+-.\"     Title: xdg-open
+-.\"    Author: Kevin Krammer
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-open Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-OPEN" "1" "12/31/2010" "xdg-utils 1.0" "xdg-open Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-open \- opens a file or URL in the user\*(Aqs preferred application
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-open\fR\ 'u
+-\fBxdg\-open\fR {\fB\fIfile\fR\fR | \fB\fIURL\fR\fR}
+-.HP \w'\fBxdg\-open\fR\ 'u
+-\fBxdg\-open\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-xdg\-open opens a file or URL in the user\*(Aqs preferred application\&. If a URL is provided the URL will be opened in the user\*(Aqs preferred web browser\&. If a file is provided the file will be opened in the preferred application for files of that type\&. xdg\-open supports file, ftp, http and https URLs\&.
+-.PP
+-xdg\-open is for use inside a desktop session only\&. It is not recommended to use xdg\-open as root\&.
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.SH "EXAMPLES"
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-open \*(Aqhttp://www\&.freedesktop\&.org/\*(Aq
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-Opens the Freedesktop\&.org website in the user\*(Aqs default browser
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-open /tmp/foobar\&.png
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-Opens the PNG image file /tmp/foobar\&.png in the user\*(Aqs default image viewing application\&.
+-.SH "AUTHORS"
+-.PP
+-\fBKevin Krammer\fR
+-.RS 4
+-Author.
+-.RE
+-.PP
+-\fBJeremy White\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-screensaver.1 b/scripts/man/xdg-screensaver.1
+deleted file mode 100644
+index dc68409..0000000
+--- a/scripts/man/xdg-screensaver.1
++++ /dev/null
+@@ -1,154 +0,0 @@
+-'\" t
+-.\"     Title: xdg-screensaver
+-.\"    Author: Bryce Harrington
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 12/31/2010
+-.\"    Manual: xdg-screensaver Manual
+-.\"    Source: xdg-utils 1.0
+-.\"  Language: English
+-.\"
+-.TH "XDG\-SCREENSAVER" "1" "12/31/2010" "xdg-utils 1.0" "xdg-screensaver Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-screensaver \- command line tool for controlling the screensaver
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-screensaver\fR\ 'u
+-\fBxdg\-screensaver\fR \fBsuspend\ \fR\fB\fIWindowID\fR\fR
+-.HP \w'\fBxdg\-screensaver\fR\ 'u
+-\fBxdg\-screensaver\fR \fBresume\ \fR\fB\fIWindowID\fR\fR
+-.HP \w'\fBxdg\-screensaver\fR\ 'u
+-\fBxdg\-screensaver\fR {\fBactivate\fR | \fBlock\fR | \fBreset\fR | \fBstatus\fR}
+-.HP \w'\fBxdg\-screensaver\fR\ 'u
+-\fBxdg\-screensaver\fR {\fB\-\-help\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-xdg\-screensaver provides commands to control the screensaver\&.
+-.PP
+-xdg\-screensaver is for use inside a desktop session only\&. It is not recommended to use xdg\-screensaver as root\&.
+-.SH "COMMANDS"
+-.PP
+-\fBsuspend \fR\fB\fIWindowID\fR\fR
+-.RS 4
+-Suspends the screensaver and monitor power management\&.
+-\fIWindowID\fR
+-must be the X Window ID of an existing window of the calling application\&. The window must remain in existance for the duration of the suspension\&.
+-.sp
+-WindowID can be represented as either a decimal number or as a hexadecimal number consisting of the prefix
+-\fI0x\fR
+-followed by one or more hexadecimal digits\&.
+-.sp
+-The screensaver can be suspended in relation to multiple windows at the same time\&. In that case screensaver operation is only restored once the screensaver has been resumed in relation to each of the windows
+-.RE
+-.PP
+-\fBresume \fR\fB\fIWindowID\fR\fR
+-.RS 4
+-Resume the screensaver and monitor power management after being suspended\&.
+-\fIWindowID\fR
+-must be the same X Window ID that was passed to a previous call of
+-\fBxdg\-screensaver suspend\fR
+-.RE
+-.PP
+-\fBactivate\fR
+-.RS 4
+-Turns the screensaver on immediately\&. This may result in the screen getting locked, depending on existing system policies\&.
+-.RE
+-.PP
+-\fBlock\fR
+-.RS 4
+-Lock the screen immediately\&.
+-.RE
+-.PP
+-\fBreset\fR
+-.RS 4
+-Turns the screensaver off immediately\&. If the screen was locked the user may be asked to authenticate first\&.
+-.RE
+-.PP
+-\fBstatus\fR
+-.RS 4
+-Prints
+-\fIenabled\fR
+-to stdout if the screensaver is enabled to turn on after a period of inactivity and prints
+-\fIdisabled\fR
+-if the screensaver is not enabled\&.
+-.RE
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.SH "EXAMPLES"
+-.PP
+-
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-xdg\-screensaver suspend 0x1c00007
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-Causes the screensaver to be disabled till
+-\fBxdg\-screensaver resume 0x1c00007\fR
+-is called\&.
+-\fI0x1c00007\fR
+-must be the X Window ID of an existing window\&.
+-.SH "AUTHOR"
+-.PP
+-\fBBryce Harrington\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2006
+-.br
+diff --git a/scripts/man/xdg-settings.1 b/scripts/man/xdg-settings.1
+deleted file mode 100644
+index d02fa2b..0000000
+--- a/scripts/man/xdg-settings.1
++++ /dev/null
+@@ -1,154 +0,0 @@
+-'\" t
+-.\"     Title: xdg-settings
+-.\"    Author: Mike Mammarella
+-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+-.\"      Date: 07/20/2011
+-.\"    Manual: xdg-settings Manual
+-.\"    Source: [FIXME: source]
+-.\"  Language: English
+-.\"
+-.TH "XDG\-SETTINGS" "1" "07/20/2011" "[FIXME: source]" "xdg-settings Manual"
+-.\" -----------------------------------------------------------------
+-.\" * Define some portability stuff
+-.\" -----------------------------------------------------------------
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.\" http://bugs.debian.org/507673
+-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\" -----------------------------------------------------------------
+-.\" * set default formatting
+-.\" -----------------------------------------------------------------
+-.\" disable hyphenation
+-.nh
+-.\" disable justification (adjust text to left margin only)
+-.ad l
+-.\" -----------------------------------------------------------------
+-.\" * MAIN CONTENT STARTS HERE *
+-.\" -----------------------------------------------------------------
+-.SH "NAME"
+-xdg-settings \- get various settings from the desktop environment
+-.SH "SYNOPSIS"
+-.HP \w'\fBxdg\-settings\fR\ 'u
+-\fBxdg\-settings\fR {\fB\fIget\fR\fR | \fB\fIcheck\fR\fR | \fB\fIset\fR\fR} {\fBproperty\fR} [\fBsubproperty\fR] [\fBvalue\fR]
+-.HP \w'\fBxdg\-settings\fR\ 'u
+-\fBxdg\-settings\fR {\fB\-\-help\fR | \fB\-\-list\fR | \fB\-\-manual\fR | \fB\-\-version\fR}
+-.SH "DESCRIPTION"
+-.PP
+-xdg\-settings gets various settings from the desktop environment\&. For instance, desktop environments often provide proxy configuration and default web browser settings\&. Using xdg\-settings these parameters can be extracted for use by applications that do not use the desktop environment\*(Aqs libraries (which would use the settings natively)\&.
+-.PP
+-xdg\-settings is for use inside a desktop session only\&. It is not recommended to use xdg\-settings as root\&.
+-.SH "OPTIONS"
+-.PP
+-\fB\-\-help\fR
+-.RS 4
+-Show command synopsis\&.
+-.RE
+-.PP
+-\fB\-\-list\fR
+-.RS 4
+-List all properties xdg\-settings knows about\&.
+-.RE
+-.PP
+-\fB\-\-manual\fR
+-.RS 4
+-Show this manualpage\&.
+-.RE
+-.PP
+-\fB\-\-version\fR
+-.RS 4
+-Show the xdg\-utils version information\&.
+-.RE
+-.SH "PROPERTIES"
+-.PP
+-When using xdg\-settings to get, check or set a destkop setting, properties and possibly sub\-properties are used to specify the setting to be changed\&.
+-.PP
+-Some properties (such as default\-web\-browser) fully describe the setting to be changed\&. Other properties (such as default\-url\-scheme\-handler) require more information (in this case the actual scheme to set the default handler for) which must be provided in a sub\-property\&.
+-.SH "EXIT CODES"
+-.PP
+-An exit code of 0 indicates success while a non\-zero exit code indicates failure\&. The following failure codes can be returned:
+-.PP
+-\fB1\fR
+-.RS 4
+-Error in command line syntax\&.
+-.RE
+-.PP
+-\fB2\fR
+-.RS 4
+-One of the files passed on the command line did not exist\&.
+-.RE
+-.PP
+-\fB3\fR
+-.RS 4
+-A required tool could not be found\&.
+-.RE
+-.PP
+-\fB4\fR
+-.RS 4
+-The action failed\&.
+-.RE
+-.SH "EXAMPLES"
+-.PP
+-Get the desktop file name of the current default web browser
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-        xdg\-settings get default\-web\-browser
+-      
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Check whether the default web browser is firefox\&.desktop, which can be false even if "get default\-web\-browser" says that is the current value (if only some of the underlying settings actually reflect that value)
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-        xdg\-settings check default\-web\-browser firefox\&.desktop
+-      
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Set the default web browser to google\-chrome\&.desktop
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-        xdg\-settings set default\-web\-browser google\-chrome\&.desktop
+-      
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.PP
+-Set the default mailto URL scheme handler to be evolution\&.desktop
+-.sp
+-.if n \{\
+-.RS 4
+-.\}
+-.nf
+-        xdg\-settings set default\-url\-scheme\-handler mailto evolution\&.desktop
+-      
+-.fi
+-.if n \{\
+-.RE
+-.\}
+-.sp
+-.SH "AUTHOR"
+-.PP
+-\fBMike Mammarella\fR
+-.RS 4
+-Author.
+-.RE
+-.SH "COPYRIGHT"
+-.br
+-Copyright \(co 2009-2011
+-.br
+-- 
+1.9.0
+
diff --git a/0006-all-re-generate-html-man-too.patch b/0006-all-re-generate-html-man-too.patch
new file mode 100644
index 0000000..7f4b6b0
--- /dev/null
+++ b/0006-all-re-generate-html-man-too.patch
@@ -0,0 +1,25 @@
+From 6da906f59933133612d006e1bff9918a2b8c5a60 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 7 Feb 2014 12:31:40 -0600
+Subject: [PATCH 6/9] all: (re)generate html/man too
+
+---
+ scripts/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/Makefile.in b/scripts/Makefile.in
+index f93dfd6..9a772bc 100644
+--- a/scripts/Makefile.in
++++ b/scripts/Makefile.in
+@@ -30,7 +30,7 @@ MANPAGES=	$(SCRIPTS:%=man/%.1)
+ WEBPAGES=	$(SCRIPTS:%=%.html)
+ XMLFILES=	$(SCRIPTS:%=desc/%.xml)
+ 
+-all:		scripts
++all:		html man scripts
+ 
+ html:		index.html $(WEBPAGES)
+ 
+-- 
+1.9.0
+
diff --git a/0007-drop-references-to-Value-1.0-key-BR74688.patch b/0007-drop-references-to-Value-1.0-key-BR74688.patch
new file mode 100644
index 0000000..9e07a6f
--- /dev/null
+++ b/0007-drop-references-to-Value-1.0-key-BR74688.patch
@@ -0,0 +1,70 @@
+From 50254545a0d2c181bf9bce4c7723044ee7186cb5 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Sat, 8 Feb 2014 12:39:43 -0600
+Subject: [PATCH 7/9] drop references to Value=1.0 key (BR74688)
+
+Can't find this decomented anywhere in current fdo specs.
+---
+ scripts/desc/xdg-desktop-icon.xml |  9 ---------
+ scripts/desc/xdg-desktop-menu.xml | 18 ------------------
+ 2 files changed, 27 deletions(-)
+
+diff --git a/scripts/desc/xdg-desktop-icon.xml b/scripts/desc/xdg-desktop-icon.xml
+index a886d5c..273045d 100644
+--- a/scripts/desc/xdg-desktop-icon.xml
++++ b/scripts/desc/xdg-desktop-icon.xml
+@@ -164,15 +164,6 @@
+       The following keys are often used:
+     </para>
+     <variablelist>
+-      <varlistentry>
+-	<term>Value=1.0</term>
+-	<listitem>
+-	  <simpara>
+-	    This is a mandatory field to indicate that the *.desktop file
+-	    follows the 1.0 version of the specification.
+-	  </simpara>
+-	</listitem>
+-      </varlistentry>
+ 
+       <varlistentry>
+ 	<term>Type=Application</term>
+diff --git a/scripts/desc/xdg-desktop-menu.xml b/scripts/desc/xdg-desktop-menu.xml
+index e7bda35..e3bab7c 100644
+--- a/scripts/desc/xdg-desktop-menu.xml
++++ b/scripts/desc/xdg-desktop-menu.xml
+@@ -262,15 +262,6 @@
+       The following keys are often used:
+     </para>
+     <variablelist>
+-      <varlistentry>
+-	<term>Value=1.0</term>
+-	<listitem>
+-	  <simpara>
+-	    This is a mandatory field to indicate that the *.desktop file
+-	    follows the 1.0 version of the specification.
+-	  </simpara>
+-	</listitem>
+-      </varlistentry>
+ 
+       <varlistentry>
+ 	<term>Type=Application</term>
+@@ -406,15 +397,6 @@
+       The following keys are relevant for submenus:
+     </para>
+     <variablelist>
+-      <varlistentry>
+-	<term>Value=1.0</term>
+-	<listitem>
+-	  <simpara>
+-	    This is a mandatory field to indicate that the *.directory file
+-	    follows the 1.0 version of the Desktop Entry specification.
+-	  </simpara>
+-	</listitem>
+-      </varlistentry>
+ 
+       <varlistentry>
+ 	<term>Type=Directory</term>
+-- 
+1.9.0
+
diff --git a/0008-xdg-open-Remove-first_word-already-in-common.patch b/0008-xdg-open-Remove-first_word-already-in-common.patch
new file mode 100644
index 0000000..68b3d52
--- /dev/null
+++ b/0008-xdg-open-Remove-first_word-already-in-common.patch
@@ -0,0 +1,29 @@
+From 3eaf93ab3303e14813885b6b743b48a1c3b5a6ab Mon Sep 17 00:00:00 2001
+From: Till Maas <opensource at till.name>
+Date: Wed, 26 Feb 2014 15:19:33 +0100
+Subject: [PATCH 8/9] xdg-open: Remove first_word, already in common
+
+---
+ scripts/xdg-open.in | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 87e161d..1f768d8 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -30,12 +30,6 @@ _USAGE
+ #@xdg-utils-common@
+ 
+ # This handles backslashes but not quote marks.
+-first_word()
+-{
+-    read first rest
+-    echo "$first"
+-}
+-
+ last_word()
+ {
+     read first rest
+-- 
+1.9.0
+
diff --git a/0009-xdg-open-Expand-i-and-c-from-Exec.patch b/0009-xdg-open-Expand-i-and-c-from-Exec.patch
new file mode 100644
index 0000000..80dbdf1
--- /dev/null
+++ b/0009-xdg-open-Expand-i-and-c-from-Exec.patch
@@ -0,0 +1,61 @@
+From 316b9adc05c6d871360afb1195939c5fc975ccff Mon Sep 17 00:00:00 2001
+From: Till Maas <opensource at till.name>
+Date: Wed, 26 Feb 2014 15:26:59 +0100
+Subject: [PATCH 9/9] xdg-open: Expand %i and %c from Exec
+
+---
+ scripts/xdg-open.in | 29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 1f768d8..e7a15a9 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -36,6 +36,17 @@ last_word()
+     echo "$rest"
+ }
+ 
++# Get the value of a key in a .desktop file.
++# Example: Use get_key foo.desktop Exec
++# to get the values of the Exec= key
++get_key()
++{
++    local file="${1}"
++    local key="${2}"
++
++    grep -E "^${key}=" "${file}" | cut -d= -f 2-
++}
++
+ open_darwin()
+ {
+     open "$1"
+@@ -137,11 +148,23 @@ search_desktop_file()
+     fi
+ 
+     if [ -r "$file" ] ; then
+-        command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
++        command="$(get_key "${file}" "Exec" | first_word)"
+         command_exec=`which $command 2>/dev/null`
+-        arguments="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | last_word`"
++        arguments="$(get_key "${file}" "Exec" | last_word)"
+         arg_one="`echo "$arg" | sed 's/[&*\\]/\\\\&/g'`"
+-        arguments_exec="`echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g'`"
++        icon="$(get_key "${file}" "Icon")"
++        if [ "${icon}" != "" ]
++        then
++            icon="--icon '${icon}'"
++        else
++            icon="''"
++        fi
++        # FIXME: Actually LC_MESSAGES should be used as described in
++        # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html
++        localised_name="'$(get_key "${file}" "Name")'"
++        arguments_exec="$(echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g' \
++                                                  -e 's*%i*'"$icon"'*g' \
++                                                  -e 's*%c*'"$localised_name"'*g')"
+ 
+         if [ -x "$command_exec" ] ; then
+             if echo "$arguments" | grep -iq '%[fFuU]' ; then
+-- 
+1.9.0
+
diff --git a/xdg-utils.spec b/xdg-utils.spec
index adc81b4..3b48b25 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -4,7 +4,7 @@
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.1.0
-Release: 0.20.%{pre}%{?dist}
+Release: 0.21.%{pre}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?pre:1}
@@ -14,10 +14,19 @@ Source1: xdg-utils-git_checkout.sh
 Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz
 %endif
 License: MIT 
-Group:   System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+## upstream patches
+Patch101: 0001-mention-xdg-settings.patch
+Patch102: 0002-Improvement-of-detecting-KDE-session-BR63157.patch
+Patch103: 0003-xdg-terminal-incompatible-.-BR44357.patch
+Patch104: 0004-remove-generated-html-files.patch
+Patch105: 0005-remove-generated-man-pages.patch
+Patch106: 0006-all-re-generate-html-man-too.patch
+Patch107: 0007-drop-references-to-Value-1.0-key-BR74688.patch
+Patch108: 0008-xdg-open-Remove-first_word-already-in-common.patch
+Patch109: 0009-xdg-open-Expand-i-and-c-from-Exec.patch
+
 BuildRequires: gawk
 BuildRequires: xmlto text-www-browser
 
@@ -49,7 +58,7 @@ The following scripts are provided at this time:
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
+%autosetup -Sgit -n %{name}-%{version}%{?pre:-%{pre}}
 
 
 %build
@@ -63,13 +72,10 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot}
 
 
 %files
-%defattr(-,root,root,-)
 %doc ChangeLog LICENSE README TODO
 %{_bindir}/xdg-desktop-icon
 %{_bindir}/xdg-desktop-menu
@@ -89,11 +95,12 @@ make install DESTDIR=%{buildroot}
 %{_mandir}/man1/xdg-settings.1*
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %changelog
+* Sun Mar 30 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-0.21.rc2
+- .spec housecleaning (remove deprecated stuff)
+- pull in latest upstream fixes, including...
+- xdg-open does not substitute all field codes in Exec key (#1056431, fdo#49204)
+
 * Fri Feb 07 2014 Rex Dieter <rdieter at fedoraproject.org> 1.1.0-0.20.rc2
 - 1.1.0-rc2
 


More information about the scm-commits mailing list