--- xdg-utils-1.0.orig/debian/watch +++ xdg-utils-1.0/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/beta/~beta/" \ + http://portland.freedesktop.org/download/xdg-utils-(\d+\..*)\.tgz --- xdg-utils-1.0.orig/debian/compat +++ xdg-utils-1.0/debian/compat @@ -0,0 +1 @@ +5 --- xdg-utils-1.0.orig/debian/changelog +++ xdg-utils-1.0/debian/changelog @@ -0,0 +1,67 @@ +xdg-utils (1.0-0ubuntu2.1) edgy-proposed; urgency=low + + * Add edgy_dash_fixes with fixes for Dash shell from 1.0.1. + Closes Malone No 74408. Approved by MOTU-SRU team. + + -- Jonathan Riddell Mon, 4 Dec 2006 17:43:44 +0000 + +xdg-utils (1.0-0ubuntu2) edgy; urgency=low + + * Fix debian/patches/xdg-email-generic to not duplicate existing code + + -- Jonathan Riddell Thu, 12 Oct 2006 12:08:59 +0100 + +xdg-utils (1.0-0ubuntu1) edgy; urgency=low + + * New upstream release. + * debian/patches/xdg-email-generic: + - updated, part of it is used upstream. + + -- Daniel Holbach Wed, 11 Oct 2006 22:50:22 +0200 + +xdg-utils (1.0~rc1-0ubuntu1) edgy; urgency=low + + * New upstream release + * Add portland to package description for easier searching + + -- Jonathan Riddell Sun, 24 Sep 2006 11:15:07 +0100 + +xdg-utils (1.0~beta3-1) unstable; urgency=low + + * New upstream release. + - xdg-su is gone. + * Fix xfce support in xdg-open. Closes: #382836. + * Added debian/watch. + * Check for icon-theme.cache before running gtk-update-icon-cache. If we + create a cache where none was, things will break for other packages. + * Disable tests-clean rule (does nasty things). + * Added postinst/prerm which create/remove the following directories in + /usr/local: + - /usr/local/share/applications + - /usr/local/share/desktop-directories + - /usr/local/share/icons + - /usr/local/share/icons/hicolor + - /usr/local/share/mime + - /usr/local/share/mime/packages + * Recommend: shared-mime-info. + + -- Per Olofsson Tue, 29 Aug 2006 17:35:02 +0200 + +xdg-utils (0.9+1.0beta1-2) unstable; urgency=low + + * Remove comments from debian/rules. + * Move Depends: to Recommends:. Closes: #380141. + * Recommend: mime-support. + * Use run-mailcap for generic xdg-open support. + * Use generic fallbacks even if running a desktop environment (if the + needed program is not found). + * Try su-to-root as a generic fallback in xdg-su. Suggest: menu. + + -- Per Olofsson Sat, 29 Jul 2006 11:51:16 +0200 + +xdg-utils (0.9+1.0beta1-1) unstable; urgency=low + + * Initial release. Closes: #375362 + + -- Per Olofsson Mon, 26 Jun 2006 10:56:12 +0200 + --- xdg-utils-1.0.orig/debian/rules +++ xdg-utils-1.0/debian/rules @@ -0,0 +1,58 @@ +#!/usr/bin/make -f + +export QUILT_PATCHES = debian/patches + +CONFIGURE_OPTIONS = \ + --prefix=`pwd`/debian/xdg-utils/usr \ + --mandir=`pwd`/debian/xdg-utils/usr/share/man \ + +build: build-stamp +build-stamp: + dh_testdir + + quilt push -a || test $$? = 2 + ./configure $(CONFIGURE_OPTIONS) + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + -$(MAKE) distclean + + quilt pop -a || test $$? = 2 + ! [ -e .pc/.version ] || rm .pc/.version + ! [ -e .pc ] || rmdir .pc + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install + +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installman + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build install + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xdg-utils-1.0.orig/debian/prerm +++ xdg-utils-1.0/debian/prerm @@ -0,0 +1,10 @@ +#!/bin/sh -e + +rmdir /usr/local/share/applications 2>/dev/null || true +rmdir /usr/local/share/desktop-directories 2>/dev/null || true +rmdir /usr/local/share/icons/hicolor 2>/dev/null || true +rmdir /usr/local/share/icons 2>/dev/null || true +rmdir /usr/local/share/mime/packages 2>/dev/null || true +rmdir /usr/local/share/mime 2>/dev/null || true + +#DEBHELPER# --- xdg-utils-1.0.orig/debian/copyright +++ xdg-utils-1.0/debian/copyright @@ -0,0 +1,31 @@ +This is the Debian package of xdg-utils. It was packaged by +Per Olofsson . + +It was downloaded from: http://portland.freedesktop.org/ + +Upstream authors: Portland Project + +Copyright: + +# Copyright 2006, Kevin Krammer +# Copyright 2006, Jeremy White +# +# LICENSE: +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. --- xdg-utils-1.0.orig/debian/patches/edgy_dash_fixes +++ xdg-utils-1.0/debian/patches/edgy_dash_fixes @@ -0,0 +1,63 @@ +--- ../old/xdg-utils-1.0/scripts/xdg-screensaver 2006-10-09 20:57:18.000000000 +0100 ++++ scripts/xdg-screensaver 2006-11-04 03:35:32.000000000 +0000 +@@ -398,7 +398,7 @@ + { + result=1 + +- if [ "$1" == "resume" ] ; then ++ if [ "$1" = "resume" ] ; then + # Restore DPMS state + if [ -f "$screensaver_file.dpms" ]; then + rm "$screensaver_file.dpms" +@@ -406,7 +406,7 @@ + xset +dpms + fi + fi +- if [ "$1" == "reset" ] ; then ++ if [ "$1" = "reset" ] ; then + if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then + xset dpms force on + fi +@@ -426,7 +426,7 @@ + ;; + esac + +- if [ "$1" == "suspend" ] ; then ++ if [ "$1" = "suspend" ] ; then + # Save DPMS state + if xset -q | grep 'DPMS is Enabled' > /dev/null 2> /dev/null; then + tmpfile=`mktemp` +--- ../old/xdg-utils-1.0/scripts/xdg-icon-resource 2006-10-09 20:57:12.000000000 +0100 ++++ scripts/xdg-icon-resource 2006-11-04 03:35:25.000000000 +0000 +@@ -436,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 +@@ -536,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 + ;; +@@ -693,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 --- xdg-utils-1.0.orig/debian/patches/xdg-email-generic +++ xdg-utils-1.0/debian/patches/xdg-email-generic @@ -0,0 +1,70 @@ +--- xdg-utils/scripts/xdg-email 2006-10-12 13:37:28.000000000 +0100 ++++ xdg-utils/scripts/xdg-email 2006-10-12 13:47:03.000000000 +0100 +@@ -392,6 +392,9 @@ + fi + fi + fi ++ ++ which kfmclient >/dev/null || open_generic "$1" ++ + DEBUG 1 "Running kfmclient exec \"$1\"" + kfmclient exec "$1" + kfmclient_fix_exit_code $? +@@ -405,6 +408,8 @@ + + open_gnome() + { ++ which gnome-open >/dev/null || open_generic "$1" ++ + DEBUG 1 "Running gnome-open \"$1\"" + gnome-open "$1" + +@@ -418,6 +423,8 @@ + + open_xfce() + { ++ which exo-open >/dev/null || open_generic "$1" ++ + DEBUG 1 "Running exo-open \"$1\"" + exo-open "$1" + +@@ -430,22 +437,13 @@ + + open_generic() + { +- IFS=":" +- for browser in $BROWSER; do +- if [ x"$browser" != x"" ]; then +- +- browser_with_arg=`echo "$browser" | sed s#%s#"$1"#` +- +- if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1"; +- else $browser_with_arg; +- fi +- +- if [ $? -eq 0 ]; then exit_success; +- fi +- fi +- done ++ sensible-browser "$1" + +- exit_failure_operation_impossible "no method available for opening '$1'" ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi + } + + url_encode() +@@ -616,6 +614,10 @@ + DE=generic + fi + ++if [ x"$DE" = x"" ]; then ++ DE=generic ++fi ++ + case "$DE" in + kde) + open_kde "${mailto}" --- xdg-utils-1.0.orig/debian/patches/series +++ xdg-utils-1.0/debian/patches/series @@ -0,0 +1,3 @@ +xdg-open-generic +xdg-email-generic +xdg-open-xfce --- xdg-utils-1.0.orig/debian/patches/xdg-open-xfce +++ xdg-utils-1.0/debian/patches/xdg-open-xfce @@ -0,0 +1,15 @@ +Index: xdg-utils/scripts/xdg-open +=================================================================== +--- xdg-utils.orig/scripts/xdg-open 2006-08-29 16:17:26.000000000 +0200 ++++ xdg-utils/scripts/xdg-open 2006-08-29 16:20:20.000000000 +0200 +@@ -419,6 +419,10 @@ + open_gnome "$url" + ;; + ++ xfce) ++ open_xfce "$url" ++ ;; ++ + generic) + open_generic "$url" + ;; --- xdg-utils-1.0.orig/debian/patches/xdg-open-generic +++ xdg-utils-1.0/debian/patches/xdg-open-generic @@ -0,0 +1,79 @@ +Index: xdg-utils/scripts/xdg-open +=================================================================== +--- xdg-utils.orig/scripts/xdg-open 2006-08-29 16:17:23.000000000 +0200 ++++ xdg-utils/scripts/xdg-open 2006-08-29 16:17:26.000000000 +0200 +@@ -321,6 +321,8 @@ + + open_kde() + { ++ which kfmclient >/dev/null || open_generic "$1" ++ + kfmclient exec "$1" + kfmclient_fix_exit_code $? + +@@ -333,6 +335,8 @@ + + open_gnome() + { ++ which gnome-open >/dev/null || open_generic "$1" ++ + gnome-open "$1" + + if [ $? -eq 0 ]; then +@@ -344,6 +348,8 @@ + + open_xfce() + { ++ which exo-open >/dev/null || open_generic "$1" ++ + exo-open "$1" + + if [ $? -eq 0 ]; then +@@ -355,22 +361,22 @@ + + open_generic() + { +- IFS=":" +- for browser in $BROWSER; do +- if [ x"$browser" != x"" ]; then +- +- browser_with_arg=`echo "$browser" | sed s#%s#"$1"#` +- +- if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1"; +- else $browser_with_arg; +- fi ++ if which run-mailcap >/dev/null && ++ (echo "$1" | grep -q '^file://' || ++ ! echo "$1" | egrep -q '^[a-zA-Z+\.\-]+:'); then + +- if [ $? -eq 0 ]; then exit_success; +- fi +- fi +- done ++ local file=$(echo "$1" | sed 's%^file://%%') + +- exit_failure_operation_impossible "no method available for opening '$1'" ++ run-mailcap --action=view "$file" ++ else ++ sensible-browser "$1" ++ fi ++ ++ if [ $? -eq 0 ]; then ++ exit_success ++ else ++ exit_failure_operation_failed ++ fi + } + + [ x"$1" != x"" ] || exit_failure_syntax +@@ -401,10 +407,6 @@ + detectDE + + if [ x"$DE" = x"" ]; then +- # if BROWSER variable is not set, check some well known browsers instead +- if [ x"$BROWSER" = x"" ]; then +- BROWSER=firefox:mozilla:netscape +- fi + DE=generic + fi + --- xdg-utils-1.0.orig/debian/postinst +++ xdg-utils-1.0/debian/postinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +mkdir /usr/local/share/applications 2>/dev/null || true +mkdir /usr/local/share/desktop-directories 2>/dev/null || true +mkdir /usr/local/share/icons 2>/dev/null || true +mkdir /usr/local/share/icons/hicolor 2>/dev/null || true +mkdir /usr/local/share/mime 2>/dev/null || true +mkdir /usr/local/share/mime/packages 2>/dev/null || true + +#DEBHELPER# --- xdg-utils-1.0.orig/debian/control +++ xdg-utils-1.0/debian/control @@ -0,0 +1,31 @@ +Source: xdg-utils +Maintainer: Per Olofsson +Section: utils +Priority: optional +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), quilt + +Package: xdg-utils +Architecture: all +Recommends: xsltproc, firefox | www-browser, xbase-clients, file, mime-support, shared-mime-info +Suggests: desktop-file-utils, libgnome2-0, libexo-0.3-0, libgnomevfs2-bin, kdelibs-bin, konqueror, libgtk2.0-bin, menu +Description: Portland desktop integration utilities from freedesktop.org + xdg-utils contains utilities for integrating applications with the + desktop environment, regardless of which desktop environment is used. + . + These utilities are part of the Portland project. + . + The following utilities are included: + . + * xdg-desktop-menu - Install desktop menu items + * xdg-desktop-icon - Install icons on the user's desktop + * xdg-icon-resource - Install icon resources + * xdg-mime - Gather MIME information about a file + * xdg-open - Open a URL in the user's preferred application that + handles the respective URL or file type + * xdg-email - Open the user's preferred email client, potentially with + subject and other info filled in + * xdg-screensaver - Enable, disable, or suspend the screensaver + . + Homepage: http://portland.freedesktop.org/ + --- xdg-utils-1.0.orig/debian/docs +++ xdg-utils-1.0/debian/docs @@ -0,0 +1 @@ +README