From f80509adb1134b2ba9bd22defe68b3281d627fae Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 03 2015 17:16:58 +0000 Subject: xdg-utils-1.1.0-rc3 --- diff --git a/.gitignore b/.gitignore index cf1bf02..133639c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xdg-utils-1.1.0-rc2.tar.gz +/xdg-utils-1.1.0-rc3.tar.gz diff --git a/0001-mention-xdg-settings.patch b/0001-mention-xdg-settings.patch deleted file mode 100644 index dbcfb66..0000000 --- a/0001-mention-xdg-settings.patch +++ /dev/null @@ -1,27 +0,0 @@ -From a983a14293129ea94b634579a46dc69835e88e15 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 7 Feb 2014 10:31:08 -0600 -Subject: [PATCH 01/22] 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 - ================================= --- -2.1.0 - diff --git a/0002-Improvement-of-detecting-KDE-session-BR63157.patch b/0002-Improvement-of-detecting-KDE-session-BR63157.patch deleted file mode 100644 index c018f65..0000000 --- a/0002-Improvement-of-detecting-KDE-session-BR63157.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cba39e7a00abe27b3bff49e2d455bb30ad33dde6 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 7 Feb 2014 10:51:10 -0600 -Subject: [PATCH 02/22] 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 -+ * Improvement of detecting KDE session (BR63157) -+ - 2013-10-24 Rex Dieter - * 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; --- -2.1.0 - diff --git a/0003-xdg-terminal-incompatible-.-BR44357.patch b/0003-xdg-terminal-incompatible-.-BR44357.patch deleted file mode 100644 index ed95cd8..0000000 --- a/0003-xdg-terminal-incompatible-.-BR44357.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 495fa68306f6f5b0c0bb312e92f0f2a0e35fa567 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 7 Feb 2014 10:56:17 -0600 -Subject: [PATCH 03/22] 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 --- -2.1.0 - diff --git a/0004-remove-generated-html-files.patch b/0004-remove-generated-html-files.patch deleted file mode 100644 index 59508bc..0000000 --- a/0004-remove-generated-html-files.patch +++ /dev/null @@ -1,1107 +0,0 @@ -From 3af8eeca3be36c7dfb52a816f5e9cf57c3be1bd5 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 7 Feb 2014 12:23:34 -0600 -Subject: [PATCH 04/22] 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 @@ -- -- --

xdg-utils

--

--This version of xdg-utils contains the following commands: --

-- -- -- -- -- -- -- -- -- --
xdg-desktop-menu:command line tool for (un)installing desktop menu items
xdg-desktop-icon:command line tool for (un)installing icons to the desktop
xdg-mime:command line tool for querying information about file type handling --and adding descriptions for new file types
xdg-icon-resource:command line tool for (un)installing icon resources
xdg-open:opens a file or URL in the user's preferred application
xdg-email:command line tool for sending mail using the user's preferred e-mail composer
xdg-screensaver:command line tool for controlling the screensaver
xdg-settings:get various settings from the desktop environment
-- -- -\ 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 @@ --xdg-desktop-icon

Name

xdg-desktop-icon — command line tool for (un)installing icons to the desktop

Synopsis

xdg-desktop-icon install [--novendor] FILE

xdg-desktop-icon uninstall FILE

xdg-desktop-icon { --help | --manual | --version }

Description

-- The xdg-desktop-icon program can be used to install an application launcher -- or other file on the desktop of the current user. --

-- 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. --

Commands

install
-- Installs FILE to the desktop of the current user. -- FILE can be a *.desktop file or any -- other type of file. --
uninstall
-- Removes FILE from the desktop -- of the current user. --

Options

--novendor

-- 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. --

-- 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. --

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Desktop Files

-- An application launcher can be added to the desktop by installing a -- *.desktop file. A *.desktop file consists of a -- [Desktop Entry] header followed by several -- Key=Value lines. --

-- 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 -- Key. This way one can specify different -- values for the same Key depending on the -- currently selected language. --

-- The following keys are often used: --

Value=1.0
-- This is a mandatory field to indicate that the *.desktop file -- follows the 1.0 version of the specification. --
Type=Application
-- This is a mandatory field that indicates that the *.desktop file -- describes an application launcher. --
Name=Application Name
-- The name of the application. -- For example Mozilla --
GenericName=Generic Name
-- A generic description of the application. -- For example Web Browser --
Comment=Comment
-- Optional field to specify a tooltip for the application. -- For example Visit websites on the Internet --
Icon=Icon File
-- 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 xdg-icon-resource -- 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. --
Exec=Command Line
-- 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. --

-- For a complete oveview of the *.desktop file format please -- visit http://www.freedesktop.org/wiki/Standards/desktop-entry-spec --

Environment Variables

-- xdg-desktop-icon honours the following environment variables: --

XDG_UTILS_DEBUG_LEVEL
-- 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. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --
5
-- No permission to read one of the files passed on the command -- line. --

See Also

xdg-icon-resource(1) --

Examples

-- 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: --

--shinythings-webmirror.desktop:
--
--  [Desktop Entry]
--  Encoding=UTF-8
--  Type=Application
--
--  Exec=webmirror
--  Icon=shinythings-webmirror
--
--  Name=WebMirror
--  Name[nl]=WebSpiegel
--

--

Now the xdg-desktop-icon tool can be used to add the webmirror.desktop file -- to the desktop: --

--xdg-desktop-icon install ./shinythings-webmirror.desktop
--

--

To add a README file to the desktop as well, the following command can be used: --

--xdg-desktop-icon install ./shinythings-README
--

--

-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 @@ --xdg-desktop-menu

Name

xdg-desktop-menu — command line tool for (un)installing desktop menu items

Synopsis

xdg-desktop-menu install [--noupdate] [--novendor] [--mode mode] directory-file(s) desktop-file(s)

xdg-desktop-menu uninstall [--noupdate] [--mode mode] directory-file(s) desktop-file(s)

xdg-desktop-menu forceupdate [--mode mode]

xdg-desktop-menu { --help | --manual | --version }

Description

-- The xdg-desktop-menu program can be used to install new menu entries -- to the desktop's application menu. --

-- The application menu works according to the -- XDG Desktop Menu Specification at -- http://www.freedesktop.org/Standards/menu-spec --

Commands

install

-- Install one or more applications in a submenu of -- the desktop menu system. --

desktop-file: -- 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. --

-- 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. --

-- 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. --

-- 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 -- xdg-desktop-menu the entries will be -- installed in addition to any already existing entries. --

directory-file: -- The *.directory file indicated by -- directory-file 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. --

-- 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. --

-- Directory files follow the syntax defined by the freedesktop.org -- Desktop Entry Specification. --

uninstall

-- Remove applications or submenus from the desktop menu system -- previously installed with xdg-desktop-menu install. --

-- A submenu and the associated directory file is only removed -- when the submenu no longer contains any menu entries. --

forceupdate

-- Force an update of the menu system. --

-- This command is only useful if the last call to -- xdg-desktop-menu included the --noupdate option. --

Options

--noupdate
-- 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. --
--novendor

