diff -Nru xdg-utils-1.1.0~rc1/debian/changelog xdg-utils-1.1.0~rc1/debian/changelog --- xdg-utils-1.1.0~rc1/debian/changelog 2011-04-08 13:14:45.000000000 -0700 +++ xdg-utils-1.1.0~rc1/debian/changelog 2011-05-07 18:35:18.000000000 -0700 @@ -1,3 +1,17 @@ +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: diff -Nru xdg-utils-1.1.0~rc1/debian/patches/debian-changes-1.1.0~rc1-2ubuntu4 xdg-utils-1.1.0~rc1/debian/patches/debian-changes-1.1.0~rc1-2ubuntu4 --- xdg-utils-1.1.0~rc1/debian/patches/debian-changes-1.1.0~rc1-2ubuntu4 1969-12-31 16:00:00.000000000 -0800 +++ xdg-utils-1.1.0~rc1/debian/patches/debian-changes-1.1.0~rc1-2ubuntu4 2011-05-07 18:35:30.000000000 -0700 @@ -0,0 +1,148 @@ +Description: Upstream changes introduced in version 1.1.0~rc1-2ubuntu4 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + 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). + . + The person named in the Author field signed this changelog entry. +Author: Jonathan Marsden + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- xdg-utils-1.1.0~rc1.orig/scripts/xdg-mime ++++ xdg-utils-1.1.0~rc1/scripts/xdg-mime +@@ -431,6 +431,7 @@ detectDE() + 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; + elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; ++ elif [ x"XDG_CURRENT_DESKTOP" = x"LXDE" ]; then DE=lxde; + else DE="" + fi + } +@@ -670,6 +671,8 @@ make_default_generic() + default_file="$xdg_user_dir/applications/mimeapps.list" + DEBUG 2 "make_default_generic $1 $2" + DEBUG 1 "Updating $default_file" ++ mkdir -p `dirname "$default_file"` ++ touch "$default_file" + awk -v mimetype="$2" -v application="$1" ' + BEGIN { + prefix=mimetype "=" +--- xdg-utils-1.1.0~rc1.orig/scripts/xdg-email ++++ xdg-utils-1.1.0~rc1/scripts/xdg-email +@@ -321,7 +321,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- | first_word`" ++ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/ .*$//'`" + command="`which "$command"`" + readlink -f "$command" + return +@@ -380,11 +380,13 @@ detectDE() + 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; + elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde; ++ elif [ x"$XDG_CURRENT_DESKTOP" = x"LXDE" ]; then DE=lxde; + elif [ -r ~/.muttrc ] && which mutt > /dev/null 2>&1; then + DE=envvar + MAILER="x-terminal-emulator -e mutt" + else DE="" + fi ++ DEBUG 2 "DE is \"$DE\"" + } + + #---------------------------------------------------------------------------- +@@ -456,6 +458,17 @@ run_thunderbird() + 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() + { + local client kde_email_profile_name +@@ -550,6 +563,39 @@ open_envvar() + 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() + { + IFS=":" +@@ -761,7 +807,11 @@ case "$DE" in + open_xfce "${mailto}" + ;; + +- generic|lxde) ++ lxde) ++ open_lxde "${mailto}" ++ ;; ++ ++ generic) + open_generic "${mailto}" + ;; + diff -Nru xdg-utils-1.1.0~rc1/debian/patches/series xdg-utils-1.1.0~rc1/debian/patches/series --- xdg-utils-1.1.0~rc1/debian/patches/series 2011-04-08 01:46:55.000000000 -0700 +++ xdg-utils-1.1.0~rc1/debian/patches/series 2011-05-07 18:31:18.000000000 -0700 @@ -9,3 +9,4 @@ xdg-open-printf.diff xdg-update-menu-caonicalize-defaults.list.diff gnome-3.0.diff +debian-changes-1.1.0~rc1-2ubuntu4