--- gnome-do-0.8.3.1+dfsg.orig/debian/watch +++ gnome-do-0.8.3.1+dfsg/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=dversionmangle=s/\+dfsg(\d)*$// \ +https://launchpad.net/do/+download http://launchpad.net/do/.*/.*/\+download/gnome-do-(.*).tar.gz --- gnome-do-0.8.3.1+dfsg.orig/debian/gnome-do.manpages +++ gnome-do-0.8.3.1+dfsg/debian/gnome-do.manpages @@ -0,0 +1 @@ +debian/gnome-do.1 --- gnome-do-0.8.3.1+dfsg.orig/debian/gnome-do.preinst +++ gnome-do-0.8.3.1+dfsg/debian/gnome-do.preinst @@ -0,0 +1,28 @@ +#!/bin/sh -e + +# gnome-do 0.4.2.0-1 installed an autostart file to /etc/xdg/autostart +# Upstream now has its own handling of autostart with a different filename, +# which can make Do appear twice on the autostart list. +# +# Remove the previously installed autostart file, if it hasn't been modified. + +OLD_AUTOSTART=/etc/xdg/autostart/gnome-do-autostart.desktop +OLD_AUTOSTART_MD5SUM=c3fe3975541f89a0c9e78b4481445683 + +if [ "$1" = "upgrade" -o "$1" = "install" ] && \ + [ "$2" = "0.4.2.0-1" ] ; then + if [ -f $OLD_AUTOSTART ] ; then + echo "Found old autostart file: $OLD_AUTOSTART..." + if [ "$(md5sum $OLD_AUTOSTART | cut -f 1 -d ' ')" = "$OLD_AUTOSTART_MD5SUM" ] ; + then + # The old file has been left unchanged, we can delete it + echo "Removing unmodified autostart file in favour of new one." + rm -f $OLD_AUTOSTART + else + echo "Autostart file has been modified. Leaving untouched." + echo "GNOME Do may appear twice in your autostart list." + fi + fi +fi + +#DEBHELPER# --- gnome-do-0.8.3.1+dfsg.orig/debian/ltmain-add-as-needed.patch +++ gnome-do-0.8.3.1+dfsg/debian/ltmain-add-as-needed.patch @@ -0,0 +1,40 @@ +Description: Patch to add --as-needed magic to ltmain.sh + This patch needs to be applied after autoreconf is run, and autoreconf should + be copying files, not symlinking (ie: the '-s' option should not be given) so + that system-wide files aren't accidentally patched. + . + This should be more robust than copying a pre-patched version of ltmain.sh + from debian/ on build, as ltmain.sh needs to be exactly the same version as + the rest of libtool. +Author: Christopher James Halse Rogers + +--- libtool-2.2.6b/libltdl/config/ltmain.sh 2010-01-04 05:33:00.810981679 +0000 ++++ libtool-as-needed/libltdl/config/ltmain.sh 2010-01-04 00:18:29.715388881 +0000 +@@ -4716,6 +4716,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -5070,6 +5075,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- gnome-do-0.8.3.1+dfsg.orig/debian/gnome-do.install +++ gnome-do-0.8.3.1+dfsg/debian/gnome-do.install @@ -0,0 +1 @@ +debian/gnome-do/usr/share/applications/gnome-do.desktop etc/xdg/autostart --- gnome-do-0.8.3.1+dfsg.orig/debian/README.Source +++ gnome-do-0.8.3.1+dfsg/debian/README.Source @@ -0,0 +1,12 @@ +Source package information for GNOME Do +---------------------------------------------- + * The source uses the dpatch patch system. + debian/rules patch will apply all patches, debian/rules + unpatch will unapply all patches. + See "man dpatch-edit-patch" for details of editing patches. + * The source tarball has been repacked to remove the shipped + copy of gmcs.exe + The most up-to-date repacked source can be generated by calling the + 'get-orig-source' target of debian/rules in a directory of your choice. + + -- Iain Lane Sun, 22 Mar 2009 23:27:25 +1000 --- gnome-do-0.8.3.1+dfsg.orig/debian/compat +++ gnome-do-0.8.3.1+dfsg/debian/compat @@ -0,0 +1 @@ +7 --- gnome-do-0.8.3.1+dfsg.orig/debian/gnome-do.1 +++ gnome-do-0.8.3.1+dfsg/debian/gnome-do.1 @@ -0,0 +1,29 @@ +.TH "GNOME Do" 1 "30 June 2009" "0.8.2" +.SH NAME +gnome\-do \- Launcher application in the spirit of Quicksilver +.SH SYNOPSIS +gnome\-do [\-\-debug] +.SH DESCRIPTION +GNOME Do 0.8.2 +.PP +\fBGNOME Do\fP allows you to quickly search for many objects present +in your GNOME desktop environment \- applications, Evolution contacts, +Firefox bookmarks, documents \- and perform commonly used commands on +those objects \- run, open, send, etc. + +By default the hotkey to summon the \fBGNOME Do\fP interface is ++space. This, and other options, can be changed from the +graphical interface. + +.TP +\fB\-\-debug\fP +Print verbose status information to the terminal; useful for debugging. + +.SH VERSION +0.8.2 + +.SH BUGS +See http://launchpad.net/do/+bugs for a list of bugs. + +.SH AUTHOR +Authors of the program: see Launchpad - http://launchpad.net/do --- gnome-do-0.8.3.1+dfsg.orig/debian/README.source +++ gnome-do-0.8.3.1+dfsg/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- gnome-do-0.8.3.1+dfsg.orig/debian/changelog +++ gnome-do-0.8.3.1+dfsg/debian/changelog @@ -0,0 +1,272 @@ +gnome-do (0.8.3.1+dfsg-1ubuntu1) lucid; urgency=low + + * debian/patches/03_fix_gks_crashers.dpatch: + + Proxy keyring calls to the GTK main thread. Prevents libgnome-keyring + taking down Do with an assert(). (LP: #55137) + + -- Christopher James Halse Rogers Wed, 14 Apr 2010 12:30:07 +1000 + +gnome-do (0.8.3.1+dfsg-1) unstable; urgency=low + + * New upstream bugfix release: (Closes: 561271) + + Fixes for network status detection (Closes: #543517, #543778) + (LP: #422461) + + Fixes misleading "Start GNOME Do at login" checkbox (LP: #398303) + + Fixes a number of crash bugs in the Trash docklet (LP: #439731) + (Closes: #552239) + + Fixes problems with the naming of the default theme, leading to crashes. + (LP: #475871, #448094) + + Fixes startup problems when run by users with usernames > 9 characters + long. (LP: #439949) + * debian/patches/02_use_cli_for_wrapper: + + Refresh for new upstream changes + * debian/patches/11_fix_autostart_when_directory_does_not_exist: + + Drop; included upstream. + * debian/control + + Add Breaks on gnome-do-plugins < 0.8.2. Do now handles plugins + slightly differently. This prevents users being surprised about + missing plugins on upgrade. (Closes: #541708) + + Bump Build-Dep on mono-devel to (>= 2.4.2.3) for mono-csc. + + Transition to -cil-dev packages for Build-Dependends. + + Bump Standards-Version to 3.8.3; no changes needed. + * debian/rules: + + Use mono-csc instead of csc for MCS + + Pass -f -i to autoreconf to keep the buildsystem's libtool in sync + with Debian's. Fixes libtool-related FTBFS (Closes: #560645) + + Apply ltmain-add-as-needed.patch after autoreconf-ing for --as-needed + magic. + + Pass --as-needed to the linker to eliminate dependencies on unneeded + libs. + * debian/README.source: + + Add to really comply with policy; we've got a patch system! + * debian/ltmain-add-as-needed.patch: + + Patch to add --as-needed magic to ltmain.sh + + -- Christopher James Halse Rogers Mon, 11 Jan 2010 12:56:39 +1100 + +gnome-do (0.8.2+dfsg-1) unstable; urgency=low + + * New upstream release + + No longer uses a plugin repository. Fixes many plugin- + related issues. (LP: #343096, LP: #330025, LP #345001) + + No longer blocks on "About Do" (LP: #361679) + + Reacts correctly when a Composite manager is enabled/ + disabled at runtime. (LP: #346347, LP: #390150) + + Fixes for space reserved by Docky blocking drag and + drop operations. (LP: #354729, LP: #347052, LP: #382843) + + Properly sets "Hidden" key on autostart files in response to + "Start on login" option. (Closes: #526023) (LP: #369988) + * debian/patches/10_application_search_path: + + Drop; included upstream + * debian/patches/10_sk_translation_update: + + Import sk translation update from Debian BTS. + (Closes: #531779) + * debian/patches/11_fix_autostart_when_directory_does_not_exist: + + Patch from upstream. Fixes the "Start on login" option when the + ~/.config/autostart directory does not exist. (LP: #393729) + * debian/control: + + Update standards version to 3.8.2; no changes required. + + Add libtool to Build-Depends; required for autoreconf. + + Add Recommends: on new gnome-do-docklets package. + * debian/gnome-do.1 + + Fix spelling: GNOME-Do => GNOME Do. + + Miscelaneous lintian fixes; NAME section, escaping minus signs with \- + * debian/copyright: + + Update for new copyright holders. + + Minor update to DEP-5 format + + -- Christopher James Halse Rogers Sat, 27 Jun 2009 10:40:45 +1000 + +gnome-do (0.8.1.3+dfsg-1) unstable; urgency=low + + [ Daniel T Chen ] + * New upstream release (LP: #344578). + + Gnome Do causes keyboard keys to be remapped (LP: #308143) + + Docky window too small when summoned (LP: #317381) + + Minimize/Maximize does not work on all windows (LP: #317908) + + Docky blocks drag and drop over large areas of the screen + (LP: #318471) + + Docky fails to autohide properly when changing themes + (LP: #318672) + + Paste via ctrl+v does not work in 1st pane (LP: #318922) + + Autostart is in wrong assembly (LP: #319114) + + Docky has no results list (LP: #319797) + + Docky trash applet does not reflect current state + (LP: #320621) + + Docky panels splits into two when over filled (LP: #324648) + + Docky ui division is inconsistent and confusing + (LP: #324718) + + poor performance with two screens (LP: #323294) + + Docky trash applet doesn't check if trash exists + (LP: #323453) + + docky panel splits into two when overfilled (LP: #324648) + + Docky's UI division is inconsistent and confusing + (LP: #324718) + + Do crashes when using a pastebin launcher with docky + (LP: #325178) + + Make docky aware of icon theme switch (LP: #328721) + + Docky doesn't update icon status for some apps that minimize + to system tray. (LP: #329120) + + Docky does not work properly with pull-down window + (LP: #334663) + + sensitivity of zooming the icons in the dock isn't + configurable (LP: #336214) + + Regression: In 0.8.1, "Request attention" is no longer + indicated (LP: #337594) + + Clock's Calendar mode auto-hides when leaving the bounds of + the original dock (LP: #337783) + + gnome-do does not notice change of icon theme (LP: #204368) + + Thumbnails are never displayed when files have spaces in + their names (LP: #311551) + + Open improperly escapes URLs. (LP: #317416) + + Docky: Right-click dialog appears on wrong monitor + (LP: #319062) + + Dragging items off Docky possible in summon mode + (LP: #319452) + + Docky shows icon according to the filename (LP: #320892) + + Mouse click inactive when Do(cky) is summoned (LP: #324937) + + Docky trash don't have a right-click menu (LP: #317947) + + Polish docky's window name labels (LP: #318487) + + Docky: Scroll on window icon should switch between windows + of that app (LP: #319805) + + Docky does not preserve window stack (z?) order when + switching apps by clicking on app icon (LP: #326661) + + Docky window switching should be easier. (LP: #327079) + + Color of indicators on Docky cannot be changed + (LP: #332936) + + Do's ResultWindow is using wrong text color (LP: #288771) + + Docky won't unhide after rev 1053 (LP: #337113) + + Do's icon label in Docky should be "GNOME Do" instead of + "Summon GNOME Do" (LP: #338496) + * debian/control: + + Add librsvg2-2.18-cil build-dep + * debian/patches/03_show_in_all_DEs + + Drop; fixed in new upstream + * debian/gnome-do.1 + + Update for new version. + + [ Iain Lane ] + * Merge changes with Ubuntu Jaunty + * Autostart behaviour has been fixed upstream (Closes: #513741, #516194). + * debian/patches/10_application_search_path.dpatch: Add. Fix search path so + that applications are properly indexed. Patch backported from upstream. + * debian/control: Add myself to Uploaders. + * Really bump versioned dep on libgtk2.0-cil + * debian/control, debian/rules, debian/watch, + debian/patches/00_remove_bundledlibs.dpatch, debian/README.source: + Upstream source needs repackaging due to shipped copy of gmcs.exe + + [ Mirco Bauer ] + * debian/rules: + + Made get-orig-source target policy conform. + + Use dh override targets instead of sequence injection. + * debian/control: + + Bumped debhelper build-dep to >= 7.0.50 + + Bumped Standards-Version to 3.8.1 (no changes needed) + + -- Iain Lane Sun, 22 Mar 2009 22:44:39 +0000 + +gnome-do (0.8.0-1) unstable; urgency=low + + [ Mirco Bauer ] + * Upload to unstable. + * debian/control: + + Lowered GNOME# build-deps to 2.0 ABI as that transition didn't happen + yet in unstable. + + [ Christopher James Halse Rogers ] + * New upstream release. (LP: #323048) + + Fixes text input problems (LP: #288517) + + No longer grabs plugins from internet repositories (LP: #294808) + + Preferences dialog is resizable (LP: #305419) + * Build against gtk, gnome mono packages from Experimental. (Closes: #510836) + * debian/control: + + Bump versioned dep on libgtk2.0-cil to ensure + Gdk.Screen.IsComposited exists (Closes: #510973) + + Add libwnck2.20-cil build-dep + + gnome-sharp2 transition. + * debian/patches/04_fix_locale_dir + * debian/patches/05_fix_localised_theme_setting + * debian/patches/06_expand_homedir_in_open + + Drop; fixed in new upstream + * debian/patches/02_use_cli_for_wrapper + + Update for new upstream + + Add dpatch comments + * debian/gnome-do.1 + + Fix broken formatting (LP: #291654). Thank you to Frédéric Grosshans + for spotting it, and the patch. + + Update for new version. + + -- Christopher James Halse Rogers Wed, 04 Feb 2009 15:30:25 +1100 + +gnome-do (0.6.1.0-1) experimental; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream release + * debian/rules + + Set GCONF_DISABLE_SCHEMAS_INSTALL; upstream now ships a gconf schema. + + Mono 2.0 transition: + - Set MCS env variable to /usr/bin/csc when calling "dh build" + + Add .PHONY for good measure + + Add build-stamp target to avoid calling dh build twice. + * debian/patches/05_fix_localised_theme_setting: + + Use the index of the selected theme rather than text of the theme + when setting the UI preference. The text is now correctly translated, + so using the text no longer works (LP: #280719). + * debian/patches/06_expand_homedir_in_open: + + Expand '~' in strings for the Open action (LP: #280540). + * debian/gnome-do.gconf-defaults: + + Don't popup the UI on login; wait for the user to summon Do. + * debian/control + + Mono 2.0 transition: + - build-depend on mono-devel (>= 2.0) rather than + mono-gmcs. + + [ David Paleino ] + * debian/rules: + + get-orig-source updated, puts the tarball, correctly renamed, to + ../tarballs, to use it with svn-buildpackage + * debian/patches/: + + 01_fix_libX11_linkage.dpatch updated to patch Makefile.am and Makefile.in + + -- Christopher James Halse Rogers Fri, 28 Nov 2008 15:19:20 +1100 + +gnome-do (0.6.0.1-1) experimental; urgency=low + + * New upstream version (closes: #485684) + * debian/control + + Update build-depends for new version + + Update standards version to 3.8.0, adding README.Source + * debian/gnome-do-autostart.desktop + * debian/gnome-do.install + + Delete our desktop file, install upstream's translated desktop file + to /etc/xdg/autostart instead. + * debian/gnome-do.preinst + + Remove old autostart file on upgrade (if unmodified). Otherwise + GNOME Do will appear twice in the autostart list. + * debian/gnome-do.1 + + Manpage updated for new version + * debian/rules: + + Fix get-orig-source target to run properly from any directory; now should + be policy compliant. + * debian/copyright: + + Refresh for new upstream version + + Update to more recent CopyrightFormat proposal + * debian/patches/04_fix_locale_dir: + + Point the (hardcoded) locale dir to /usr/share/locale rather than + /usr/local/share/locale. + + -- Christopher James Halse Rogers Mon, 25 Aug 2008 08:27:54 +1000 + +gnome-do (0.4.2.0-1) unstable; urgency=low + + * Initial Debian package (closes: #474022) + * debian/patches/02_use_cli_for_wrapper: + + Patch upstream's wrapper to call /usr/bin/cli rather than mono + * debian/patches/01_fix_libX11_linkage: + + Link libdo against libX11; fix undefined symbol warnings. + * debian/patches/03_show_in_all_DEs: + + Show the launcher in all desktop environments; it's useful in XFCE + and KDE as well as GNOME. + + -- Christopher James Halse Rogers Mon, 14 Apr 2008 21:36:12 +1000 --- gnome-do-0.8.3.1+dfsg.orig/debian/control +++ gnome-do-0.8.3.1+dfsg/debian/control @@ -0,0 +1,65 @@ +Source: gnome-do +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian CLI Applications Team +Uploaders: Christopher James Halse Rogers , Iain Lane +Build-Depends: debhelper (>= 7.0.50), + dpatch, + mono-devel (>= 2.4.2.3), + intltool, + autoconf, + autotools-dev, + automake, + libtool, + libndesk-dbus1.0-cil-dev, + libndesk-dbus-glib1.0-cil-dev, + libmono-cairo2.0-cil, + cli-common-dev (>= 0.5.7), + pkg-config, + libgtk2.0-cil-dev (>= 2.10), + libglib2.0-cil-dev, + libglade2.0-cil-dev, + libgnome2.0-cil-dev, + libgnome-vfs2.0-cil-dev, + libgconf2.0-cil-dev, + libgconf2-dev, + libgnomedesktop2.0-cil-dev, + libgnome-keyring1.0-cil-dev, + libmono-addins-cil-dev, + libmono-addins-gui-cil-dev, + libnotify-cil-dev, + libglib2.0-dev, + libgtk2.0-dev, + librsvg2-2.0-cil-dev, + libwnck1.0-cil-dev +Standards-Version: 3.8.3 +Homepage: http://do.davebsd.com/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gnome-do/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do/trunk/ + +Package: gnome-do +Architecture: any +Depends: ${cli:Depends}, + ${shlibs:Depends}, + ${misc:Depends}, + xdg-utils, + dbus, + procps +Recommends: gnome-do-plugins (>= 0.8.2), gnome-do-docklets +Breaks: gnome-do-plugins (<< 0.8.2) +Description: Quickly perform actions on your desktop + Allows you to quickly search for many items present in your + GNOME desktop environment (applications, Evolution contacts, Firefox + bookmarks, files, artists and albums in Rhythmbox, Pidgin buddies, + etc.) and perform commonly used actions on those items (Run, Open, + Email, Chat, Play, etc.). + . + GNOME Do is plugin based, allowing it to be easily extended to handle + new items and actions. This package contains a core set of items and + actions. + . + Although GNOME Do primarily targets the GNOME desktop, it also works + under other desktop environments. + . + GNOME Do is inspired by Quicksilver and GNOME Launch Box. --- gnome-do-0.8.3.1+dfsg.orig/debian/rules +++ gnome-do-0.8.3.1+dfsg/debian/rules @@ -0,0 +1,52 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +include /usr/share/cli-common/cli.make +include /usr/share/dpatch/dpatch.make + +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + +CFLAGS ?= -O2 -Wall -g +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +configure: patch-stamp + autoreconf -f -i -I m4/shamrock + patch -p3 < debian/ltmain-add-as-needed.patch + +override_dh_auto_configure: configure + dh_auto_configure -- MCS=/usr/bin/mono-csc + +override_dh_clean: unpatch + dh_clean + +%: + dh $@ + +TEMP_DIR := $(shell mktemp -d) +MAKEFILE = $(firstword $(MAKEFILE_LIST)) +DEBIAN_DIR = $(dir $(MAKEFILE)) +SOURCE_DIR = $(word 1, $(shell ls -d --group-directories-first $(TEMP_DIR)/*)) +CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 | cut -d"+" -f1 ) +VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d" " -f2) +UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,') +TARBALL = $(shell echo "gnome-do_$(UPVERSION).orig.tar.gz" | tr -d " ") + +download-tarball: + uscan --download --destdir $(TEMP_DIR) \ + --no-symlink --force-download --download-version $(CURVER) \ + --watchfile=$(DEBIAN_DIR)/watch + cd $(TEMP_DIR) && tar xzvf *.tar.gz + +strip-shipped-binaries: download-tarball + rm $(SOURCE_DIR)/BundledLibraries/*.exe + +repack-source: strip-shipped-binaries + cd $(TEMP_DIR) && \ + tar czvf $(TARBALL) \ + $(notdir $(SOURCE_DIR)) + +get-orig-source: repack-source + mv $(TEMP_DIR)/*.orig.tar.gz . + rm -r $(TEMP_DIR) + +.PHONY: configure patch unpatch download-tarball strip-shipped-binaries repack-source get-orig-source --- gnome-do-0.8.3.1+dfsg.orig/debian/copyright +++ gnome-do-0.8.3.1+dfsg/debian/copyright @@ -0,0 +1,131 @@ +Format-Specification: + http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Source: https://launchpad.net/do/+download +Name: GNOME Do +Maintainer: David Siegel , + Jason Smith + +Files: * +Copyright: © 2007-2009 Alex Launi , + © 2007-2009 Andrea Cimitan, + © 2007-2009 Christopher Halse Rogers , + © 2007-2009 DR Colkitt, + © 2007-2009 David Siegel , + © 2007-2009 James Walker, + © 2007-2009 Jason Smith , + © 2007-2009 Jonathon Anderson, + © 2007-2009 Miguel de Icaza, + © 2007-2009 Rick Harding, + © 2007-2009 Thomsen Anders, + © 2007-2009 Volker Braun, + © 2007-2009 Dusan Maliarik, + © 2007-2009 Travis Watkins +License: GPL-3+ + +Files: DefaultObjects.cs, TextFrame.cs, MiniWindowFrame.cs +Copyright: © 2008 Jason Smith +License: GPL-3+ + +Files: debian/* +Copyright: © 2008 Christopher James Halse Rogers +License: GPL-3+ + +Files: po/*.po +Copyright: © 2008 Rosetta Contributors and Canonical Ltd 2008 +License: GPL-3+ + +Licence: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL'. + +Files: Do/src/XKeybinder.cs +Copyright: © 2004-2007 Alex Graveley +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + + On Debian systems, the complete text of the GNU Lesser General Public + License can be found in `/usr/share/common-licenses/LGPL'. + +Files: libdo/keybinder.{c,h} +Copyright: © 2004-2007 Alex Graveley +License: LGPL-2+ + +Files: libdo/eggaccelerators.c +Copyright: © 2002 Red Hat, Inc, + © 1998, 2001 Tim Janik +License: LGPL-2+ + +Files: libdo/eggaccelerators.h +Copyright: © 2002 Red Hat, Inc, +License: LGPL-2+ + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +Files: Do/src/ConsoleCrayon.cs +Copyright: © 2008 Novell, Inc. +License: MIT + +Files: m4/shamrock/* +Copyright: © 2005-2007 Novell, Inc. +License: MIT + +License: MIT + 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. --- gnome-do-0.8.3.1+dfsg.orig/debian/gnome-do.gconf-defaults +++ gnome-do-0.8.3.1+dfsg/debian/gnome-do.gconf-defaults @@ -0,0 +1 @@ +/apps/gnome-do/preferences/core-preferences/QuietStart true --- gnome-do-0.8.3.1+dfsg.orig/debian/patches/10_sk_translation_update.dpatch +++ gnome-do-0.8.3.1+dfsg/debian/patches/10_sk_translation_update.dpatch @@ -0,0 +1,311 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_sk_translation_update by Christopher James Halse Rogers +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Import sk translation update by helix84 . +## DP: from Debian bug #531779 + +@DPATCH@ +diff -urNad gnome-do-0.8.2~/po/sk.po gnome-do-0.8.2/po/sk.po +--- gnome-do-0.8.2~/po/sk.po 2009-06-26 13:39:51.137774646 +1000 ++++ gnome-do-0.8.2/po/sk.po 2009-06-27 15:12:04.913678724 +1000 +@@ -1,25 +1,26 @@ + # Slovak translation for do + # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 + # This file is distributed under the same license as the do package. +-# FIRST AUTHOR , 2008. ++# Ivan Masár , 2009. + # + msgid "" + msgstr "" + "Project-Id-Version: do\n" + "Report-Msgid-Bugs-To: FULL NAME \n" + "POT-Creation-Date: 2009-01-27 00:28-0500\n" +-"PO-Revision-Date: 2009-02-05 13:09+0000\n" +-"Last-Translator: Dusan Maliarik \n" +-"Language-Team: Slovak \n" ++"PO-Revision-Date: 2009-06-04 01:21+0100\n" ++"Last-Translator: Ivan Masár \n" ++"Language-Team: Slovak \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Launchpad-Export-Date: 2009-03-13 16:04+0000\n" ++"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n" ++"X-Launchpad-Export-Date: 2009-06-03 22:52+0000\n" + "X-Generator: Launchpad (build Unknown)\n" + + #: ../Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs:128 + msgid "_Reset" +-msgstr "" ++msgstr "O_bnoviť" + + #: ../Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs:150 + msgid "Background Color:" +@@ -46,15 +47,16 @@ + "Your display is not properly configured for theme and animation support. " + "To use these features, you must enable compositing." + msgstr "" ++"Zobrazovanie nie je správne nastavené pre podporu tém a animácií. Pre " ++"používanie týchto funkcií musíte povoliť efekty plochy." + + #: ../Do/gtk-gui/Do.UI.DoAddinInstallerDialog.cs:53 + msgid "Updated plugins are available!" +-msgstr "" +-"Sú dosptupné aktualizované zásuvné moduly!" ++msgstr "Sú dostupné aktualizované moduly!" + + #: ../Do/gtk-gui/Do.UI.DoAddinInstallerDialog.cs:129 + msgid "_Install Updates" +-msgstr "_Nainštalovať aktualizácie" ++msgstr "Na_inštalovať aktualizácie" + + #: ../Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs:62 + msgid "To edit a shortcut, double-click it and type a new one." +@@ -78,7 +80,7 @@ + + #: ../Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs:170 + msgid "_About" +-msgstr "_O programe" ++msgstr "_O aplikácii" + + #: ../Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs:49 + msgid "First-launch Behavior" +@@ -118,17 +120,19 @@ + + #: ../Do/src/Do.UI/PluginErrorDialog.cs:35 + msgid "" +-"There was an error installing the selected " +-"plugins" ++"There was an error installing the selected plugins" + msgstr "" ++"Pri inštalácii vybraných modulov nastala chyba" + + #: ../Do/src/Do.UI/PluginErrorDialog.cs:37 + msgid "" +-"There was an error installing the selected " +-"plugin" ++"There was an error installing the selected plugin" + msgstr "" +-" Pri inštalácii vybraného modulu nastala chyba " +-"" ++"Pri inštalácii vybraného modulu nastala chyba " + + #: ../Do/src/Do.UI/PluginErrorDialog.cs:43 + msgid "and " +@@ -136,11 +140,11 @@ + + #: ../Do/src/Do.UI/PluginErrorDialog.cs:47 + msgid " is not a valid plugin file." +-msgstr "" ++msgstr " nie je súbor modulu." + + #: ../Do/src/Do.UI/PluginErrorDialog.cs:49 + msgid " are not valid plugin files." +-msgstr "" ++msgstr " nie sú súbory modulu." + + #: ../Do/src/Do.UI/ColorConfigurationWidget.cs:137 + msgid "Appearance" +@@ -156,15 +160,15 @@ + + #: ../Do/src/Do.Core/Do.Core.Addins/OfficialAddinClassifier.cs:35 + msgid "Official Plugins" +-msgstr "Oficiálne Moduly" ++msgstr "Oficiálne moduly" + + #: ../Do/src/Do.Core/Do.Core.Addins/GreedyAddinClassifier.cs:34 + msgid "All Plugins" +-msgstr "Všetky Moduly" ++msgstr "Všetky moduly" + + #: ../Do/src/Do.Core/Do.Core.Addins/CommunityAddinClassifier.cs:36 + msgid "Community Plugins" +-msgstr "Komunitné Moduly" ++msgstr "Komunitné moduly" + + #: ../Do/src/Do.Core/DoAddinInstaller.cs:37 + msgid "Installation cancelled" +@@ -184,7 +188,7 @@ + + #: ../Do/src/Do.Universe/PreferencesItem.cs:35 + msgid "Adjust Do's settings, manage plugins, etc." +-msgstr "Upraviť nastavenia Do, správa modulov, apod." ++msgstr "Upraviť nastavenia Do, správa modulov, a pod." + + #: ../Do/src/Do.Universe/QuitItem.cs:30 + msgid "Quit" +@@ -205,15 +209,15 @@ + #: ../Do/src/Do.Universe/ClearLearningItem.cs:33 + #: ../Do/src/Do.Universe/ClearLearningItem.cs:53 + msgid "Clear Learning" +-msgstr "Vyčistiť naučené data" ++msgstr "Vyčistiť naučené údaje" + + #: ../Do/src/Do.Universe/ClearLearningItem.cs:37 + msgid "Resets Do's learned usage data." +-msgstr "Vyčistiť naučené data." ++msgstr "Vyčistí naučené údaje Do." + + #: ../Do/src/Do.Universe/ClearLearningItem.cs:54 + msgid "Are you sure you want to clear Do's learned usage data?" +-msgstr "Ste si istý že chcete vyčistiť naučené data?" ++msgstr "Ste si istý že chcete vyčistiť naučené údaje Do?" + + #: ../Do/src/Do.Universe/ClearLearningItem.cs:56 + msgid "Clear" +@@ -229,7 +233,7 @@ + + #: ../Do/src/Do.Universe/DonateItem.cs:36 + msgid "Donate" +-msgstr "Prispejte" ++msgstr "Prispieť" + + #: ../Do/src/Do.Universe/DonateItem.cs:40 + msgid "Support GNOME Do development!" +@@ -237,23 +241,23 @@ + + #: ../Do/src/Do.Universe/AboutItem.cs:31 + msgid "About Do" +-msgstr "O programe Do" ++msgstr "O aplikácii Do" + + #: ../Do/src/Do.Universe/AboutItem.cs:35 + msgid "About GNOME Do" +-msgstr "O programe GNOME Do" ++msgstr "O aplikácii GNOME Do" + + #: ../Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs:352 + #: ../Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs:386 + #: ../Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs:57 + msgid "Type to begin searching" +-msgstr "Hľadanie zpustíte písaním" ++msgstr "Hľadanie začnete písaním" + + #: ../Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs:353 + #: ../Do.Interface.Linux/src/Do.Interface/ClassicInterface/ClassicWindow.cs:387 + #: ../Do.Interface.Linux/src/Do.Interface/Do.Interface.Widgets/DefaultElements.cs:58 + msgid "Type to start searching." +-msgstr "Hľadanie zpustíte písaním" ++msgstr "Hľadanie začnete písaním" + + #: ../Do.Interface.Linux.Docky/src/Docky.Interface/ApplicationDockItem.cs:58 + msgid "Minimize" +@@ -285,7 +289,7 @@ + + #: ../Do.Interface.Linux.Docky/src/Docky.Interface/DoDockItem.cs:95 + msgid "Show Trash" +-msgstr "Zobraz kôš" ++msgstr "Zobrazovať Kôš" + + #: ../Do.Interface.Linux.Docky/src/Docky.Interface/DoDockItem.cs:98 + msgid "Advanced Indicators" +@@ -293,7 +297,7 @@ + + #: ../Do.Interface.Linux.Docky/src/Docky.Interface/DoDockItem.cs:102 + msgid "Switch Monitors" +-msgstr "Prepni monitor" ++msgstr "Prepnúť monitor" + + #: ../Do.Interface.Linux.Docky/src/Docky.Interface/DockItem.cs:325 + msgid "Remove from Dock" +@@ -329,7 +333,7 @@ + + #: ../Do.Platform/src/Do.Universe/Do.Universe.Common/RunAction.cs:40 + msgid "Run an application, script, or other executable." +-msgstr "Spúšťa aplikácie, skripty alebo iné spustiteľné súbory." ++msgstr "Spustiť aplikáciu, skript alebo iný spustiteľný súbor." + + #: ../Do.Platform/src/Do.Universe/Do.Universe.Common/EmailAction.cs:35 + msgid "Email" +@@ -361,7 +365,7 @@ + + #: ../Do.Platform.Linux/gtk-gui/Do.Platform.Linux.AbstractLoginWidget.cs:111 + msgid "Username" +-msgstr "Užívateľské meno" ++msgstr "Používateľské meno" + + #: ../Do.Platform.Linux/gtk-gui/Do.Platform.Linux.AbstractLoginWidget.cs:124 + msgid "Verify and save account information" +@@ -378,7 +382,7 @@ + + #: ../Do.Platform.Linux/src/Do.Widgets/AbstractLoginWidget.cs:44 + msgid "Validating..." +-msgstr "Overujem..." ++msgstr "Overuje sa..." + + #: ../Do.Platform.Linux/src/Do.Widgets/AbstractLoginWidget.cs:45 + #, csharp-format +@@ -403,7 +407,7 @@ + + #: ../Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs:92 + msgid "This application could not be indexed." +-msgstr "Táto aplikácia nemôže byť zaindexovaná." ++msgstr "Túto aplikácia nebolo možné indexovať." + + #: ../Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs:116 + msgid "Exec" +@@ -450,7 +454,7 @@ + #: ../Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GnomeKeyringSecurePreferencesService.cs:36 + #, csharp-format + msgid "Key \"{0}\" not found in keyring" +-msgstr "" ++msgstr "Klúč „{0}“ sa nenašiel v klúčenke" + + #: ../Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GnomeKeyringSecurePreferencesService.cs:37 + msgid "gnome-keyring-daemon could not be reached!" +@@ -469,8 +473,8 @@ + "Do things as quickly as possible (but no quicker) with your files, " + "bookmarks, applications, music, contacts, and more!" + msgstr "" +-"Robiť veci tak rýchlo ako sa dá (ale nie rýchlejšie) s Vašimi súbormi, " +-"záložkami, aplikáciami, hudbou, kontaktami a viac!" ++"Manipulovať tak rýchlo ako sa len dá s vašimi súbormi, záložkami, " ++"aplikáciami, hudbou, kontaktami a pod." + + #: ../Do/gnome-do.desktop.in.h:2 + msgid "GNOME Do" +@@ -488,7 +492,7 @@ + + #: ../data/gnome-do.schemas.in.h:3 + msgid "Do UI theme" +-msgstr "Téma Do" ++msgstr "Téma vzhľadu Do" + + #: ../data/gnome-do.schemas.in.h:4 + msgid "Do summon keybinding." +@@ -497,23 +501,25 @@ + #: ../data/gnome-do.schemas.in.h:5 + msgid "Enable this option to keep Do from popping up as soon as it starts." + msgstr "" ++"Povoľte toto nastavenie, ak nechcete aby sa Do zobrazoval pri svojom " ++"spustení." + + #: ../data/gnome-do.schemas.in.h:6 + msgid "Hide main window when Do starts." +-msgstr "Skryť hlavné okno keď Do štartuje." ++msgstr "Skryť hlavné okno pri spustení Do." + + #: ../data/gnome-do.schemas.in.h:7 + msgid "Key used to enter text mode." +-msgstr "Klávesa pre vstup do textového módu." ++msgstr "Kláves na vstup do textového režimu." + + #: ../data/gnome-do.schemas.in.h:8 + msgid "Set this to the character that should be used to enter text mode." +-msgstr "Nastavte na znak ktorým sa budete prepínať do textového módu." ++msgstr "Nastavte na znak, ktorým sa budete prepínať do textového režimu." + + #: ../data/gnome-do.schemas.in.h:9 + msgid "Set this to the key command you would like to use to summon Do." +-msgstr "Nastavte klávesu ktorou si prajete vyvolávať Do." ++msgstr "Nastavte kláves, ktorou si želáte vyvolávať Do." + + #: ../data/gnome-do.schemas.in.h:10 + msgid "Whether the results window will always show." +-msgstr "" ++msgstr "Či má byť stále zobrazené okno s výsledkami." --- gnome-do-0.8.3.1+dfsg.orig/debian/patches/01_fix_libX11_linkage.dpatch +++ gnome-do-0.8.3.1+dfsg/debian/patches/01_fix_libX11_linkage.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_libX11_linkage.dpatch by Christopher James Halse Rogers +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Explicitly link to libX11 to resolve missing symbols +## DP: on link. + +@DPATCH@ +diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in +--- gnome-do-0.4.0.1~/libdo/Makefile.am 2008-03-18 13:31:06.000000000 +1100 ++++ gnome-do-0.4.0.1/libdo/Makefile.am 2008-03-18 13:57:00.000000000 +1100 +@@ -18,6 +18,6 @@ + eggaccelerators.c + + libdo_la_LDFLAGS = -export-dynamic -module -avoid-version +-libdo_la_LIBADD = $(LIBDO_LIBS) ++libdo_la_LIBADD = $(LIBDO_LIBS) -lX11 + + maintainer-clean-local: +diff -urNad gnome-do-0.4.0.1~/libdo/Makefile.in gnome-do-0.4.0.1/libdo/Makefile.in +--- gnome-do-0.4.0.1~/libdo/Makefile.in 2008-03-18 13:31:06.000000000 +1100 ++++ gnome-do-0.4.0.1/libdo/Makefile.in 2008-03-18 13:57:00.000000000 +1100 +@@ -261,7 +261,7 @@ + eggaccelerators.c + + libdo_la_LDFLAGS = -export-dynamic -module -avoid-version +-libdo_la_LIBADD = $(LIBDO_LIBS) ++libdo_la_LIBADD = $(LIBDO_LIBS) -lX11 + all: all-am + + .SUFFIXES: --- gnome-do-0.8.3.1+dfsg.orig/debian/patches/02_use_cli_for_wrapper.dpatch +++ gnome-do-0.8.3.1+dfsg/debian/patches/02_use_cli_for_wrapper.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_use_cli_for_wrapper.dpatch by Christopher James Halse Rogers +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use /usr/bin/cli for the wrapper script instead of calling mono +## DP: directly. +## DP: For cli policy conformance. + +@DPATCH@ +diff -urNad gnome-do-0.8.3.1+dfsg~/Do/gnome-do.in gnome-do-0.8.3.1+dfsg/Do/gnome-do.in +--- gnome-do-0.8.3.1+dfsg~/Do/gnome-do.in 2009-12-08 16:21:50.000000000 +1100 ++++ gnome-do-0.8.3.1+dfsg/Do/gnome-do.in 2009-12-09 12:01:25.200827672 +1100 +@@ -18,8 +18,8 @@ + + # If Do is not running, run it. + if pgrep -u "`id -u`" '^gnome-do$' >/dev/null; then +- mono "$GNOME_DO_EXE" "$@" ++ /usr/bin/cli "$GNOME_DO_EXE" "$@" + fi + while [ "$?" -eq "20" ]; do +- mono "$GNOME_DO_EXE" "$@" ++ /usr/bin/cli "$GNOME_DO_EXE" "$@" + done --- gnome-do-0.8.3.1+dfsg.orig/debian/patches/03_fix_gks_crashers.dpatch +++ gnome-do-0.8.3.1+dfsg/debian/patches/03_fix_gks_crashers.dpatch @@ -0,0 +1,118 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_gks_crahers.dpatch by Christopher James Halse Rogers +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad fix-lp555137~/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GnomeKeyringSecurePreferencesService.cs fix-lp555137/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GnomeKeyringSecurePreferencesService.cs +--- fix-lp555137~/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GnomeKeyringSecurePreferencesService.cs 2010-04-14 11:42:39.000000000 +1000 ++++ fix-lp555137/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/GnomeKeyringSecurePreferencesService.cs 2010-04-14 12:27:33.252245271 +1000 +@@ -20,6 +20,7 @@ + + using System; + using System.Collections; ++using System.Threading; + using System.ComponentModel; + + using Mono.Unix; +@@ -61,52 +62,76 @@ + public bool Set (string key, string val) + { + Hashtable keyData; +- ++ + if (!Ring.Available) { + Log.Error (KeyringUnavailableMessage); + return false; + } + + keyData = new Hashtable (); +- keyData [AbsolutePathForKey (key)] = key; +- +- try { +- Ring.CreateItem (Ring.GetDefaultKeyring (), ItemType.GenericSecret, AbsolutePathForKey (key), keyData, val.ToString (), true); +- } catch (KeyringException e) { +- Log.Error (ErrorSavingMessage, key, e.Message); +- Log.Debug (e.StackTrace); ++ keyData[AbsolutePathForKey (key)] = key; ++ ++ bool success = false; ++ AutoResetEvent completed = new AutoResetEvent (false); ++ ++ Services.Application.RunOnMainThread (delegate { ++ try { ++ Ring.CreateItem (Ring.GetDefaultKeyring (), ItemType.GenericSecret, AbsolutePathForKey (key), keyData, val.ToString (), true); ++ success = true; ++ } catch (KeyringException e) { ++ Log.Error (ErrorSavingMessage, key, e.Message); ++ Log.Debug (e.StackTrace); ++ success = false; ++ } finally { ++ completed.Set (); ++ } ++ }); ++ if (!completed.WaitOne (200)) { + return false; + } +- +- return true; ++ return success; + } + + public bool TryGet (string key, out string val) + { + Hashtable keyData; +- +- val = ""; +- ++ ++ string secret = ""; ++ + if (!Ring.Available) { + Log.Error (KeyringUnavailableMessage); ++ val = ""; + return false; + } + + keyData = new Hashtable (); +- keyData [AbsolutePathForKey (key)] = key; ++ keyData[AbsolutePathForKey (key)] = key; + +- try { +- foreach (ItemData item in Ring.Find (ItemType.GenericSecret, keyData)) { +- if (!item.Attributes.ContainsKey (AbsolutePathForKey (key))) continue; ++ bool success = false; ++ AutoResetEvent completed = new AutoResetEvent (false); + +- val = item.Secret; +- return true; ++ Services.Application.RunOnMainThread (delegate { ++ try { ++ foreach (ItemData item in Ring.Find (ItemType.GenericSecret, keyData)) { ++ if (!item.Attributes.ContainsKey (AbsolutePathForKey (key))) ++ continue; ++ ++ secret = item.Secret; ++ success = true; ++ break; ++ } ++ } catch (KeyringException) { ++ Log.Debug (KeyNotFoundMessage, AbsolutePathForKey (key)); ++ success = false; ++ } finally { ++ completed.Set (); + } +- } catch (KeyringException) { +- Log.Debug (KeyNotFoundMessage, AbsolutePathForKey (key)); ++ }); ++ if (!completed.WaitOne (200)) { ++ success = false; + } +- +- return false; ++ val = secret; ++ return success; + } + + #endregion --- gnome-do-0.8.3.1+dfsg.orig/debian/patches/00list +++ gnome-do-0.8.3.1+dfsg/debian/patches/00list @@ -0,0 +1,5 @@ +00_remove_bundledlibs +01_fix_libX11_linkage +02_use_cli_for_wrapper +03_fix_gks_crashers +10_sk_translation_update --- gnome-do-0.8.3.1+dfsg.orig/debian/patches/00_remove_bundledlibs.dpatch +++ gnome-do-0.8.3.1+dfsg/debian/patches/00_remove_bundledlibs.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00_remove_bundledlibs.dpatch by Iain Lane +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-do-0.8.1.3+dfsg~/Makefile.am gnome-do-0.8.1.3+dfsg/Makefile.am +--- gnome-do-0.8.1.3+dfsg~/Makefile.am 2009-03-17 17:57:09.000000000 +0000 ++++ gnome-do-0.8.1.3+dfsg/Makefile.am 2009-03-22 22:35:31.000000000 +0000 +@@ -4,7 +4,6 @@ + + SUBDIRS = \ + . \ +- BundledLibraries \ + data \ + Do.Universe \ + Do.Platform \ +