-- 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. --

-- 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. --

--mode mode

mode can be -- user or system. -- 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. --

-- The default is to use system mode when called by root -- and to use user mode when called by a non-root user. --

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Desktop Files

-- An application item in the application menu is represented by a -- *.desktop file. A *.desktop file consists of a -- [Desktop Entry] header followed by several -- Key=Value lines. --

-- 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 -- Key. This way one can specify different -- values for the same Key depending on the -- currently selected language. --

-- The following keys are often used: --

Value=1.0
-- This is a mandatory field to indicate that the *.desktop file -- follows the 1.0 version of the specification. --
Type=Application
-- This is a mandatory field that indicates that the *.desktop file -- describes an application launcher. --
Name=Application Name
-- The name of the application. -- For example Mozilla --
GenericName=Generic Name
-- A generic description of the application. -- For example Web Browser --
Comment=Comment
-- Optional field to specify a tooltip for the application. -- For example Visit websites on the Internet --
Icon=Icon File
-- 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 xdg-icon-resource -- 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. --
Exec=Command Line
-- 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. --
Categories=Categories

-- 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. --

-- When using categories it is recommended to include -- one of the following categories: -- AudioVideo, Development, Education, Game, Graphics, Network, -- Office, Settings, System, Utility. --

-- 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 --

MimeType=Mimetypes
-- A list of mimetypes separated by semi-colons. This field is -- used to indicate which file types the application is able to -- open. --

-- For a complete oveview of the *.desktop file format please -- visit http://www.freedesktop.org/wiki/Standards/desktop-entry-spec --

Directory Files

-- 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 -- [Desktop Entry] header followed by several -- Key=Value lines. --

-- 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 -- Key. This way one can specify different -- values for the same Key depending on the -- currently selected language. --

-- The following keys are relevqnt for submenus: --

Value=1.0
-- This is a mandatory field to indicate that the *.directory file -- follows the 1.0 version of the Desktop Entry specification. --
Type=Directory
-- This is a mandatory field that indicates that the *.directory file -- describes a submenu. --
Name=Menu Name
-- The title of submenu. -- For example Mozilla --
Comment=Comment
-- Optional field to specify a tooltip for the submenu. --
Icon=Icon File
-- 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 xdg-icon-resource -- 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. --

Environment Variables

-- xdg-desktop-menu honours the following environment variables: --

XDG_UTILS_DEBUG_LEVEL
-- 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. --
XDG_UTILS_INSTALL_MODE
-- This environment variable can be used by the user or -- administrator to override the installation mode. -- Valid values are user and -- system. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --
5
-- No permission to read one of the files passed on the command -- line. --

See Also

xdg-desktop-icon(1), -- xdg-icon-resource(1), -- xdg-mime(1) --

Examples

-- 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 Categories entry: --

--shinythings-webmirror.desktop:
--
--  [Desktop Entry]
--  Encoding=UTF-8
--  Type=Application
--
--  Exec=webmirror
--  Icon=webmirror
--
--  Name=WebMirror
--  Name[nl]=WebSpiegel
--
--  Categories=Network;WebDevelopment;
--

--

Now the xdg-desktop-menu tool can be used to add the -- shinythings-webmirror.desktop file to the desktop application menu: --

--xdg-desktop-menu install ./shinythings-webmirror.desktop
--

--

-- 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. --

-- 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. --

-- 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: --

--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
--

--

-- In addition a .directory file needs to be created to provide a title and icon -- for the sub-menu itself: --

--shinythings-webmirror.directory:
--
--  [Desktop Entry]
--  Encoding=UTF-8
--
--  Icon=shinythings-webmirror-menu
--
--  Name=WebMirror
--  Name[nl]=WebSpiegel
--

--

-- These file can now be installed with: --

--xdg-desktop-menu install ./shinythings-webmirror.directory \
--      ./shinythings-webmirror.desktop ./shinythings-webmirror-admin.desktop
--

--

-- The menu entries could also be installed one by one: --

--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
--

--

-- Although the result is the same it is slightly more efficient to -- install all files at the same time. --

-- 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: --

--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
--

--

-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 @@ --xdg-email

Name

xdg-email — command line tool for sending mail using the user's preferred e-mail composer

Synopsis

xdg-email [--utf8] [--cc address] [--bcc address] [--subject text] [--body text] [--attach file] [ mailto-uri | address(es) ]

xdg-email { --help | --manual | --version }

Description

-- xdg-email opens the user's preferred e-mail composer in order to send -- a mail to address(es) or -- mailto-uri. RFC2368 defines mailto: -- URIs. xdg-email limits support to, cc, subject and body fields in -- mailto-uri, all other fields are silently -- ignored. address(es) must follow the -- syntax of RFC822. Multiple addresses may be provided as -- separate arguments. --

-- 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. --

-- xdg-email is for use inside a desktop session only. -- It is not recommended to use xdg-email as root. --

-- See http://portland.freedesktop.org/EmailConfig for information on -- how the user can change the e-mail composer that is used. --

Options

--utf8
-- 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. --
--cc address
-- Specify a recipient to be copied on the e-mail. --
--bcc address
-- Specify a recipient to be blindly copied on the e-mail. --
--subject text
-- Specify a subject for the e-mail. --
--body text
-- 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. -- text may contain linebreaks. --
--attach file

-- Specify an attachment for the e-mail. file -- must point to an existing file. --

-- Some e-mail applications require the file to remain present -- after xdg-email returns. --

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Environment Variables

-- xdg-email honours the following environment variables: --

XDG_UTILS_DEBUG_LEVEL
-- 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. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --
5
-- No permission to read one of the files passed on the command -- line. --

Configuration

Visit http://portland.freedesktop.org/EmailConfig for information -- how to configure xdg-email to use the email client of your choice. --

Examples

--

--xdg-email 'Jeremy White <jwhite@example.com>'
--

--

--

--xdg-email --attach /tmp/logo.png \
--          --subject 'Logo contest' \
--          --body 'Attached you find the logo for the contest.' \
--          'jwhite@example.com'
--

--

--

--xdg-email --subject 'Your password is about to expire' \
--          'jwhite@example.com' 'bastian@example.com' 'whipple@example.com'
--

--

-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 @@ --xdg-icon-resource

Name

xdg-icon-resource — command line tool for (un)installing icon resources

Synopsis

xdg-icon-resource install [--noupdate] [--novendor] [--theme theme] [--context context] [--mode mode] --size size icon-file [icon-name]

xdg-icon-resource uninstall [--noupdate] [--theme theme] [--context context] [--mode mode] --size size icon-name

xdg-icon-resource forceupdate [--theme theme] [--mode mode]

xdg-icon-resource { --help | --manual | --version }

Description

-- 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. --

-- 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. --

-- The desktop icon system works according to the -- XDG Icon Theme Specification at -- http://www.freedesktop.org/Standards/icon-theme-spec --

Commands

