diff -Nru xdg-utils-1.1.1/debian/changelog xdg-utils-1.1.1/debian/changelog --- xdg-utils-1.1.1/debian/changelog 2015-10-05 21:19:25.000000000 +0200 +++ xdg-utils-1.1.1/debian/changelog 2016-01-06 14:53:26.000000000 +0100 @@ -1,3 +1,16 @@ +xdg-utils (1.1.1-1ubuntu1) xenial; urgency=low + + * Merge from Debian unstable (LP: #1531504). Remaining changes: + - d/p/handle-multiple-exec-lines.patch + - d/p/filenames-with-spaces.patch + - d/p/gnome-3.0.diff + - d/p/lp779156-lubuntu.diff + - d/p/xdg-screensaver-restore-timeout.diff + - drop filenames-with-spaces.patch: upstream + - refresh patches. + + -- Gianfranco Costamagna Wed, 06 Jan 2016 14:48:36 +0100 + xdg-utils (1.1.1-1) unstable; urgency=medium * New upstream release. @@ -74,6 +87,43 @@ -- Per Olofsson Tue, 15 Sep 2015 07:06:25 +0200 +xdg-utils (1.1.0~rc3+git20150907-1ubuntu3) xenial; urgency=medium + + [ Iuri Chaer ] + * debian/patches/handle-multiple-exec-lines.patch: + - Handle desktop files (like Chrome's) that have more than one + Exec line in them. LP: #1511154 + + -- Michael Terry Thu, 19 Nov 2015 16:56:07 -0500 + +xdg-utils (1.1.0~rc3+git20150907-1ubuntu2) wily; urgency=medium + + [ MestreLion ] + * debian/patches/filenames-with-spaces.patch: + - Fix xdg-icon-resource not handling files with spaces (LP: #1488787) + + -- Michael Terry Wed, 16 Sep 2015 16:31:44 -0400 + +xdg-utils (1.1.0~rc3+git20150907-1ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: (LP: #1495273) + - debian/patches: + * gnome-3.0.diff: Correctly open preferred browser with + gnome-open (LP: #670128) + * lp779156-lubuntu.diff: Add open_lxde and run_sylpheed function + for improved LXDE and sylpheed support (LP: #779156) + * xdg-screensaver-restore-timeout.diff: restore previous X11 + screensaver timeout when xdg-screensaver resume is used (LP: #1363540) + * New upstream release fixes the following bugs: + - xdg-mime query filetype does not work on KDE 5 (LP: #1454833) + - xdg-open doesn't properly detect Xfce/Xubuntu (LP: #1388922) + - xserver-blanking patch in Ubuntu duplicates code (LP: #1330386) + - Typo in manpage of 'xdg-icon-resource' (LP: #996304) + - xdg-open (to gnome-open) fails to launch file:// URL with query string + (LP: #396162) + + -- Sean Davis Sun, 13 Sep 2015 12:39:10 -0400 + xdg-utils (1.1.0~rc3+git20150907-1) unstable; urgency=medium * New upstream release. Closes: #773753, #754219. @@ -226,6 +276,107 @@ -- Per Olofsson Sun, 20 Nov 2011 17:38:38 +0100 +xdg-utils (1.1.0~rc1-2ubuntu11) wily; urgency=medium + + * Add patch mate-support.diff to add MATE compatibility. + (LP: #1001902) (LP: #1457018) + + -- Martin Wimpress Thu, 28 May 2015 09:46:29 +0100 + +xdg-utils (1.1.0~rc1-2ubuntu10) vivid; urgency=medium + + * Modify patch xfce-blanking.diff to reflect upstream change + + -- Thaddaeus Tintenfisch Fri, 23 Jan 2015 20:51:24 +0100 + +xdg-utils (1.1.0~rc1-2ubuntu9) vivid; urgency=medium + + [ Thaddaeus Tintenfisch ] + * Add patch xdg-screensaver-restore-timeout.diff to restore previous + X11 screensaver timeout when xdg-screensaver resume is used + (LP: #1363540) + + [ Simon Steinbeiß ] + * Drop duplicate code/patch for xserver-blanking + + -- Didier Roche Thu, 22 Jan 2015 15:43:06 +0100 + +xdg-utils (1.1.0~rc1-2ubuntu8) utopic; urgency=medium + + * Add patch xfce-blanking.diff to prevent screenblanking in Xfce when + XScreensaver isn't installed/used + + -- Simon Steinbeiss Wed, 16 Jul 2014 11:19:43 +0200 + +xdg-utils (1.1.0~rc1-2ubuntu7) raring; urgency=low + + * Mark as Multi-Arch: foreign (Closes: #688681, LP: #1123710) + + -- Scott Ritchie Wed, 20 Mar 2013 19:37:26 +0100 + +xdg-utils (1.1.0~rc1-2ubuntu6) oneiric; urgency=low + + * Use D-Bus API for GNOME screensaver + - debian/patches/xdg-screensaver-dbus.patch + - LP: #805386 + + -- Daniel Hahler Mon, 03 Oct 2011 16:06:10 +0200 + +xdg-utils (1.1.0~rc1-2ubuntu5) oneiric; urgency=low + + * rename debian/patches/debian-changes-1.1.0~rc1-2ubuntu4 to + lp779156-lubuntu.diff and make DEP-3 compliant. Correctly reference + LP: #779156 so the bug gets auto-closed. + + -- Jamie Strandboge Wed, 13 Jul 2011 08:50:04 -0500 + +xdg-utils (1.1.0~rc1-2ubuntu4) oneiric; urgency=low + + * scripts/xdg-mime: + - Fix detectDE to detect LXDE. + - Create ~/.local/share/applications/mimeapps.list when needed in + non-gnome/kde environments. + + * scripts/xdg-email: + - Fix detectDE to detect LXDE. + - Added open_lxde shell function, used when LXDE detected. + - Added run_sylpheed function, used to call sylpheed (LP: 779156). + + -- Jonathan Marsden Sat, 07 May 2011 18:12:59 -0700 + +xdg-utils (1.1.0~rc1-2ubuntu3) natty; urgency=low + + * No-change rebuild to correct archive vs bzr tree delta: + lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911 + + -- Kees Cook Fri, 08 Apr 2011 13:13:57 -0700 + +xdg-utils (1.1.0~rc1-2ubuntu2) natty; urgency=low + + * Fix LP: #670128 - gnome-open uses firefox while it's not the preferred + browser. Backport upstream changes to use the x-scheme-handler types + for checking/setting the default browser/mail client in xdg-settings + and xdg-email. In addition to this, we fix xdg-mime to get/set + default mimetype handlers using the users mimeapps.list, rather than + the defaults.list, which doesn't work anywhere + - add debian/patches/gnome-3.0.diff + - update debian/patches/series + + -- Chris Coulson Fri, 08 Apr 2011 02:00:05 +0100 + +xdg-utils (1.1.0~rc1-2ubuntu1) natty; urgency=low + + [ Martin Pitt ] + * Add xdg-update-menu-caonicalize-defaults.list.diff: Don't overwrite a + /usr/share/applications/defaults.list symlink. Thanks to Joel Ebel for the + original patch! (LP: #703106) + + [ Scott Ritchie ] + * debian/patches/xdg-generic-use-mimetype.diff: + - Update to fallback to generic on Gnome (LP: #602799) + + -- Martin Pitt Wed, 30 Mar 2011 13:11:39 +0200 + xdg-utils (1.1.0~rc1-2) unstable; urgency=low * Tag patches with upstream bug URLs. diff -Nru xdg-utils-1.1.1/debian/control xdg-utils-1.1.1/debian/control --- xdg-utils-1.1.1/debian/control 2015-10-05 21:15:40.000000000 +0200 +++ xdg-utils-1.1.1/debian/control 2015-11-20 05:12:30.000000000 +0100 @@ -1,5 +1,6 @@ Source: xdg-utils -Maintainer: Per Olofsson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Per Olofsson Uploaders: Fathi Boudra Section: utils Priority: optional diff -Nru xdg-utils-1.1.1/debian/patches/gnome-3.0.diff xdg-utils-1.1.1/debian/patches/gnome-3.0.diff --- xdg-utils-1.1.1/debian/patches/gnome-3.0.diff 1970-01-01 01:00:00.000000000 +0100 +++ xdg-utils-1.1.1/debian/patches/gnome-3.0.diff 2016-01-04 15:24:25.000000000 +0100 @@ -0,0 +1,90 @@ +Description: Make the default mail client and browser settings work with the + x-scheme-handler method of registering URI handlers in gnome3. Note, this is loosely + based on http://cgit.freedesktop.org/xdg/xdg-utils/commit/?id=6f49c05ceb2a1935d07c49c2e100b5cf3cdf5f26, + however, we don't maintain separate methods for gnome and gnome3. The upstream gnome3 + detection doesn't work on Natty because we're not really using gnome3. In addition to this, + when we set the defaults we use both the new and old methods so that we preserve the + functionality of legacy apps using gnomevfs. + + This also contains additional changes to get/set default mimetype handlers from the users + mimeapps.list rather than defaults.list, which isn't used by anything + (see http://www.freedesktop.org/wiki/Specifications/mime-actions-spec) +Author: Bastien Nocera +Author: Chris Coulson +Bug-Ubuntu: https://launchpad.net/bugs/670128 +Last-Update: 2015-09-13 + +--- a/scripts/xdg-email.in ++++ b/scripts/xdg-email.in +@@ -162,7 +162,9 @@ + open_gnome() + { + local client +- client=`gconftool-2 --get /desktop/gnome/url-handlers/mailto/command | cut -d ' ' -f 1` || "" ++ local desktop ++ desktop=`xdg-mime query default "x-scheme-handler/mailto"` ++ client=`desktop_file_to_binary "$browser"` + echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 + if [ $? -eq 0 ] ; then + run_thunderbird "$client" "$1" +--- a/scripts/xdg-settings.in ++++ b/scripts/xdg-settings.in +@@ -257,32 +257,32 @@ + + get_browser_gnome() + { +- binary="`gconftool-2 --get /desktop/gnome/applications/browser/exec | first_word`" +- if [ x"$binary" = x ]; then +- # No default browser; GNOME might use the MIME type text/html. +- get_browser_mime +- else +- # gconftool gives the binary (maybe with %s etc. afterward), +- # but we want the desktop file name, not the binary. So, we +- # have to find the desktop file to which it corresponds. +- desktop="`binary_to_desktop_file "$binary"`" +- basename "$desktop" +- fi ++ get_browser_mime "x-scheme-handler/http" + } + + check_browser_gnome() + { ++ desktop="$1" + check="`desktop_file_to_binary "$1"`" + if [ -z "$check" ]; then + echo no + exit_success + fi ++ # Check HTTP and HTTPS, but not about: and unknown:, using the GNOME 3 scheme. ++ for protocol in http https; do ++ browser="`get_browser_mime "x-scheme-handler/$protocol"`" ++ if [ x"$browser" != x"$desktop" ]; then ++ echo no ++ exit_success ++ fi ++ done ++ + binary="`gconftool-2 --get /desktop/gnome/applications/browser/exec | first_word`" + if [ x"$binary" != x"$check" ]; then + echo no + exit_success + fi +- # Check HTTP and HTTPS, but not about: and unknown:. ++ # Check HTTP and HTTPS, but not about: and unknown:, using the legacy GNOME scheme. + for protocol in http https; do + binary="`gconftool-2 --get /desktop/gnome/url-handlers/$protocol/command | first_word`" + if [ x"$binary" != x"$check" ]; then +@@ -306,7 +306,12 @@ + [ "$binary" ] || exit_failure_file_missing + set_browser_mime "$1" || return + +- # Set the default browser. ++ # Set the default browser using the GNOME 3 scheme. ++ for protocol in http https about unknown; do ++ set_browser_mime "$1" "x-scheme-handler/$protocol" || return ++ done ++ ++ # Set the default browser using the legacy GNOME scheme. + gconftool-2 --type string --set /desktop/gnome/applications/browser/exec "$binary" + gconftool-2 --type bool --set /desktop/gnome/applications/browser/needs_term false + gconftool-2 --type bool --set /desktop/gnome/applications/browser/nremote true diff -Nru xdg-utils-1.1.1/debian/patches/handle-multiple-exec-lines.patch xdg-utils-1.1.1/debian/patches/handle-multiple-exec-lines.patch --- xdg-utils-1.1.1/debian/patches/handle-multiple-exec-lines.patch 1970-01-01 01:00:00.000000000 +0100 +++ xdg-utils-1.1.1/debian/patches/handle-multiple-exec-lines.patch 2016-01-04 15:32:10.000000000 +0100 @@ -0,0 +1,36 @@ +Index: xdg-utils-1.1.0~rc3+git20150907/scripts/xdg-settings.in +=================================================================== +--- xdg-utils-1.1.0~rc3+git20150907.orig/scripts/xdg-settings.in ++++ xdg-utils-1.1.0~rc3+git20150907/scripts/xdg-settings.in +@@ -426,7 +426,7 @@ check_xfce_desktop_file() + 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' | head -1) ++ command=$(grep -E '^Exec(\[[^]=]*])?=' "$file" | head -n1 | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g') + 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). + # Change %F, %f, %U, and %u to "%s". +Index: xdg-utils-1.1.0~rc3+git20150907/scripts/xdg-utils-common.in +=================================================================== +--- xdg-utils-1.1.0~rc3+git20150907.orig/scripts/xdg-utils-common.in ++++ xdg-utils-1.1.0~rc3+git20150907/scripts/xdg-utils-common.in +@@ -37,7 +37,7 @@ binary_to_desktop_file() + grep -q "^Exec.*$base" "$file" || continue + # Make sure it's a visible desktop file (e.g. not "preferred-web-browser.desktop"). + grep -Eq "^(NoDisplay|Hidden)=true" "$file" && continue +- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`" ++ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | head -n1 | cut -d= -f 2- | first_word`" + command="`which "$command"`" + if [ x"`readlink -f "$command"`" = x"$binary" ]; then + # Fix any double slashes that got added path composition +@@ -62,7 +62,7 @@ desktop_file_to_binary() + file="$dir/applications/$desktop" + [ -r "$file" ] || continue + # Remove any arguments (%F, %f, %U, %u, etc.). +- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/ .*$//'`" ++ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | head -n1 | cut -d= -f 2- | sed -e 's/ .*$//'`" + command="`which "$command"`" + readlink -f "$command" + return diff -Nru xdg-utils-1.1.1/debian/patches/lp779156-lubuntu.diff xdg-utils-1.1.1/debian/patches/lp779156-lubuntu.diff --- xdg-utils-1.1.1/debian/patches/lp779156-lubuntu.diff 1970-01-01 01:00:00.000000000 +0100 +++ xdg-utils-1.1.1/debian/patches/lp779156-lubuntu.diff 2016-01-04 15:24:39.000000000 +0100 @@ -0,0 +1,94 @@ +Author: Jonathan Marsden +Description: update for LXDE + * scripts/xdg-email: + - Added open_lxde shell function, used when LXDE detected. + - Added run_sylpheed function, used to call sylpheed (LP: 779156). +Bug-Ubuntu: https://launchpad.net/bugs/779156 +Last-Update: 2015-09-13 + +Index: xdg-utils-1.1.1/scripts/xdg-utils-common.in +=================================================================== +--- xdg-utils-1.1.1.orig/scripts/xdg-utils-common.in ++++ xdg-utils-1.1.1/scripts/xdg-utils-common.in +@@ -62,7 +62,7 @@ + file="$dir/applications/$desktop" + [ -r "$file" ] || continue + # Remove any arguments (%F, %f, %U, %u, etc.). +- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`" ++ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/ .*$//'`" + command="`which "$command"`" + readlink -f "$command" + return +Index: xdg-utils-1.1.1/scripts/xdg-email.in +=================================================================== +--- xdg-utils-1.1.1.orig/scripts/xdg-email.in ++++ xdg-utils-1.1.1/scripts/xdg-email.in +@@ -82,6 +82,17 @@ + fi + } + ++run_sylpheed() ++{ ++ DEBUG 1 "Running $1 --compose \"$2\"" ++ "$1" --compose "$2" ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi ++} ++ + open_kde() + { + if [ -n "$KDE_SESSION_VERSION" ] && [ "$KDE_SESSION_VERSION" -ge 5 ]; then +@@ -215,6 +226,39 @@ + exit_failure_operation_failed + } + ++open_lxde() ++{ ++ DEBUG 3 "Running open_lxde \"$1\"" ++ ++ local client ++ local desktop ++ desktop=`xdg-mime query default "x-scheme-handler/mailto"` ++ client=`desktop_file_to_binary "$desktop"` ++ ++ # If no xdg-mime default was set, ++ # and if we are running Lubuntu, fallback to sylpheed ++ if [ -z "$desktop" -a "$DESKTOP_SESSION" = "Lubuntu" ]; then ++ client=`desktop_file_to_binary "sylpheed.desktop"` ++ fi ++ ++ echo $client | grep thunderbird > /dev/null 2>&1 ++ if [ $? -eq 0 ] ; then ++ run_thunderbird "$client" "$1" ++ fi ++ ++ echo $client | grep sylpheed > /dev/null 2>&1 ++ if [ $? -eq 0 ] ; then ++ DEBUG 3 "Running run_sylpheed \"$client\" \"$1\"" ++ run_sylpheed "$client" "$1" ++ fi ++ ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi ++} ++ + open_generic() + { + local client +@@ -461,6 +505,10 @@ + open_xfce "${mailto}" + ;; + ++ lxde) ++ open_lxde "${mailto}" ++ ;; ++ + generic) + open_generic "${mailto}" + ;; diff -Nru xdg-utils-1.1.1/debian/patches/series xdg-utils-1.1.1/debian/patches/series --- xdg-utils-1.1.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ xdg-utils-1.1.1/debian/patches/series 2016-01-04 15:25:50.000000000 +0100 @@ -0,0 +1,4 @@ +gnome-3.0.diff +lp779156-lubuntu.diff +xdg-screensaver-restore-timeout.diff +handle-multiple-exec-lines.patch diff -Nru xdg-utils-1.1.1/debian/patches/xdg-screensaver-restore-timeout.diff xdg-utils-1.1.1/debian/patches/xdg-screensaver-restore-timeout.diff --- xdg-utils-1.1.1/debian/patches/xdg-screensaver-restore-timeout.diff 1970-01-01 01:00:00.000000000 +0100 +++ xdg-utils-1.1.1/debian/patches/xdg-screensaver-restore-timeout.diff 2016-01-04 15:24:42.000000000 +0100 @@ -0,0 +1,51 @@ +Description: Restore previous X11 screensaver timeout (xdg-screensaver) +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88210 +Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/xdg-utils/+bug/1363540 +Author: Thaddaeus Tintenfisch +Last-Update: 2015-09-13 + +Index: xdg-utils-1.1.1/scripts/xdg-screensaver.in +=================================================================== +--- xdg-utils-1.1.1.orig/scripts/xdg-screensaver.in ++++ xdg-utils-1.1.1/scripts/xdg-screensaver.in +@@ -372,16 +372,29 @@ + esac + } + ++xset_screensaver_timeout() ++{ ++ xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d' ++} ++ + screensaver_xserver() + { + case "$1" in + suspend) +- xset s off > /dev/null ++ timeout=`xset_screensaver_timeout` ++ if [ "$timeout" -gt 0 ]; then ++ echo "$timeout" > "$screensaver_file.xset" ++ xset s off > /dev/null ++ fi + result=$? + ;; + + resume) +- xset s default > /dev/null ++ if [ -f "$screensaver_file.xset" ] ; then ++ value=`cat "$screensaver_file.xset"` ++ xset s $value > /dev/null ++ rm -f "$screensaver_file.xset" ++ fi + result=$? + ;; + +@@ -396,7 +409,7 @@ + ;; + + status) +- timeout=`xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'` ++ timeout=`xset_screensaver_timeout` + result=$? + if [ "$timeout" -gt 0 ]; then + echo "enabled"