Hello community, here is the log from the commit of package xdg-utils checked in at Mon Nov 6 22:26:01 CET 2006. -------- --- xdg-utils/xdg-utils.changes 2006-10-27 18:04:39.000000000 +0200 +++ /mounts/work_src_done/NOARCH/xdg-utils/xdg-utils.changes 2006-11-06 09:49:13.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Nov 6 09:48:46 CET 2006 - dmueller@suse.de + +- update to 1.0.1: + * Several shell syntax issues causing failures on Ubuntu 6.10 + * Spurious output on stdout when running xdg-desktop-menu + * Non-ascii mailto URI handling of xdg-email on non-UTF8 locales + under KDE + +------------------------------------------------------------------- Old: ---- xdg-utils-1.0rc1.tar.bz2 New: ---- xdg-utils-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.MtWLOf/_old 2006-11-06 22:25:04.000000000 +0100 +++ /var/tmp/diff_new_pack.MtWLOf/_new 2006-11-06 22:25:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xdg-utils (Version 1.0) +# spec file for package xdg-utils (Version 1.0.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,12 +15,12 @@ License: X11/MIT Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments -Version: 1.0 -Release: 11 +Version: 1.0.1 +Release: 1 BuildArch: noarch URL: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %name-%{version}rc1.tar.bz2 +Source0: %name-%{version}.tar.bz2 %description The xdg-utils package is a set of simple scripts that provide basic @@ -40,7 +40,7 @@ %prep -%setup -q -n %name-%{version}rc1 +%setup -q -n %name-%{version} %build %configure @@ -78,6 +78,12 @@ %{_mandir}/man1/xdg-screensaver.1.gz %changelog -n xdg-utils +* Mon Nov 06 2006 - dmueller@suse.de +- update to 1.0.1: + * Several shell syntax issues causing failures on Ubuntu 6.10 + * Spurious output on stdout when running xdg-desktop-menu + * Non-ascii mailto URI handling of xdg-email on non-UTF8 locales + under KDE * Fri Oct 27 2006 - dmueller@suse.de - don't build as root * Wed Sep 27 2006 - dmueller@suse.de ++++++ xdg-utils-1.0rc1.tar.bz2 -> xdg-utils-1.0.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/ChangeLog new/xdg-utils-1.0.1/ChangeLog --- old/xdg-utils-1.0rc1/ChangeLog 2006-05-11 00:22:37.000000000 +0200 +++ new/xdg-utils-1.0.1/ChangeLog 2006-11-04 07:31:19.000000000 +0100 @@ -1,5 +1,18 @@ +=== xdg-utils 1.0.1 ==== + +2006-11-03 Waldo Bastian <waldo.bastian@intel.com> + * Fixed spurious output on stdout by xdg-desktop-menu + * Cleaned up shell syntax for xdg-screensaver and xdg-icon-resource + (fixes Ubuntu 6.10) + +2006-10-29 Kevin Krammer <kevin.krammer@gmx.at> + * Fixed non-ascii mailto URI handling of xdg-emial on non-UTF8 locales + under KDE + +=== xdg-utils 1.0 ==== + 2006-05-10 Bryce Harrington <bryce@osdl.org> - * Created xdg-screensaver + * Created xdg-screensaver 2006-04-24 Kevin Krammer <kevin.krammer@gmx.at> * Applied patch provided by Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/README new/xdg-utils-1.0.1/README --- old/xdg-utils-1.0rc1/README 2006-09-20 19:17:40.000000000 +0200 +++ new/xdg-utils-1.0.1/README 2006-10-06 22:48:49.000000000 +0200 @@ -30,10 +30,7 @@ OVERVIEW: --------- - The following scripts are provided at this time. -This is an early release of xdg-utils, and we hope to rapidly -add more utilities. - + The following tools are included in xdg-utils 1.0: xdg-desktop-menu Install desktop menu items xdg-desktop-icon Install icons to the desktop @@ -48,17 +45,8 @@ BUILD: ------ - Building the xdg-utils should be very simple. First, -you need to obtain the source and extract it to a directory -on your system. Change directories to that directory and -run the following commands: - - ./configure - make - - This will make all of the xdg-utils scripts; they -will be located in the scripts/ subdirectory and will -have names such as 'xdg-menu', or 'xdg-mime', and so on. + Building is not required, all tools are located in the +scripts/ subdirectory and are ready to be used. You can optionally choose to install the scripts to a target directory. To do this, you could issue @@ -102,12 +90,11 @@ and then invoking them without a specific path name. That will allow your users and their system providers to -use custom versions of the xdg-utils which should work better -for them. +use custom versions of the xdg-utils to adjust for system spsecific +differences. If you wish to absolutely force the issue and only use the versions you shipped, you could instead hard code the path to the version you bundle with your application. We strongly recommend against this, as it will make your product obsolete more quickly than is necessary. - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/RELEASE_NOTES new/xdg-utils-1.0.1/RELEASE_NOTES --- old/xdg-utils-1.0rc1/RELEASE_NOTES 1970-01-01 01:00:00.000000000 +0100 +++ new/xdg-utils-1.0.1/RELEASE_NOTES 2006-11-04 07:31:19.000000000 +0100 @@ -0,0 +1,55 @@ +Release notes for xdg-utils 1.0.1 +================================= + +This release fixes: +* Several shell syntax issues causing failures on Ubuntu 6.10 +* Spurious output on stdout when running xdg-desktop-menu +* Non-ascii mailto URI handling of xdg-emial on non-UTF8 locales under KDE + +Release notes for xdg-utils 1.0 +=============================== + +xdg-utils 1.0 has been tested under the Gnome and KDE desktop environments +on Debian, Fedora, Kubuntu, Mandriva, Redhat RHEL4, SUSE, Ubuntu and Xandros +based Linux systems. These release notes reflect test findings. Despite +extensive testing it should be pointed out that xdg-utils is provided AS IS +without warranty of any kind. See the LICENSE file for details. + +* general: + - When installing applications or file types for the current user only + (user mode) it may be necessary to restart the session in order for + the panel and filemanager to show the correct icons. This problem + typically occurs when the installation process required new + (hidden) directories to be created under the user's home directory. + +* xdg-mime: + - xdg-mime query filetype may fail under Gnome on certain Debian + systems that do not have gnomevfs-info installed by default. + +* xdg-desktop-menu: + - On Redhat RHEL 4 systems running Gnome, new submenus will not appear + until the session is restarted. For testing purposes the command + "killall gnome-panel" can be used instead of restarting the session. + It is not recommended to use this as part of installation scripts + though. + + - KDE based desktops may require several seconds to update the + application menu after installing new items. The user may need to + close the applications menu first before new items will show up. + + - On SUSE systems, desktop entries that list any of the standard + menu Categories are often being placed in a "More Programs" submenu + which makes them somewhat hard to find. + +* xdg-screensaver: + - Screensaver locking does not work on KDE under SUSE 10.0 + +* xdg-email: + - Please refer to http://portland.freedesktop.org/wiki/EmailConfig + for additional information on setting up the default E-mail client. + + - With current versions of Mozilla Thunderbird it is not possible to + specify attachments. In order to send an attachment, the user will + need to attach the file manually. + + - Older versions of KMail do not support multiple To or CC recipients. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/TODO new/xdg-utils-1.0.1/TODO --- old/xdg-utils-1.0rc1/TODO 2006-07-22 03:05:11.000000000 +0200 +++ new/xdg-utils-1.0.1/TODO 2006-11-04 07:32:40.000000000 +0100 @@ -6,15 +6,8 @@ xdg-email * revisit decision to disable &attach= in mailto URLs -xdg-mime -* Change "xdg-mime query default" to take a MIMETYPE as argument -instead of a file - xdg-screensaver * Return error when WindowID doesn't exist -* Fix interaction between xset and gnome/kde specific hacks -* gnome-screensaver may get started on resume when it wasn't running -previously General * Support XDG_DATA_INSTALL @@ -29,12 +22,3 @@ * It would be useful if it was possible to distinguish between a failure because of a bad password or some other failure. * use sudo style syntax, drop -c option - -Website -* Add bugs / feedback landing page -* Add xdg-utils overview page. -* Add "How to configure e-mail client" landing page -* Add page to submit test reports - -Release: -* Update ChangeLog diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/Makefile.in new/xdg-utils-1.0.1/scripts/Makefile.in --- old/xdg-utils-1.0rc1/scripts/Makefile.in 2006-09-10 19:57:19.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/Makefile.in 2006-10-26 16:46:32.000000000 +0200 @@ -19,16 +19,17 @@ xdg-icon-resource \ xdg-open \ xdg-email \ - xdg-screensaver + xdg-screensaver # xdg-su # xdg-copy \ # xdg-file-dialog +# xdg-terminal MANPAGES= $(SCRIPTS:%=man/%.1) WEBPAGES= $(SCRIPTS:%=%.html) XMLFILES= $(SCRIPTS:%=desc/%.xml) -all: +all: html: index.html $(WEBPAGES) @@ -40,7 +41,7 @@ rm -f xdg-*.in *~ HACKING generate-help-script.awk rm -rf desc/ rm -rf xsl/ - rm -f xdg-file-dialog xdg-su xdg-copy + rm -f xdg-file-dialog xdg-su xdg-copy xdg-terminal distclean: clean rm -f Makefile @@ -93,6 +94,7 @@ xdg-su: xdg-su.in xdg-utils-common.in xdg-copy: xdg-copy.in xdg-utils-common.in xdg-file-dialog: xdg-file-dialog.in xdg-utils-common.in +xdg-terminal: xdg-terminal.in xdg-utils-common.in man/%.1: desc/%.xml (cd man;$(XMLTO) man ../$<) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/html/xdg-desktop-menu.html new/xdg-utils-1.0.1/scripts/html/xdg-desktop-menu.html --- old/xdg-utils-1.0rc1/scripts/html/xdg-desktop-menu.html 2006-09-20 20:00:20.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/html/xdg-desktop-menu.html 2006-11-04 04:35:34.000000000 +0100 @@ -199,6 +199,11 @@ Setting this environment variable to a non-zero numerical value makes xdg-desktop-menu do more verbose reporting on stderr. Setting a higher value increases the verbosity. + </dd><dt><span class="term">XDG_UTILS_INSTALL_MODE</span></dt><dd> + This environment variable can be used by the user or + administrator to override the installation mode. + Valid values are <span class="emphasis"><em>user</em></span> and + <span class="emphasis"><em>system</em></span>. </dd></dl></div></div><div class="refsect1" lang="en"><a name="exitcodes"></a><h2>Exit Codes</h2><p> An exit code of 0 indicates success while a non-zero exit code indicates failure. The following failure codes can be returned: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/html/xdg-icon-resource.html new/xdg-utils-1.0.1/scripts/html/xdg-icon-resource.html --- old/xdg-utils-1.0rc1/scripts/html/xdg-icon-resource.html 2006-09-20 20:00:27.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/html/xdg-icon-resource.html 2006-11-04 04:35:41.000000000 +0100 @@ -90,6 +90,11 @@ Setting this environment variable to a non-zero numerical value makes xdg-icon-resource do more verbose reporting on stderr. Setting a higher value increases the verbosity. + </dd><dt><span class="term">XDG_UTILS_INSTALL_MODE</span></dt><dd> + This environment variable can be used by the user or + administrator to override the installation mode. + Valid values are <span class="emphasis"><em>user</em></span> and + <span class="emphasis"><em>system</em></span>. </dd></dl></div></div><div class="refsect1" lang="en"><a name="exitcodes"></a><h2>Exit Codes</h2><p> An exit code of 0 indicates success while a non-zero exit code indicates failure. The following failure codes can be returned: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/html/xdg-mime.html new/xdg-utils-1.0.1/scripts/html/xdg-mime.html --- old/xdg-utils-1.0rc1/scripts/html/xdg-mime.html 2006-09-20 20:00:25.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/html/xdg-mime.html 2006-11-04 04:35:38.000000000 +0100 @@ -89,6 +89,11 @@ Setting this environment variable to a non-zero numerical value makes xdg-mime do more verbose reporting on stderr. Setting a higher value increases the verbosity. + </dd><dt><span class="term">XDG_UTILS_INSTALL_MODE</span></dt><dd> + This environment variable can be used by the user or + administrator to override the installation mode. + Valid values are <span class="emphasis"><em>user</em></span> and + <span class="emphasis"><em>system</em></span>. </dd></dl></div></div><div class="refsect1" lang="en"><a name="exitcodes"></a><h2>Exit Codes</h2><p> An exit code of 0 indicates success while a non-zero exit code indicates failure. The following failure codes can be returned: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-desktop-icon.1 new/xdg-utils-1.0.1/scripts/man/xdg-desktop-icon.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-desktop-icon.1 2006-09-20 20:00:38.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-desktop-icon.1 2006-11-04 04:35:52.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-DESKTOP-ICON" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-DESKTOP-ICON" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-desktop-menu.1 new/xdg-utils-1.0.1/scripts/man/xdg-desktop-menu.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-desktop-menu.1 2006-09-20 20:00:36.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-desktop-menu.1 2006-11-04 04:35:50.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-DESKTOP-MENU" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-DESKTOP-MENU" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) @@ -175,6 +175,12 @@ .TP 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. +.TP +XDG_UTILS_INSTALL_MODE +This environment variable can be used by the user or administrator to override the installation mode. Valid values are +\fIuser\fR +and +\fIsystem\fR. .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: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-email.1 new/xdg-utils-1.0.1/scripts/man/xdg-email.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-email.1 2006-09-20 20:00:50.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-email.1 2006-11-04 04:36:01.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-EMAIL" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-EMAIL" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-icon-resource.1 new/xdg-utils-1.0.1/scripts/man/xdg-icon-resource.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-icon-resource.1 2006-09-20 20:00:44.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-icon-resource.1 2006-11-04 04:35:57.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-ICON-RESOURCE" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-ICON-RESOURCE" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) @@ -112,6 +112,12 @@ .TP 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. +.TP +XDG_UTILS_INSTALL_MODE +This environment variable can be used by the user or administrator to override the installation mode. Valid values are +\fIuser\fR +and +\fIsystem\fR. .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: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-mime.1 new/xdg-utils-1.0.1/scripts/man/xdg-mime.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-mime.1 2006-09-20 20:00:41.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-mime.1 2006-11-04 04:35:54.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-MIME" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-MIME" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) @@ -113,6 +113,12 @@ .TP 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. +.TP +XDG_UTILS_INSTALL_MODE +This environment variable can be used by the user or administrator to override the installation mode. Valid values are +\fIuser\fR +and +\fIsystem\fR. .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: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-open.1 new/xdg-utils-1.0.1/scripts/man/xdg-open.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-open.1 2006-09-20 20:00:47.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-open.1 2006-11-04 04:35:59.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-OPEN" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-OPEN" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/man/xdg-screensaver.1 new/xdg-utils-1.0.1/scripts/man/xdg-screensaver.1 --- old/xdg-utils-1.0rc1/scripts/man/xdg-screensaver.1 2006-09-20 20:00:52.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/man/xdg-screensaver.1 2006-11-04 04:36:04.000000000 +0100 @@ -2,7 +2,7 @@ ." It was generated using the DocBook XSL Stylesheets (version 1.69.1). ." Instead of manually editing it, you probably should edit the DocBook XML ." source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "XDG-SCREENSAVER" "1" "09/20/2006" "xdg-utils 1.0" "" +.TH "XDG-SCREENSAVER" "1" "11/03/2006" "xdg-utils 1.0" "" ." disable hyphenation .nh ." disable justification (adjust text to left margin only) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-desktop-icon new/xdg-utils-1.0.1/scripts/xdg-desktop-icon --- old/xdg-utils-1.0rc1/scripts/xdg-desktop-icon 2006-09-20 20:00:06.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-desktop-icon 2006-11-04 04:35:21.000000000 +0100 @@ -378,7 +378,7 @@ ;; --version) - echo "xdg-desktop-icon 1.0" + echo "xdg-desktop-icon 1.0.1" exit_success ;; esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-desktop-menu new/xdg-utils-1.0.1/scripts/xdg-desktop-menu --- old/xdg-utils-1.0rc1/scripts/xdg-desktop-menu 2006-09-20 20:00:04.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-desktop-menu 2006-11-04 04:35:19.000000000 +0100 @@ -252,6 +252,9 @@ 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 @@ -571,7 +574,7 @@ ;; --version) - echo "xdg-desktop-menu 1.0" + echo "xdg-desktop-menu 1.0.1" exit_success ;; esac @@ -632,6 +635,99 @@ fi } +fixup_mandriva_categories() +{ + DEBUG 1 "fixup_mandriva_categories $1" + awk ' +BEGIN { + xlat["AudioVideo"]="X-Mandrakelinux-Multimedia;X-MandrivaLinux-Multimedia" + xlat["Development"]="X-Mandrakelinux-MoreApplications-Development;X-MandrivaLinux-MoreApplications-Development" + xlat["Education"]="X-Mandrakelinux-MoreApplications;X-MandrivaLinux-MoreApplications-Education" + xlat["Game"]="X-Mandrakelinux-MoreApplications;X-MandrivaLinux-MoreApplications-Games" + xlat["Graphics"]="X-Mandrakelinux-Multimedia-Graphics" + xlat["Network"]="X-Mandrakelinux-Internet;X-MandrivaLinux-Internet" + xlat["Office"]="X-Mandrakelinux-Office;X-MandrivaLinux-Office" + xlat["System"]="X-Mandrakelinux-System;X-MandrivaLinux-System" + xlat["Utility"]="X-Mandrakelinux-Office-Accessories;X-MandrivaLinux-Office-Accessories" +} +{ + if (match($0,/Categories=/)) { + split(substr($0,RSTART+11),categories,";") + result="" + for (n in categories) + { + if (categories[n] in xlat) + categories[n]=categories[n] ";" xlat[categories[n]] + if (categories[n]) + result=result categories[n] ";" + } + print "Categories=" result + } + else + { + print $0 + } +}' $1 > $1.new + mv $1.new $1 +} + +# Make application $1/$2 the default for all the mimetypes it support, +# iff such mimetype didn't had a default application already. +# $1 Install dir for desktop file +# $2 base name of desktop file +make_lazy_default() +{ + local mimetypes + local xdg_user_dir + local xdg_default_dirs + + DEBUG 1 "make_lazy_default $1/$2" + mimetypes=`awk ' +{ + if (match($0,/MimeType=/)) { + split(substr($0,RSTART+9),mimetypes,";") + for (n in mimetypes) + { + if (mimetypes[n]) + print mimetypes[n] + } + } +}' "$1/$2" 2> /dev/null` + + for MIME in $mimetypes ; do + xdg_default_dirs="$XDG_DATA_DIRS" + [ -n "$xdg_default_dirs" ] || xdg_default_dirs=/usr/local/share/:/usr/share/ + if [ x"$mode" = x"user" ] ; then + xdg_user_dir="$XDG_DATA_HOME" + [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share" + xdg_default_dirs="$xdg_user_dir:$xdg_default_dirs" + fi + local default_app + for x in `echo "$xdg_default_dirs" | sed 's/:/ /g'`; do + DEBUG 2 "Checking $x/applications/defaults.list" + default_app=`grep "$MIME=" $x/applications/defaults.list 2> /dev/null | cut -d '=' -f 2` + if [ -n "$default_app" ] ; then + DEBUG 2 "Found default apps for $MIME: $default_app" + default_app="$default_app;" + break; + fi + done + DEBUG 2 "Current default apps for $MIME: $default_app" + if echo "$default_app" | grep "$2" > /dev/null 2> /dev/null; then + # App already listed as default + continue; + fi + default_file="$1/defaults.list" + DEBUG 1 "Updating $default_file" + grep -v "$MIME=" $default_file > ${default_file}.new 2> /dev/null + if ! grep "[Default Applications]" ${default_file}.new > /dev/null; then + echo "[Default Applications]" >> ${default_file}.new + fi + echo $MIME="$default_app$2" >> ${default_file}.new + mv ${default_file}.new $default_file + done +} + update_submenu() { DEBUG 1 "update_submenu $1" @@ -699,7 +795,16 @@ mkdir -p `dirname "$gnome_xdg_dir"` eval 'ln -s "applications-merged" "$gnome_xdg_dir"'$xdg_redirect_output fi - fi + fi + if [ $action = "install" -a -f "/etc/mandrake-release" ] ; then + # Work around for Mandriva 2006 + mandrake_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/applications-mdk-merged^'` + if [ ! -e "$mandrake_xdg_dir" ] ; then + DEBUG 1 "Mandriva Workaround: Link '$xdg_dir' to '$mandrake_xdg_dir'" + mkdir -p `dirname "$mandrake_xdg_dir"` + eval 'ln -s "applications-merged" "$mandrake_xdg_dir"'$xdg_redirect_output + fi + fi if [ $action = "install" -a x"$mode" = x"user" -a -d "/etc/xdg/menus/kde-applications-merged" ] ; then # Work around for Fedora Core 5 + patched KDE kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'` @@ -709,7 +814,12 @@ eval 'ln -s "applications-merged" "$kde_xdg_dir"'$xdg_redirect_output fi fi - + if [ $action = "install" -a x"$mode" = x"system" -a -d "/etc/xdg/menus/kde-applications-merged" -a ! -d "/etc/xdg/menus/applications-merged" ] ; then + # Work around for Kubuntu 6.06 + kde_xdg_dir=`echo "$xdg_dir" | sed -e 's^/applications-merged^/kde-applications-merged^'` + DEBUG 1 "Kubuntu Workaround: Link '$xdg_dir' to 'kde-applications-merged'" + eval 'ln -s "kde-applications-merged" "$xdg_dir"'$xdg_redirect_output + fi orig_menu_file=$xdg_dir/$menu_file @@ -879,11 +989,11 @@ fi case "$1" in user) - mode=user + mode="user" ;; system) - mode=system + mode="system" ;; *) @@ -928,11 +1038,19 @@ exit_failure_syntax "command argument missing" fi +if [ -n "$XDG_UTILS_INSTALL_MODE" ] ; then + if [ "$XDG_UTILS_INSTALL_MODE" = "system" ] ; then + mode="system" + elif [ "$XDG_UTILS_INSTALL_MODE" = "user" ] ; then + mode="user" + fi +fi + if [ -z "$mode" ] ; then if [ `whoami` = "root" ] ; then - mode=system + mode="system" else - mode=user + mode="user" fi fi @@ -1065,6 +1183,9 @@ gnome_global_dir="/usr/share/gnome/apps" [ -w $gnome_global_dir ] || gnome_global_dir= +[ -f /etc/mandriva-release ] && need_mandriva_fix=true +[ -n "$need_mandriva_fix" ] && DEBUG 1 "Fixing up .desktop categories (Mandriva work around)" + DEBUG 3 "Install locations for *.desktop files:" DEBUG 3 "xdg_user_dir: $xdg_user_dir" DEBUG 3 "xdg_global_dir: $xdg_global_dir" @@ -1107,6 +1228,10 @@ eval 'cp $desktop_file $x/$basefile'$xdg_redirect_output done + if [ -n "$need_mandriva_fix" ] ; then + fixup_mandriva_categories $xdg_dir/$basefile + fi + if [ -f $kde_dir/$basefile ] ; then echo "OnlyShowIn=Old;" >> $kde_dir/$basefile fi @@ -1114,6 +1239,8 @@ if [ -f $gnome_dir/$basefile ] ; then echo "OnlyShowIn=Old;" >> $gnome_dir/$basefile fi + + make_lazy_default "$xdg_dir" "$basefile" umask $save_umask ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-email new/xdg-utils-1.0.1/scripts/xdg-email --- old/xdg-utils-1.0rc1/scripts/xdg-email 2006-09-20 20:00:15.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-email 2006-11-04 04:35:29.000000000 +0100 @@ -330,7 +330,7 @@ ;; --version) - echo "xdg-email 1.0" + echo "xdg-email 1.0.1" exit_success ;; esac @@ -379,8 +379,22 @@ open_kde() { - DEBUG 1 "Running kfmclient exec "$1"" - kfmclient exec "$1" + local client + if [ -f /etc/SuSE-release ] ; then + # Workaround for SUSE 10.0 + client=`kreadconfig --file emaildefaults --group PROFILE_Default --key EmailClient| cut -d ' ' -f 1` + [ -z $client ] && client="kmail" + if ! which $client > /dev/null 2> /dev/null; then + DEBUG 3 "KDE has $client configured as email client which isn't installed" + if which gnome-open > /dev/null 2> /dev/null && which evolution > /dev/null 2> /dev/null; then + DEBUG 3 "Try gnome-open instead" + open_gnome "$1" + fi + fi + fi + DEBUG 1 "Running kmailservice "$1"" + # KDE uses locale's encoding when decoding the URI, so set it to UTF-8 + LC_ALL=C.UTF-8 kmailservice "$1" kfmclient_fix_exit_code $? if [ $? -eq 0 ]; then @@ -439,23 +453,24 @@ { result=$(echo "$1" | $utf8 | awk ' BEGIN { - for ( i=1; i<=255; ++i ) ord [ sprintf ("%c", i) "" ] = i + 0 - e = "" - linenr = 1 + for ( i=1; i<=255; ++i ) ord [ sprintf ("%c", i) "" ] = i + 0 + e = "" + linenr = 1 } { if ( linenr++ != 1 ) { e = e "%0D%0A" } - for ( i=1; i<=length ($0); ++i ) { - c = substr ($0, i, 1) - if ( c ~ /[@a-zA-Z0-9.-]/ ) { - e = e c - } else { - e = e "%" sprintf("%02X", ord [c]) - } - } - + for ( i=1; i<=length ($0); ++i ) { + c = substr ($0, i, 1) + if ( ord [c] > 127 ) { + e = e "%" sprintf("%02X", ord [c]) + } else if ( c ~ /[@a-zA-Z0-9.-]/ ) { + e = e c + } else { + e = e "%" sprintf("%02X", ord [c]) + } + } } END { print e diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-icon-resource new/xdg-utils-1.0.1/scripts/xdg-icon-resource --- old/xdg-utils-1.0rc1/scripts/xdg-icon-resource 2006-09-20 20:00:11.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-icon-resource 2006-11-04 04:35:25.000000000 +0100 @@ -136,6 +136,9 @@ 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 @@ -367,7 +370,7 @@ ;; --version) - echo "xdg-icon-resource 1.0" + echo "xdg-icon-resource 1.0.1" exit_success ;; esac @@ -433,7 +436,7 @@ } # Start GNOME legacy workaround section -function need_dot_icon_path() +need_dot_icon_path() { # GTK < 2.6 uses ~/.icons but not XDG_DATA_HOME/icons # The availability of gtk-update-icon-cache is used as indication @@ -507,11 +510,11 @@ fi case "$1" in user) - mode=user + mode="user" ;; system) - mode=system + mode="system" ;; *) @@ -533,11 +536,9 @@ if [ -z "$1" ] ; then exit_failure_syntax "size argument missing for --size" fi - case "$1" in - *[^0-9]*) + if echo "$1" | grep '[^0-9]' > /dev/null 2> /dev/null; then exit_failure_syntax "size argument must be numeric" - ;; - esac + fi size="$1" shift ;; @@ -583,11 +584,19 @@ exit_failure_syntax "context argument missing" fi +if [ -n "$XDG_UTILS_INSTALL_MODE" ] ; then + if [ "$XDG_UTILS_INSTALL_MODE" = "system" ] ; then + mode="system" + elif [ "$XDG_UTILS_INSTALL_MODE" = "user" ] ; then + mode="user" + fi +fi + if [ -z "$mode" ] ; then if [ `whoami` = "root" ] ; then - mode=system + mode="system" else - mode=user + mode="user" fi fi @@ -682,7 +691,7 @@ fi # Start KDE legacy workaround section -function need_kde_icon_path() +need_kde_icon_path() { local path path=`readlink -f "$1" 2> /dev/null` # Normalize path diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-mime new/xdg-utils-1.0.1/scripts/xdg-mime --- old/xdg-utils-1.0rc1/scripts/xdg-mime 2006-09-20 20:00:08.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-mime 2006-11-04 04:35:23.000000000 +0100 @@ -148,6 +148,9 @@ 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 @@ -396,7 +399,7 @@ ;; --version) - echo "xdg-mime 1.0" + echo "xdg-mime 1.0.1" exit_success ;; esac @@ -547,25 +550,8 @@ mv ${default_file}.new $default_file } - -defapp_kde() -{ - MIME="$1" - DEBUG 1 "Running ktradertest "$MIME" Application" - trader_result=`ktradertest "$MIME" Application 2>/dev/null | grep DesktopEntryPath \ - | head -n 1 | cut -d ':' -f 2 | cut -d ' -f 2` - if [ -n "$trader_result" ] ; then - basename "$trader_result" - exit_success - else - exit_failure_operation_failed - fi -} - defapp_generic() { -# FIXME: -# Find XDG-DATA-DIRS/applications/defaults.list MIME="$1" xdg_user_dir="$XDG_DATA_HOME" [ -n "$xdg_user_dir" ] || xdg_user_dir="$HOME/.local/share" @@ -584,6 +570,25 @@ exit_success } +defapp_kde() +{ + MIME="$1" + ktradertest=`which ktradertest 2> /dev/null` + if [ -n "$ktradertest" ] ; then + DEBUG 1 "Running ktradertest "$MIME" Application" + trader_result=`ktradertest "$MIME" Application 2>/dev/null | grep DesktopEntryPath \ + | head -n 1 | cut -d ':' -f 2 | cut -d ' -f 2` + if [ -n "$trader_result" ] ; then + basename "$trader_result" + exit_success + else + exit_failure_operation_failed + fi + else + defapp_generic "$1" + fi +} + [ x"$1" != x"" ] || exit_failure_syntax mode= @@ -752,11 +757,11 @@ fi case "$1" in user) - mode=user + mode="user" ;; system) - mode=system + mode="system" ;; *) @@ -789,11 +794,19 @@ exit_failure_syntax "command argument missing" fi +if [ -n "$XDG_UTILS_INSTALL_MODE" ] ; then + if [ "$XDG_UTILS_INSTALL_MODE" = "system" ] ; then + mode="system" + elif [ "$XDG_UTILS_INSTALL_MODE" = "user" ] ; then + mode="user" + fi +fi + if [ -z "$mode" ] ; then if [ `whoami` = "root" ] ; then - mode=system + mode="system" else - mode=user + mode="user" fi fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-open new/xdg-utils-1.0.1/scripts/xdg-open --- old/xdg-utils-1.0rc1/scripts/xdg-open 2006-09-20 20:00:13.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-open 2006-11-04 04:35:27.000000000 +0100 @@ -277,7 +277,7 @@ ;; --version) - echo "xdg-open 1.0" + echo "xdg-open 1.0.1" exit_success ;; esac diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/scripts/xdg-screensaver new/xdg-utils-1.0.1/scripts/xdg-screensaver --- old/xdg-utils-1.0rc1/scripts/xdg-screensaver 2006-09-20 20:00:17.000000000 +0200 +++ new/xdg-utils-1.0.1/scripts/xdg-screensaver 2006-11-04 04:35:32.000000000 +0100 @@ -307,7 +307,7 @@ ;; --version) - echo "xdg-screensaver 1.0" + echo "xdg-screensaver 1.0.1" exit_success ;; esac @@ -396,12 +396,22 @@ perform_action() { - # Always set the Xorg screensaver first - #screensaver_xset "$1" - #xset_err=$? - xset_err=0 result=1 - + + if [ "$1" = "resume" ] ; then + # Restore DPMS state + if [ -f "$screensaver_file.dpms" ]; then + rm "$screensaver_file.dpms" + # Re-enable DPMS + xset +dpms + fi + fi + if [ "$1" = "reset" ] ; then + if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then + xset dpms force on + fi + fi + case "$DE" in kde) screensaver_kde "$1" @@ -415,6 +425,17 @@ screensaver_xscreensaver "$1" ;; esac + + if [ "$1" = "suspend" ] ; then + # Save DPMS state + if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then + tmpfile=`mktemp` + $MV "$tmpfile" "$screensaver_file.dpms" + # Disable DPMS + xset -dpms + fi + fi + } cleanup_suspend() @@ -511,50 +532,6 @@ cleanup_suspend } -screensaver_xset() -{ - TIMEOUT=`xset q | /bin/grep -A 2 ^Screen | /bin/grep timeout | awk '{print $2}'` - DPMS=`xset q | /bin/grep 'DPMS is' | awk '{print $3}'` - - if [ "$DPMS" = "Enabled" ]; then - DPMS="+dpms" - else - DPMS="-dpms" - fi - - case "$1" in - # New arg Window ID, create lockfile with $WINDOWID - suspend) - xset s off -dpms - ;; - - resume) - # Restores screensaver to its default settings - xset s default "$DPMS" - ;; - - activate) - # Turns the screensaver on right now - xset s activate - ;; - - reset) - # Turns the screensaver off right now - xset s reset - ;; - - status) - if [ ${TIMEOUT:0} -eq 0 ]; then - echo "disabled" - else - echo "enabled" - fi - ;; - esac - - return $? -} - screensaver_kde() { case "$1" in @@ -800,8 +777,6 @@ if [ $result -eq 0 ]; then exit_success -#elif [ $xset_err -eq 0 ]; then -# exit_success else exit_failure_operation_failed fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/tests/xdg-desktop-menu/data/kde_xdg_dir new/xdg-utils-1.0.1/tests/xdg-desktop-menu/data/kde_xdg_dir --- old/xdg-utils-1.0rc1/tests/xdg-desktop-menu/data/kde_xdg_dir 2006-11-06 22:25:04.000000000 +0100 +++ new/xdg-utils-1.0.1/tests/xdg-desktop-menu/data/kde_xdg_dir 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to /home/bastian/.config/menus/applications-merged diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xdg-utils-1.0rc1/tests/xdg-utils-usecases/t.01-default_mime_launch new/xdg-utils-1.0.1/tests/xdg-utils-usecases/t.01-default_mime_launch --- old/xdg-utils-1.0rc1/tests/xdg-utils-usecases/t.01-default_mime_launch 2006-09-11 21:41:17.000000000 +0200 +++ new/xdg-utils-1.0.1/tests/xdg-utils-usecases/t.01-default_mime_launch 2006-10-04 19:46:52.000000000 +0200 @@ -40,11 +40,6 @@ assert_nostdout assert_nostderr -# Set default handler -assert_exit 0 xdg-mime default "$DESKTOP_FILE" "$MIME_TYPE" -assert_nostdout -assert_nostderr - # Verify mimetype echo "$MIME_TYPE" >out.expected assert_exit 0 xdg-mime query filetype "$TEST_FILE" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org