install
-- Installs the icon file indicated by icon-file -- to the desktop icon system under the name -- icon-name. -- Icon names do not have an extension. -- If icon-name is not provided the name is -- derived from icon-file. -- The icon file must have -- .png or .xpm -- as extension. If a corresponding .icon -- file exists in the same location as icon-file -- it will be installed as well. --
uninstall
-- Removes the icon indicated by icon-name -- from the desktop icon system. Note that icon names do not have -- an extension. --
forceupdate
-- Force an update of the desktop icon system. This is only useful if -- the last call to xdg-icon-resource included the --noupdate option. --

Options

--noupdate
-- 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. --
--novendor

-- Normally, xdg-icon-resource checks to ensure that an icon file -- to be installed in the apps context has -- a proper vendor prefix. This option can be used to disable -- that check. --

-- 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. --

--theme theme
-- Installs or removes the icon file as part of -- theme. If no theme is specified the -- icons will be installed as part of the default hicolor theme. -- Applications may install icons under multiple themes but should -- at least install icons for the default hicolor theme. --
--context context
-- Specifies the context for the icon. Icons to be used in the -- application menu and as desktop icon should use -- apps as context which is the default -- context. Icons to be used as file icons should use -- mimetypes as context. -- Other common contexts are actions, -- devices, emblems, -- filesystems and stock. --
--size size
-- 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 --
--mode mode

mode can be -- user or system. -- 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. --

-- The default is to use system mode when called by root -- and to use user mode when called by a non-root user. --

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Environment Variables

-- xdg-icon-resource honours the following environment variables: --

XDG_UTILS_DEBUG_LEVEL
-- 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. --
XDG_UTILS_INSTALL_MODE
-- This environment variable can be used by the user or -- administrator to override the installation mode. -- Valid values are user and -- system. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --
5
-- No permission to read one of the files passed on the command -- line. --

See Also

xdg-desktop-icon(1), -- xdg-desktop-menu(1), -- xdg-mime(1) --

Examples

--To install an icon resource to depict a launcher for the application --myfoobar, the company ShinyThings Inc. can use: --

--xdg-icon-resource install --size 64 shinythings-myfoobar.png
--

--

--To install an icon for a new application/x-foobar file type one can use: --

--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
--

This will install two icons with the name application-x-foobar --but with different sizes. --

-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 @@ --xdg-mime

Name

xdg-mime — command line tool for querying information about file type handling --and adding descriptions for new file types

Synopsis

xdg-mime query { filetype | default } ...

xdg-mime default application mimetype(s)

xdg-mime install [--mode mode] [--novendor] mimetypes-file

xdg-mime uninstall [--mode mode] mimetypes-file

xdg-mime { --help | --manual | --version }

Description

-- The xdg-mime program can be used to query information about file types -- and to add descriptions for new file types. --

Commands

query

-- Returns information related to file types. --

-- The query option is for use inside a desktop session only. -- It is not recommended to use xdg-mime query as root. --

-- The following queries are supported: --

query filetype FILE: -- Returns the file type of FILE in the form of a MIME type. --

query default mimetype: -- Returns the default application that the desktop environment uses for opening -- files of type mimetype. The default application is -- identified by its *.desktop file. --

default

-- Ask the desktop environment to make application -- the default application for opening -- files of type mimetype. An -- application can be made the default for several file types by -- specifying multiple mimetypes. --

-- application is the desktop file -- id of the application and has the form vendor-name.desktop -- application 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. --

-- 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. --

-- The default option is for use inside a desktop session only. -- It is not recommended to use xdg-mime default as root. --

install
-- Adds the file type descriptions provided in mimetypes-file -- to the desktop environment. mimetypes-file -- 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 -- type-subtype -- must be installed with the xdg-icon-resource -- command in the mimetypes 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). --
uninstall
-- Removes the file type descriptions provided in mimetypes-file -- and previously added with xdg-mime install from the -- desktop environment. mimetypes-file -- 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. --

Options

--mode mode

mode can be -- user or system. -- 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. --

-- The default is to use system mode when called by root -- and to use user mode when called by a non-root user. --

--novendor

-- Normally, xdg-mime checks to ensure that the -- mimetypes-file to be installed -- has a proper vendor prefix. This option can be -- used to disable that check. --

-- 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. --

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Environment Variables

-- xdg-mime honours the following environment variables: --

XDG_UTILS_DEBUG_LEVEL
-- 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. --
XDG_UTILS_INSTALL_MODE
-- This environment variable can be used by the user or -- administrator to override the installation mode. -- Valid values are user and -- system. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --
5
-- No permission to read one of the files passed on the command -- line. --

See Also

xdg-icon-resource(1), -- xdg-desktop-menu(1) --

Examples

--

--xdg-mime query filetype /tmp/foobar.png
--

Prints the MIME type of the file /tmp/foobar.png, in this --case image/png --

--

--xdg-mime query default image/png
--

Prints the .desktop filename of the application which is -- registered to open PNG files. --

--

--xdg-mime install shinythings-shiny.xml
--

Adds a file type description for "shiny"-files. -- "shinythings-" is used as the vendor prefix. -- The file type description could look as folows. --

--shinythings-shiny.xml:
--
--<?xml version="1.0"?>
--<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
--  <mime-type type="text/x-shiny">
--    <comment>Shiny new file type</comment>
--    <glob pattern="*.shiny"/>
--    <glob pattern="*.shi"/>
--  </mime-type>
--</mime-info>
--

An icon for this new file type must also be installed, for --example with: --

--xdg-icon-resource install --context mimetypes --size 64 shiny-file-icon.png text-x-shiny
--

--

-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 @@ --xdg-open

Name

xdg-open — opens a file or URL in the user's preferred application

Synopsis

xdg-open { file | URL }

xdg-open { --help | --manual | --version }

Description

-- 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. --

-- xdg-open is for use inside a desktop session only. -- It is not recommended to use xdg-open as root. --

Options

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --

Examples

--

--xdg-open 'http://www.freedesktop.org/'
--

-- Opens the Freedesktop.org website in the user's default browser --

--

--xdg-open /tmp/foobar.png
--

-- Opens the PNG image file /tmp/foobar.png in the user's default image -- viewing application. --

-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 @@ --xdg-screensaver

Name

xdg-screensaver — command line tool for controlling the screensaver

Synopsis

xdg-screensaver suspend WindowID

xdg-screensaver resume WindowID

xdg-screensaver { activate | lock | reset | status }

xdg-screensaver { --help | --manual | --version }

Description

-- xdg-screensaver provides commands to control the screensaver. --

-- xdg-screensaver is for use inside a desktop session only. -- It is not recommended to use xdg-screensaver as root. --

Commands

suspend WindowID

-- Suspends the screensaver and monitor power management. -- WindowID 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. --

-- WindowID can be represented as either a decimal number -- or as a hexadecimal number consisting of the prefix -- 0x followed by one or more hexadecimal -- digits. --

-- 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 --

resume WindowID
-- Resume the screensaver and monitor power management after being -- suspended. -- WindowID -- must be the same X Window ID that was passed to a previous call -- of xdg-screensaver suspend --
activate
-- Turns the screensaver on immediately. This may result in the -- screen getting locked, depending on existing system policies. --
lock
-- Lock the screen immediately. --
reset
-- Turns the screensaver off immediately. If the screen was locked -- the user may be asked to authenticate first. --
status
-- Prints enabled to stdout if the -- screensaver is enabled to turn on after a period of -- inactivity and prints -- disabled if the screensaver is -- not enabled. --

Options

--help
-- Show command synopsis. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
3
-- A required tool could not be found. --
4
-- The action failed. --

Examples

--

--xdg-screensaver suspend 0x1c00007
--

Causes the screensaver to be disabled till -- xdg-screensaver resume 0x1c00007 is called. -- 0x1c00007 must be the X Window ID of an -- existing window. --

-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 @@ --xdg-settings

Name

xdg-settings — get various settings from the desktop environment

Synopsis

xdg-settings { get | check | set } {property} [subproperty] [value]

xdg-settings { --help | --list | --manual | --version }

Description

-- 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). --

-- xdg-settings is for use inside a desktop session only. -- It is not recommended to use xdg-settings as root. --

Options

--help
-- Show command synopsis. --
--list
-- List all properties xdg-settings knows about. --
--manual
-- Show this manualpage. --
--version
-- Show the xdg-utils version information. --

Properties

-- 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. --

-- 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. --

Exit Codes

-- An exit code of 0 indicates success while a non-zero exit code -- indicates failure. The following failure codes can be returned: --

1
-- Error in command line syntax. --
2
-- One of the files passed on the command line did not exist. --
3
-- A required tool could not be found. --
4
-- The action failed. --

Examples

-- Get the desktop file name of the current default web browser -- 

--        xdg-settings get default-web-browser
--

--

-- 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) -- 

--        xdg-settings check default-web-browser firefox.desktop
--

--

-- Set the default web browser to google-chrome.desktop -- 

--        xdg-settings set default-web-browser google-chrome.desktop
--

--

-- Set the default mailto URL scheme handler to be evolution.desktop -- 

--        xdg-settings set default-url-scheme-handler mailto evolution.desktop
--

--

--- -2.1.0 - diff --git a/0005-remove-generated-man-pages.patch b/0005-remove-generated-man-pages.patch deleted file mode 100644 index 64b7a05..0000000 --- a/0005-remove-generated-man-pages.patch +++ /dev/null @@ -1,1939 +0,0 @@ -From 668c5e140a07a4b739d791caba3232e590a3e26c Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 7 Feb 2014 12:25:28 -0600 -Subject: [PATCH 05/22] 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 --.\" 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 --.\" 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 --.\" 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 \*(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@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@example\&.com\*(Aq \*(Aqbastian@example\&.com\*(Aq \*(Aqwhipple@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 --.\" 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 --.\" 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: -- -- -- -- -- Shiny new file type -- -- -- -- --.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 --.\" 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 --.\" 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 --.\" 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 --- -2.1.0 - diff --git a/0006-all-re-generate-html-man-too.patch b/0006-all-re-generate-html-man-too.patch deleted file mode 100644 index 779372a..0000000 --- a/0006-all-re-generate-html-man-too.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6da906f59933133612d006e1bff9918a2b8c5a60 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 7 Feb 2014 12:31:40 -0600 -Subject: [PATCH 06/22] 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) - --- -2.1.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 deleted file mode 100644 index 1d076cc..0000000 --- a/0007-drop-references-to-Value-1.0-key-BR74688.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 50254545a0d2c181bf9bce4c7723044ee7186cb5 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Sat, 8 Feb 2014 12:39:43 -0600 -Subject: [PATCH 07/22] 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: - - -- -- Value=1.0 -- -- -- This is a mandatory field to indicate that the *.desktop file -- follows the 1.0 version of the specification. -- -- -- - - - Type=Application -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: - - -- -- Value=1.0 -- -- -- This is a mandatory field to indicate that the *.desktop file -- follows the 1.0 version of the specification. -- -- -- - - - Type=Application -@@ -406,15 +397,6 @@ - The following keys are relevant for submenus: - - -- -- Value=1.0 -- -- -- This is a mandatory field to indicate that the *.directory file -- follows the 1.0 version of the Desktop Entry specification. -- -- -- - - - Type=Directory --- -2.1.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 deleted file mode 100644 index 6a68e45..0000000 --- a/0008-xdg-open-Remove-first_word-already-in-common.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3eaf93ab3303e14813885b6b743b48a1c3b5a6ab Mon Sep 17 00:00:00 2001 -From: Till Maas -Date: Wed, 26 Feb 2014 15:19:33 +0100 -Subject: [PATCH 08/22] 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 --- -2.1.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 deleted file mode 100644 index e2e0263..0000000 --- a/0009-xdg-open-Expand-i-and-c-from-Exec.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 316b9adc05c6d871360afb1195939c5fc975ccff Mon Sep 17 00:00:00 2001 -From: Till Maas -Date: Wed, 26 Feb 2014 15:26:59 +0100 -Subject: [PATCH 09/22] 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 --- -2.1.0 - diff --git a/0010-xdg-open-Support-multiple-groups.patch b/0010-xdg-open-Support-multiple-groups.patch deleted file mode 100644 index ae69007..0000000 --- a/0010-xdg-open-Support-multiple-groups.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ba265f969b9061d221915c2528122c44a85ad7c2 Mon Sep 17 00:00:00 2001 -From: Till Maas -Date: Fri, 11 Apr 2014 18:35:34 +0200 -Subject: [PATCH 10/22] xdg-open: Support multiple groups - -Desktop files might contain multiple groups. Check for keys only in the -Desktop Entry group. ---- - scripts/xdg-open.in | 29 +++++++++++++++++++++++++---- - 1 file changed, 25 insertions(+), 4 deletions(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index e7a15a9..b994fa5 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -36,15 +36,36 @@ last_word() - echo "$rest" - } - --# Get the value of a key in a .desktop file. -+# Get the value of a key in a desktop file's Desktop Entry group. - # Example: Use get_key foo.desktop Exec --# to get the values of the Exec= key -+# to get the values of the Exec= key for the Desktop Entry group. - get_key() - { - local file="${1}" - local key="${2}" -- -- grep -E "^${key}=" "${file}" | cut -d= -f 2- -+ local desktop_entry="" -+ -+ IFS_="${IFS}" -+ IFS="" -+ while read line -+ do -+ case "$line" in -+ "[Desktop Entry]") -+ desktop_entry="y" -+ ;; -+ # Reset match flag for other groups -+ [*) -+ desktop_entry="" -+ ;; -+ *) -+ # Only match Desktop Entry group -+ if [ -n "${desktop_entry}" ] -+ then -+ echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2- -+ fi -+ esac -+ done < "${file}" -+ IFS="${IFS_}" - } - - open_darwin() --- -2.1.0 - diff --git a/0011-followup-fix-for-prior-commit.patch b/0011-followup-fix-for-prior-commit.patch deleted file mode 100644 index 468ebcc..0000000 --- a/0011-followup-fix-for-prior-commit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 69adcfeb4679f75eb24f357f304715d3c014273b Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Tue, 15 Apr 2014 09:17:12 -0500 -Subject: [PATCH 11/22] followup fix for prior commit - ---- - scripts/xdg-open.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index b994fa5..35f4b76 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -61,7 +61,7 @@ get_key() - # Only match Desktop Entry group - if [ -n "${desktop_entry}" ] - then -- echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2- -+ echo "${line}" | grep -E "^${key}=" | cut -d= -f 2- - fi - esac - done < "${file}" --- -2.1.0 - diff --git a/0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch b/0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch deleted file mode 100644 index f00df49..0000000 --- a/0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5913207e625a92b73cd9489aea4b7b10bf3eb855 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Sat, 26 Apr 2014 17:20:35 -0500 -Subject: [PATCH 12/22] xdg-open fails to open web browser urls with a query - string (BR45857) - ---- - ChangeLog | 3 +++ - scripts/xdg-open.in | 4 +++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index b7fcf86..f29d9d6 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2014-04-26 Rex Dieter -+ * xdg-open fails to open web browser urls with a query string (BR45857) -+ - 2014-02-07 Rex Dieter - * Improvement of detecting KDE session (BR63157) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 35f4b76..917df2c 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -254,7 +254,9 @@ open_generic() - file=${file#file://} - file="$(printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")" - fi -- check_input_file "$file" -+ file_check=${file%%#*} -+ file_check=${file_check%%\?*} -+ check_input_file "$file_check" - - open_generic_xdg_file_mime "$file" - --- -2.1.0 - diff --git a/0013-xdg-open-use-kde-open-noninteractive-BR16295.patch b/0013-xdg-open-use-kde-open-noninteractive-BR16295.patch deleted file mode 100644 index f19d940..0000000 --- a/0013-xdg-open-use-kde-open-noninteractive-BR16295.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 869b22b75fc6e7c9e29ba5367bd97ebf7ce76cb3 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Sat, 26 Apr 2014 17:28:50 -0500 -Subject: [PATCH 13/22] xdg-open: use 'kde-open --noninteractive' (BR16295) - ---- - ChangeLog | 1 + - scripts/xdg-open.in | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index f29d9d6..cb7cf65 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -2,6 +2,7 @@ - - 2014-04-26 Rex Dieter - * xdg-open fails to open web browser urls with a query string (BR45857) -+ * xdg-open: use 'kde-open --noninteractive' (BR16295) - - 2014-02-07 Rex Dieter - * Improvement of detecting KDE session (BR63157) -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 917df2c..637a762 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -82,7 +82,7 @@ open_darwin() - open_kde() - { - if kde-open -v 2>/dev/null 1>&2; then -- kde-open "$1" -+ kde-open --noninteractive "$1" - else - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - kfmclient openURL "$1" --- -2.1.0 - diff --git a/0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch b/0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch deleted file mode 100644 index 0889f59..0000000 --- a/0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8369f878c08b435ecd5523b4c49eff36348c4bae Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 30 Jun 2014 07:54:50 -0500 -Subject: [PATCH 14/22] Revert "xdg-open: use 'kde-open --noninteractive' - (BR16295)" - -This reverts commit 869b22b75fc6e7c9e29ba5367bd97ebf7ce76cb3. - -kde-open --noninteractive is still crashy :( -https://bugs.kde.org/show_bug.cgi?id=336117 ---- - ChangeLog | 1 - - scripts/xdg-open.in | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index cb7cf65..f29d9d6 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -2,7 +2,6 @@ - - 2014-04-26 Rex Dieter - * xdg-open fails to open web browser urls with a query string (BR45857) -- * xdg-open: use 'kde-open --noninteractive' (BR16295) - - 2014-02-07 Rex Dieter - * Improvement of detecting KDE session (BR63157) -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 637a762..917df2c 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -82,7 +82,7 @@ open_darwin() - open_kde() - { - if kde-open -v 2>/dev/null 1>&2; then -- kde-open --noninteractive "$1" -+ kde-open "$1" - else - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - kfmclient openURL "$1" --- -2.1.0 - diff --git a/0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch b/0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch deleted file mode 100644 index e8dedf9..0000000 --- a/0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 34e033845ea6997bc4fdafd9bdd4856bfa5d0d36 Mon Sep 17 00:00:00 2001 -From: Frederic Crozat -Date: Mon, 30 Jun 2014 17:31:46 +0200 -Subject: [PATCH 15/22] xdg-screensaver: use D-Bus api instead of - gnome-screensaver call. - ---- - scripts/xdg-screensaver.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in -index b05ab2c..8315f6a 100644 ---- a/scripts/xdg-screensaver.in -+++ b/scripts/xdg-screensaver.in -@@ -466,7 +466,12 @@ screensaver_gnome_screensaver() - ;; - - lock) -- gnome-screensaver-command --lock > /dev/null 2> /dev/null -+ dbus-send --session \ -+ --dest=org.gnome.ScreenSaver \ -+ --type=method_call \ -+ /org/gnome/ScreenSaver \ -+ org.gnome.ScreenSaver.Lock \ -+ 2> /dev/null - result=$? - ;; - --- -2.1.0 - diff --git a/0016-xdg-email-do-not-encode-character.patch b/0016-xdg-email-do-not-encode-character.patch deleted file mode 100644 index 1a08a94..0000000 --- a/0016-xdg-email-do-not-encode-character.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7cd846d62e17f36be2f7d29e56188ddf6a6d72cb Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 25 Aug 2014 07:31:15 -0500 -Subject: [PATCH 16/22] xdg-email: do not encode - character - ---- - ChangeLog | 3 +++ - scripts/xdg-email.in | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index f29d9d6..2554692 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2014-08-25 Rex Dieter -+ * xdg-email: do not encode - character -+ - 2014-04-26 Rex Dieter - * xdg-open fails to open web browser urls with a query string (BR45857) - -diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in -index 4c3cb83..54de71f 100644 ---- a/scripts/xdg-email.in -+++ b/scripts/xdg-email.in -@@ -226,7 +226,7 @@ result=$(echo "$str" | awk ' - c = substr ($0, i, 1) - if ( ord [c] > 127 ) { - e = e "%" sprintf("%02X", ord [c]) -- } else if ( c ~ /[@a-zA-Z0-9.-\\\/]/ ) { -+ } else if ( c ~ /[@a-zA-Z0-9.\-\\\/]/ ) { - e = e c - } else { - e = e "%" sprintf("%02X", ord [c]) --- -2.1.0 - diff --git a/0017-bump-version-output-to-rc3.patch b/0017-bump-version-output-to-rc3.patch deleted file mode 100644 index 41fc4bb..0000000 --- a/0017-bump-version-output-to-rc3.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 781023ef997bac433dbc258bd5cfdc1366f2ffa4 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Wed, 27 Aug 2014 15:35:16 -0500 -Subject: [PATCH 17/22] bump --version output to rc3 - -missed the ball for rc2 ---- - scripts/xdg-utils-common.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in -index c365cca..37c4082 100644 ---- a/scripts/xdg-utils-common.in -+++ b/scripts/xdg-utils-common.in -@@ -226,8 +226,8 @@ check_common_commands() - exit_success - ;; - -- --version) -- echo "@NAME@ 1.1.0 rc1" -+ t --version) -+ echo "@NAME@ 1.1.0 rc3" - exit_success - ;; - esac --- -2.1.0 - diff --git a/0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch b/0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch deleted file mode 100644 index 8a74273..0000000 --- a/0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 48545132620f85d3ba133010116884a63f26f3a3 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Wed, 17 Sep 2014 06:31:40 -0500 -Subject: [PATCH 18/22] xdg-utils-common is broken, xdg-open uses bashism - (#83979) - ---- - scripts/xdg-open.in | 2 +- - scripts/xdg-utils-common.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 917df2c..244f214 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -54,7 +54,7 @@ get_key() - desktop_entry="y" - ;; - # Reset match flag for other groups -- [*) -+ "["*) - desktop_entry="" - ;; - *) -diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in -index 37c4082..2c8fa46 100644 ---- a/scripts/xdg-utils-common.in -+++ b/scripts/xdg-utils-common.in -@@ -226,7 +226,7 @@ check_common_commands() - exit_success - ;; - -- t --version) -+ --version) - echo "@NAME@ 1.1.0 rc3" - exit_success - ;; --- -2.1.0 - diff --git a/0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch b/0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch deleted file mode 100644 index 4b7351f..0000000 --- a/0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 190448845baaccf68154e7d03392c74cbe163505 Mon Sep 17 00:00:00 2001 -From: Ken Neighbors -Date: Fri, 19 Sep 2014 09:29:49 -0700 -Subject: [PATCH 19/22] xdg-settings: convert multi-group desktop file to XFCE - WebBrowser helper file - -When generating an XFCE helper file for the default WebBrowser, the -XFCE keys cannot always simply be appended to the end of the file, but -must be placed in the first group under "[Desktop Entry]". (A desktop -file can contain additional group headers, such as -"X-Ayatana-Desktop-Shortcuts" groups.) ---- - scripts/xdg-settings.in | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in -index eaed991..460ffc9 100644 ---- a/scripts/xdg-settings.in -+++ b/scripts/xdg-settings.in -@@ -407,13 +407,15 @@ check_xfce_desktop_file() - # Found a file to convert. - target="${XDG_DATA_HOME:-$HOME/.local/share}/xfce4/helpers" - mkdir -p "$target" -- grep -v "^Type=" "$file" > "$target/$1" -- echo "Type=X-XFCE-Helper" >> "$target/$1" -+ # Copy file up to first "Exec=" line. -+ sed -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$d' "$file" > "$target/$1" - echo "X-XFCE-Category=WebBrowser" >> "$target/$1" - # Change %F, %f, %U, and %u to "%s". -- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g'`" -+ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g' | head -1`" - echo "X-XFCE-Commands=`echo "$command" | first_word`" >> "$target/$1" - echo "X-XFCE-CommandsWithParameter=$command" >> "$target/$1" -+ # Copy rest of file (from first "Exec=" line to end-of-file). -+ sed -n -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$p' "$file" >> "$target/$1" - return - fi - done --- -2.1.0 - diff --git a/0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch b/0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch deleted file mode 100644 index eb48f24..0000000 --- a/0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0c465c119130c2739e3086b7d3573313cb19233a Mon Sep 17 00:00:00 2001 -From: Jehan -Date: Tue, 15 Jul 2014 16:42:27 +0000 -Subject: [PATCH 20/22] xdg-email: reset the IFS before interpreting a shell - command. - ---- - scripts/xdg-email.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in -index 54de71f..e68425c 100644 ---- a/scripts/xdg-email.in -+++ b/scripts/xdg-email.in -@@ -207,6 +207,9 @@ open_generic() - - url_encode() - { -+# The shell needs the default internal field separator -+# otherwise it would search for $utf8 as a command in whole. -+IFS=" " - str=$(echo "$1" | $utf8) - local ORIG_LANG="$LANG" - local ORIG_LC_ALL="$LC_ALL" --- -2.1.0 - diff --git a/0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch b/0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch deleted file mode 100644 index dd9101e..0000000 --- a/0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d6e0924bdf917d118dba993534cc3f335ab0a160 Mon Sep 17 00:00:00 2001 -From: David Costa -Date: Tue, 24 Jun 2014 20:01:07 +0200 -Subject: [PATCH 21/22] xdg-open: fixes #63153 keeping the path as URL - ---- - scripts/xdg-open.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 244f214..cc2fc9c 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -306,10 +306,10 @@ open_lxde() - if (echo "$1" | grep -q '^file://' || - ! echo "$1" | egrep -q '^[[:alpha:]+\.\-]+:') - then -- local file="$(echo "$1" | sed 's%^file://%%')" -+ local file="$1" - - # handle relative paths -- if ! echo "$file" | grep -q '^/'; then -+ if ! echo "$file" | egrep -q '^(file://)?/'; then - file="$(pwd)/$file" - fi - --- -2.1.0 - diff --git a/0022-update-Changelog-for-recent-contributed-patches.patch b/0022-update-Changelog-for-recent-contributed-patches.patch deleted file mode 100644 index 98f81fe..0000000 --- a/0022-update-Changelog-for-recent-contributed-patches.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6b0f4390ab468c142ab51fd0851c64efeb996ff0 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Fri, 19 Sep 2014 13:07:11 -0500 -Subject: [PATCH 22/22] update Changelog for recent contributed patches - ---- - ChangeLog | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 2554692..f90ba4e 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,4 +1,11 @@ - === xdg-utils 1.1.x === -+2014-09-19 Rex Dieter -+ * XFCE .desktop file created for browser selection is broken (BR56092) -+ * Unnecessary filtering file:// for pcmanfm (BR63153) -+ * fails if user sets a custom IFS environment variable (BR81386) -+ -+2014-09-17 Rex Dieter -+ * xdg-utils-common is broken, xdg-open uses bashism (BR83979) - - 2014-08-25 Rex Dieter - * xdg-email: do not encode - character --- -2.1.0 - diff --git a/0023-make-release-distclean-targets-suck-less.patch b/0023-make-release-distclean-targets-suck-less.patch deleted file mode 100644 index 7c4da2f..0000000 --- a/0023-make-release-distclean-targets-suck-less.patch +++ /dev/null @@ -1,98 +0,0 @@ -From e962f0387cc670c96165383a1f9a8ae5251bd1ec Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 22 Sep 2014 13:38:42 -0500 -Subject: [PATCH 23/24] make release/distclean targets suck less - -still more work to do ---- - Makefile.in | 2 +- - scripts/Makefile.in | 19 +++++++++---------- - tests/Makefile.in | 2 +- - 3 files changed, 11 insertions(+), 12 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 37a025b..25dc59f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -10,7 +10,7 @@ distclean: clean $(SUBDIRS:%=%/__distclean__) - rm -f config.* Makefile - rm -rf autom4te.cache - --release: $(SUBDIRS:%=%/__release__) distclean -+release: $(SUBDIRS:%=%/__release__) - rm -f *~ - - help: -diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index 9a772bc..d167393 100644 ---- a/scripts/Makefile.in -+++ b/scripts/Makefile.in -@@ -27,30 +27,29 @@ SCRIPTS = \ - # xdg-terminal - - MANPAGES= $(SCRIPTS:%=man/%.1) --WEBPAGES= $(SCRIPTS:%=%.html) -+WEBPAGES= $(SCRIPTS:%=html/%.html) - XMLFILES= $(SCRIPTS:%=desc/%.xml) - - all: html man scripts - --html: index.html $(WEBPAGES) -+html: html/index.html $(WEBPAGES) - - scripts: README $(SCRIPTS) - - man: $(MANPAGES) - - release: scripts html man -- rm -f xdg-*.in *~ HACKING generate-help-script.awk -- rm -rf desc/ -- rm -rf xsl/ -+ rm -f *~ -+ #rm -rf desc/ xsl/ - rm -f xdg-file-dialog xdg-su xdg-copy xdg-terminal - --distclean: clean -- rm -f Makefile -+distclean: clean -+ rm -f Makefile man/xdg-*.1 html/xdg-*.html - - clean: scripts-clean - - scripts-clean: -- rm -f $(SCRIPTS) README man/xdg-*.1 html/xdg-*.html -+ rm -f $(SCRIPTS) README - - README: $(SCRIPTS) - echo > $@ -@@ -103,12 +102,12 @@ xdg-terminal: xdg-terminal.in xdg-utils-common.in - man/%.1: desc/%.xml - (cd man;$(XMLTO) man ../$<) - --index.html: $(XMLFILES) -+html/index.html: $(XMLFILES) - (cat html/index.html.pre; \ - xsltproc xsl/refentry2htmlindex.xsl $(XMLFILES); \ - cat html/index.html.post ) > html/index.html - --%.html: desc/%.xml -+html/%.html: desc/%.xml - (cd html;$(XMLTO) html-nochunks ../$<) - - %.txt: desc/%.xml -diff --git a/tests/Makefile.in b/tests/Makefile.in -index c57b0e0..a27504b 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -15,7 +15,7 @@ mandir = @mandir@ - all: - - release: -- rm -rf xdg-su tmp -+ rm -rf tmp - rm -f xdg-test.log *~ - - test: --- -1.9.3 - diff --git a/0024-Initial-support-for-Plasma5.patch b/0024-Initial-support-for-Plasma5.patch deleted file mode 100644 index 60fcfc3..0000000 --- a/0024-Initial-support-for-Plasma5.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 18645a50fe25064b42ba421e231869c6063705f7 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 22 Sep 2014 14:31:20 -0500 -Subject: [PATCH 24/24] Initial support for Plasma5 - -... largely thanks to Karol Herbst ---- - ChangeLog | 4 ++++ - RELEASE_NOTES | 2 +- - scripts/xdg-mime.in | 20 ++++++++++++-------- - scripts/xdg-open.in | 19 +++++++++++-------- - 4 files changed, 28 insertions(+), 17 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index f90ba4e..077fb52 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,4 +1,8 @@ - === xdg-utils 1.1.x === -+ -+2014-09-22 Rex Dieter -+ * Initial support for Plasma5 (largely thanks to Karol Herbst) -+ - 2014-09-19 Rex Dieter - * XFCE .desktop file created for browser selection is broken (BR56092) - * Unnecessary filtering file:// for pcmanfm (BR63153) -diff --git a/RELEASE_NOTES b/RELEASE_NOTES -index 484b2b9..eee8ac5 100644 ---- a/RELEASE_NOTES -+++ b/RELEASE_NOTES -@@ -2,7 +2,7 @@ Release notes for xdg-utils 1.1.0 - ================================= - - This release includes: --* better support for GNOME3, KDE4, LXDE, MATE, XFCE -+* better support for GNOME3, KDE4, Plasma5, 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 -diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in -index 474dc5d..b324be9 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -36,11 +36,7 @@ update_mime_database() - detectDE - if [ x"$DE" = x"kde" ] ; then - DEBUG 1 "Running kbuildsycoca" -- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -- eval 'kbuildsycoca4'$xdg_redirect_output -- else -- eval 'kbuildsycoca'$xdg_redirect_output -- fi -+ eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output - fi - fi - for x in `echo "$PATH:/opt/gnome/bin" | sed 's/:/ /g'`; do -@@ -54,9 +50,17 @@ update_mime_database() - - info_kde() - { -- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -- DEBUG 1 "Running kmimetypefinder \"$1\"" -- kmimetypefinder "$1" 2>/dev/null | head -n 1 -+ if [ -n "${KDE_SESSION_VERSION}" ]; then -+ case "${KDE_SESSION_VERSION}" in -+ 4) -+ DEBUG 1 "Running kmimetypefinder \"$1\"" -+ kmimetypefinder "$1" 2>/dev/null | head -n 1 -+ ;; -+ 5) -+ DEBUG 1 "Running kmimetypefinder${KDE_SESSION_VERSION} \"$1\"" -+ kmimetypefinder${KDE_SESSION_VERSION} "$1" 2>/dev/null | head -n 1 -+ ;; -+ esac - else - DEBUG 1 "Running kfile \"$1\"" - kfile "$1" 2> /dev/null | head -n 1 | cut -d "(" -f 2 | cut -d ")" -f 1 -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index cc2fc9c..0145be3 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -81,15 +81,18 @@ open_darwin() - - open_kde() - { -- if kde-open -v 2>/dev/null 1>&2; then -- kde-open "$1" -+ if [ -n "${KDE_SESSION_VERSION}" ]; then -+ case "${KDE_SESSION_VERSION}" in -+ 4) -+ kde-open "$1" -+ ;; -+ 5) -+ kde-open${KDE_SESSION_VERSION} "$1" -+ ;; -+ esac - else -- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -- kfmclient openURL "$1" -- else -- kfmclient exec "$1" -- kfmclient_fix_exit_code $? -- fi -+ kfmclient exec "$1" -+ kfmclient_fix_exit_code $? - fi - - if [ $? -eq 0 ]; then --- -1.9.3 - diff --git a/0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch b/0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch deleted file mode 100644 index 28bcde3..0000000 --- a/0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 345ef333025ba386494a7ca0bc1ccd91f319f926 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 22 Sep 2014 15:29:40 -0500 -Subject: [PATCH 25/25] more plasma5: ktraderclient5, kreadconfig5, - kwriteconfig5 - ---- - scripts/xdg-email.in | 9 +++++++-- - scripts/xdg-mime.in | 18 ++++++++++++++---- - scripts/xdg-settings.in | 20 +++++++++++++++++--- - 3 files changed, 38 insertions(+), 9 deletions(-) - -diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in -index e68425c..c8909d0 100644 ---- a/scripts/xdg-email.in -+++ b/scripts/xdg-email.in -@@ -85,8 +85,13 @@ run_thunderbird() - open_kde() - { - local client kde_email_profile_name -- kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile` -- client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1` -+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then -+ kde_email_profile_name=`kreadconfig5 --file emaildefaults --group Defaults --key Profile` -+ client=`kreadconfig5 --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1` -+ else -+ kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile` -+ client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1` -+ fi - echo $client | grep thunderbird > /dev/null 2>&1 - if [ $? -eq 0 ] ; then - run_thunderbird "$client" "$1" -diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in -index b324be9..0290d77 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -398,10 +398,20 @@ defapp_generic() - defapp_kde() - { - MIME="$1" -- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -- KTRADER=`which ktraderclient 2> /dev/null` -- MIMETYPE="--mimetype" -- SERVICETYPE="--servicetype" -+ -+ if [ -n "${KDE_SESSION_VERSION}" ]; then -+ case "${KDE_SESSION_VERSION}" in -+ 4) -+ KTRADER=`which ktraderclient 2> /dev/null` -+ MIMETYPE="--mimetype" -+ SERVICETYPE="--servicetype" -+ ;; -+ 5) -+ KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null` -+ MIMETYPE="--mimetype" -+ SERVICETYPE="--servicetype" -+ ;; -+ esac - else - KTRADER=`which ktradertest 2> /dev/null` - fi -diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in -index 460ffc9..20a9f94 100644 ---- a/scripts/xdg-settings.in -+++ b/scripts/xdg-settings.in -@@ -146,10 +146,15 @@ read_kde_config() - configfile="$1" - configsection="$2" - configkey="$3" -- application="`kreadconfig --file $configfile --group $configsection --key $configkey`" -+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then -+ application="`kreadconfig5 --file $configfile --group $configsection --key $configkey`" -+ else -+ application="`kreadconfig --file $configfile --group $configsection --key $configkey`" -+ fi - if [ x"$application" != x ]; then - echo "$application" - else -+ if [ x"${KDE_SESSION_VERSION}" = x"4" ]; then - # kreadconfig in KDE 4 may not notice Key[$*]=... localized settings, so - # check by hand if it didn't find anything (oddly kwriteconfig works - # fine though). -@@ -158,6 +163,7 @@ read_kde_config() - [ ! -f "$configfile_path" ] && return - # This will only take the first value if there is more than one. - grep "^$configkey"'\[$[^]=]*\]=' "$configfile_path" | head -n 1 | cut -d= -f 2- -+ fi - fi - } - -@@ -239,7 +245,11 @@ check_browser_kde() - set_browser_kde() - { - set_browser_mime "$1" || return -- kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1" -+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then -+ kwriteconfig5 --file kdeglobals --group General --key BrowserApplication "$1" -+ else -+ kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1" -+ fi - } - - # }}} KDE -@@ -516,7 +526,11 @@ set_url_scheme_handler_kde() - set_browser_mime "$2" "x-scheme-handler/$1" || return - if [ "$1" = "mailto" ]; then - binary="`desktop_file_to_binary "$2"`" -- kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" -+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then -+ kwriteconfig5 --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" -+ else -+ kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary" -+ fi - fi - } - --- -1.9.3 - diff --git a/0026-xdg-screensaver-plasma5-support.patch b/0026-xdg-screensaver-plasma5-support.patch deleted file mode 100644 index d188b23..0000000 --- a/0026-xdg-screensaver-plasma5-support.patch +++ /dev/null @@ -1,62 +0,0 @@ -From aa251a926130fbd3f4bade766ce5d2e0e2cb4c73 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Thu, 9 Oct 2014 09:35:21 -0500 -Subject: [PATCH 26/26] xdg-screensaver plasma5 support - ---- - ChangeLog | 3 +++ - scripts/xdg-screensaver.in | 16 ++++++++++------ - 2 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 077fb52..3399286 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,8 @@ - === xdg-utils 1.1.x === - -+2014-10-09 Rex Dieter -+ * xdg-screensaver plasma5 support -+ - 2014-09-22 Rex Dieter - * Initial support for Plasma5 (largely thanks to Karol Herbst) - -diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in -index 8315f6a..6ad9930 100644 ---- a/scripts/xdg-screensaver.in -+++ b/scripts/xdg-screensaver.in -@@ -86,13 +86,17 @@ perform_action() - - case "$DE" in - kde) -- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then -- screensaver_freedesktop "$1" -- else -- screensaver_kde "$1" -+ if [ -n "${KDE_SESSION_VERSION}" ]; then -+ case "${KDE_SESSION_VERSION}" in -+ 4|5) -+ screensaver_freedesktop "$1" -+ ;; -+ *) -+ screensaver_kde3 "$1" -+ ;; -+ esac - fi - ;; -- - gnome_screensaver) - screensaver_gnome_screensaver "$1" - ;; -@@ -314,7 +318,7 @@ screensaver_freedesktop() - esac - } - --screensaver_kde() -+screensaver_kde3() - { - case "$1" in - suspend) --- -1.9.3 - diff --git a/sources b/sources index cf7e1bf..9b8c367 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38b6f1d38cb02297ddbf64dba0a907a4 xdg-utils-1.1.0-rc2.tar.gz +617ef5f9872ab5b148ad4717bc9012f5 xdg-utils-1.1.0-rc3.tar.gz diff --git a/xdg-utils.spec b/xdg-utils.spec index db21f10..b76fbd6 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,10 +1,10 @@ -%define pre rc2 +%define pre rc3 Summary: Basic desktop integration functions Name: xdg-utils Version: 1.1.0 -Release: 0.31.%{pre}%{?dist} +Release: 0.32.%{pre}%{?dist} URL: http://portland.freedesktop.org/ %if 0%{?pre:1} @@ -14,33 +14,8 @@ Source1: xdg-utils-git_checkout.sh Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz %endif License: MIT + ## 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 -Patch110: 0010-xdg-open-Support-multiple-groups.patch -Patch111: 0011-followup-fix-for-prior-commit.patch -Patch112: 0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch -Patch113: 0013-xdg-open-use-kde-open-noninteractive-BR16295.patch -Patch114: 0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch -Patch115: 0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch -Patch116: 0016-xdg-email-do-not-encode-character.patch -Patch117: 0017-bump-version-output-to-rc3.patch -Patch118: 0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch -Patch119: 0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch -Patch120: 0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch -Patch121: 0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch -Patch122: 0022-update-Changelog-for-recent-contributed-patches.patch -Patch123: 0023-make-release-distclean-targets-suck-less.patch -Patch124: 0024-Initial-support-for-Plasma5.patch -Patch125: 0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch -Patch126: 0026-xdg-screensaver-plasma5-support.patch # make sure BuildArch comes *after* patches, to ensure %%autosetup works right # http://bugzilla.redhat.com/1084309 @@ -115,6 +90,9 @@ make install DESTDIR=%{buildroot} %changelog +* Sat Jan 03 2015 Rex Dieter 1.1.0-0.32.rc3 +- xdg-utils-1.1.0-rc3 + * Tue Oct 21 2014 Rex Dieter 1.1.0-0.31.rc2 - workaround %%autosetup failure harder (#1084309)