--- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/compat +++ gnome-do-plugins-0.8.1.3+dfsg/debian/compat @@ -0,0 +1 @@ +7 --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/watch +++ gnome-do-plugins-0.8.1.3+dfsg/debian/watch @@ -0,0 +1,4 @@ +version=3 + +opts=dversionmangle=s/\+dfsg$// \ +https://launchpad.net/do-plugins/+download http://launchpad.net/do-plugins/.*/.*/\+download/gnome-do-plugins-(.*).tar.gz --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/copyright +++ gnome-do-plugins-0.8.1.3+dfsg/debian/copyright @@ -0,0 +1,204 @@ +Format-Specification: + http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=226 +Upstream-Source: https://launchpad.net/do-plugins/+download +Upstream-Name: GNOME Do Plugins + +X-Repacked-Comment: + The upstream source has been repacked to remove the shipped binary + compiler gmcs.exe. See README.Source for details. + +Files: debian/* +Copyright: © 2008 Christopher James Halse Rogers , + © 2008 Colin Turner +License: GPL-3+ + +Files: * +Copyright: © 2007 David Siegel, + © 2007 Elliot Murphy, + © 2007 Jason Jones, + © 2007 Peter Stuifzand, + © 2007 Christopher Edwards, + © 2007 Kenneth Simon +License: GPL-3+ + +Files: Archive/src/*.cs +Copyright: © 2008 Guillaume Béland +License: GPL-2+ + +Files: Cl.ickable/src/*.cs +Copyright: © 2008 IdeaLab +License: GPL-2+ + +File: DiskMounter/src/DriveItem.cs +Copyright: © 2008 Alex Launi +License: GPL-3+ + +File: File/src/CreateDirectory.cs +Copyright: © 2008 Alex Launi +License: GPL-3+ + +File: Pidgin/src/PidginAccount{Actions,ItemSource}.cs +Copyright: © 2008 Alex Launi +License: GPL-3+ + +File: Pidgin/src/Pidgin{Account,StatusType}Item.cs +Copyright: © 2008 Alex Launi +License: GPL-3+ + +Files: RequestTracker/src/*.cs +Copyright: © 2009 Chris Jones +License: GPL-3+ + +Files: Riptide/src/*.cs +Copyright: © 2007 David Siegel, + © 2007 Elliot Murphy, + © 2007 Jason Jones, + © 2007 Peter Stuifzand, + © 2007 Christopher Edwards, + © 2007 Kenneth Simon +License: GPL-2+ + +Files: RSS/src/RSS.NET/* +Copyright: © 2002 - 2005 Geource Tsiokos +License: other + 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. + +Files: Shelf/src/*.cs +Copyright: © 2007 David Siegel, + © 2007 Elliot Murphy, + © 2007 Jason Jones, + © 2007 Peter Stuifzand, + © 2007 Christopher Edwards, + © 2007 Kenneth Simon +License: GPL-2+ + +Files: Tomboy/src/TomboyConfiguration.cs +Copyright: © 2008 Novell, Inc +License: other + 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. + +Files: Twitter/src/Twitterizer/* +Copyright: © 2008 digitallyborn +Copyright: © 2008 jmargolese +License: GPL-3+ + +Files: YouTube/src/*.cs +Copyright: © 2009 Luis Miguel Montiel +License: GPL-3+ + +Files: WindowManager/src/*.cs +Copyright: © 2007 David Siegel, + © 2007 Elliot Murphy, + © 2007 Jason Jones, + © 2007 Peter Stuifzand, + © 2007 Christopher Edwards, + © 2007 Kenneth Simon +License: GPL-2+ + +Files: BundledLibraries/libgoogle-data-mono-1.4.0.2/*.cs +Copyright: © 2006-2008 Google, Inc. +License: Apache-2 + +Files: BundledLibraries/libgoogle-data-mono-1.4.0.2/src/core/HttpUtility.cs +Copyright: © 2005 Novell, Inc +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. + +License: 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'. + +License: GPL-2+ + 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 2 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-2'. + +License: Apache-2 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + /usr/share/common-licenses/Apache-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/control +++ gnome-do-plugins-0.8.1.3+dfsg/debian/control @@ -0,0 +1,61 @@ +Source: gnome-do-plugins +Section: gnome +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian CLI Applications Team +Uploaders: Christopher James Halse Rogers , Colin Turner +Build-Depends: debhelper (>= 7), + cli-common-dev (>= 0.5.7), + dpatch +Build-Depends-Indep: + mono-devel (>= 2.0) + autotools-dev, + automake, + gnome-do (>= 0.8.1.3), + banshee (>= 1.4.2), + pkg-config, + intltool, + libtool, + libglib2.0-dev, + libevolution5.0-cil, + libflickrnet2.1.5-cil, + libgconf2.24-cil, + libglade2.0-cil, + libglib2.0-cil, + libgnomedesktop2.20-cil, + libgnome-keyring1.0-cil, + libgnome2.24-cil, + libgnome-vfs2.24-cil, + libgtk2.0-cil, + libmono-addins0.2-cil, + libmono-addins-gui0.2-cil, + libndesk-dbus1.0-cil, + libndesk-dbus-glib1.0-cil, + libnotify0.4-cil, + libwnck2.20-cil, + libmono-sqlite2.0-cil, + libmono-system-data2.0-cil, + libmono-system-web2.0-cil +Standards-Version: 3.8.0 +Homepage: http://do.davebsd.com +Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/gnome-do-plugins/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk + +Package: gnome-do-plugins +Architecture: all +Depends: ${cli:Depends}, + ${misc:Depends}, + gnome-do (>= 0.8) +Recommends: mlocate | slocate | locate +Conflicts: gnome-do-plugin-amarok, gnome-do-plugin-rhythmbox +Replaces: gnome-do-plugin-amarok, gnome-do-plugin-rhythmbox +Suggests: banshee, + epiphany-browser, + evolution, + iceweasel | firefox, + pidgin, + rhythmbox +Description: Extra functionality for GNOME-Do launcher + This package provides extra plugins for GNOME-Do. It includes plugins for + interacting with Evolution & Thunderbird contacts, Pidgin IM buddies, + searching the Web using Firefox search plugins, and more. --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/rules +++ gnome-do-plugins-0.8.1.3+dfsg/debian/rules @@ -0,0 +1,71 @@ +#!/usr/bin/make -f +# +# Rules file for gnome-do-plugins +# + +#export DH_VERBOSE=1 + +include /usr/share/cli-common/cli.make +include /usr/share/dpatch/dpatch.make + +configure: configure-stamp + +configure-stamp: patch-stamp + autoreconf -I m4/shamrock + touch $@ + +build: configure + CSC=/usr/bin/csc MCS=/usr/bin/csc dh $@ + +clean: unpatch + dh clean +# Clean buildsystem changes + find . -iname Makefile.in -delete + rm -f configure + +install: build + dh $@ + +binary: binary-indep + dh $@ + +binary-indep: install + dh $@ + +# provide a target, it does nothing but depend upon build as per policy +binary-arch: build + +# Makefile arcanery warning: +# $(dir $(_)) gives us the path containing this rules file. +# I haven't found this documented in any make documentation, so I am unsure +# how portable/version independent it is. +# This magic care of Emmet Hickory: +# (http://lists.debian.org/debian-devel-games/2008/02/msg00135.html) + +TEMP_DIR := $(shell mktemp -d) +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-plugins_$(UPVERSION).orig.tar.gz" | tr -d " ") + +download-tarball: + uscan --download --destdir $(TEMP_DIR) \ + --no-symlink --force-download --download-version $(CURVER) \ + --watchfile=$(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 + [ -d ../tarballs ] || mkdir ../tarballs + mv $(TEMP_DIR)/*.orig.tar.gz ../tarballs + rm -r $(TEMP_DIR) + +.PHONY: configure build clean install binary binary-indep binary-arch download-tarball strip-shipped-binaries repack-source get-orig-source patch --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/README.Source +++ gnome-do-plugins-0.8.1.3+dfsg/debian/README.Source @@ -0,0 +1,11 @@ +Source package information for GNOME Do Plugins +---------------------------------------------- + * 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 + gmcs.exe compiler. + 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. + -- Christopher James Halse Rogers Sun, 24 Aug 2008 15:38:45 +1000 --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/changelog +++ gnome-do-plugins-0.8.1.3+dfsg/debian/changelog @@ -0,0 +1,198 @@ +gnome-do-plugins (0.8.1.3+dfsg-0ubuntu2) jaunty; urgency=low + + * debian/patches/10_rhtyhmbox_file.patch: Backport upstream patch to fix RB + plugin + * debian/patches/20_use_csc.patch: Patch gdata to use csc compiler + + -- Iain Lane Wed, 18 Mar 2009 15:31:04 +0000 + +gnome-do-plugins (0.8.1.3+dfsg-0ubuntu1) jaunty; urgency=low + + [ Daniel T Chen ] + * New upstream release (LP: #344578) + + Banshee plugin goes crazy if banshee isn't loaded first + (LP: #289802) + + gnome-do gCalculate plugin fails to display "times" symbol + (LP: #274252) + + Banshee-1 fails to build in Mono 2.0 (LP: #309188) + + Pidgin 2.5.4 has incompatible dbus interface. s/uint/int/ + (LP: #314927) + + Pidgin plugin hangs opening a chat if pidgin is unresponsive + (LP: #315565) + + twitter plugin still reports friend updates even when + deactivated (LP: #317674) + + Misspelling in microblogging plugin confirmation message + (LP: #319433) + + make install uses mdtool, but configure doesn't check for it + (LP: #322951) + + Virtualbox Icon in 2.10 are broken because of a new + specification (LP: #323902) + + Google Maps Plugin shouldn't always use route (LP: #324271) + + Fix for Google Maps when using newlines and other special + characters (LP: #324667) + + VirtualBox failed to load icon (LP: #325712) + + 'Read Man Pages' plugin makes Gnome-Do unresponsive + (LP: #325935) + + Search returns broken URLs (LP: #327855) + + Default action for SSH hosts is "open" (LP: #328236) + + Files and Folders Configuration doesn't use standard buttons + (LP: #328236) + + Window manager maximize action should focus if window is not + currently focused (LP: #258893) + + Locate plugin has no error message (LP: #262360) + + Wishlist: Let user specify files and folders to ignore + (LP: #263177) + + ts-client plugin doesn't index subdirectories (LP: #322352) + + Max 3000 items in Files and Folders plugin (LP: #324105) + + putty cannot find host when running from gnome do + (LP: #324282) + + locate plugin with globbing (LP: #334798) + + Twitter plugin encountered an error in UpdateFriends + (LP: #317575) + + gnome-terminal profiles no longer work (LP: #321977) + + Creating a task using Remember the Milk plugin can fail if + no task list is specified (LP: #324066) + + bundled libraries makefile needs destdir (LP: #324704) + + Typographical error in del.icio.us plugin (LP: #330525) + + ImageShack fails to upload (LP: #337324) + * debian/copyright + + Refresh for new upstream version; new plugins added. + * debian/patches/00_dfsg_autofoo.dpatch + + Update for new upstream version + + Don't build the YouTube plugin due to removal of shipped + exes and dlls causing FTBFS + * debian/patches/02_ssh_respect_exec_arg.dpatch + debian/patches/03_buildsystem_respect_mcs.dpatch + debian/patches/04_fix_pidgin_dbus_ints.dpatch + + Drop; fixed upstream + + [ Iain Lane ] + * debian/rules: Update repackaging to not delete *.dll; upstream now ships + source copies of google-gdata meaning we can now enable the Google and + Youtube plugins. + * debian/patches/00_dfsg_autofoo: Drop, fixed by including and building + these libs now. + * debian/copyright: Update with information for google-gdata. + * debian/patches/04_fix_pidgin_dbus_ints.dpatch: Add left out piece of patch + * debian/control: Bump gnome-do build-dep to require current version. + + -- Iain Lane Wed, 18 Mar 2009 00:40:51 +0000 + +gnome-do-plugins (0.8.0.2+dfsg1-1~ubuntu3) jaunty; urgency=low + + * debian/patches/04_fix_pidgin_dbus_ints.dpatch: Added first bit of upstream + patch which I had left out. + + -- Jonathan Davies Sat, 07 Mar 2009 22:52:13 +0000 + +gnome-do-plugins (0.8.0.2+dfsg1-1~ubuntu2) jaunty; urgency=low + + * Added debian/patches/04_fix_pidgin_dbus_ints.patch: Fixes D-Bus errors with + Pidgin Chat plugin - backported fix from upstream (Bazaar revision 557) + (LP: #314927). + + -- Jonathan Davies Sat, 07 Mar 2009 21:46:57 +0000 + +gnome-do-plugins (0.8.0.2+dfsg1-1~ubuntu1) jaunty; urgency=low + + * Bump dfsg version to pick up repacking fixes by Christopher James Halse + Rogers which allow previously disabled plugins to be reenabled. + * debian/patches/01_firefox_iceweasel_rename: The profiles file is called + profiles.ini and not profile.ini. Update accordingly. + + -- Iain Lane Fri, 27 Feb 2009 17:59:16 +0000 + +gnome-do-plugins (0.8.0.2+dfsg-1~ubuntu3) jaunty; urgency=low + + * Rebuild libevolution3.0-cil -> libevolution5.0-cil (LP: #332784) + + -- Stefan Lesicnik Tue, 24 Feb 2009 13:39:08 +0200 + +gnome-do-plugins (0.8.0.2+dfsg-1~ubuntu2) jaunty; urgency=low + + * debian/patches/03_disable_plugins_ftbfs.dpatch: Temporary workaround for + now to disable some plugins which caused a build failure. + + -- Iain Lane Sun, 15 Feb 2009 13:15:43 +0000 + +gnome-do-plugins (0.8.0.2+dfsg-1~ubuntu1) jaunty; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream version + * debian/control: + + gnome-sharp2 transition (LP: #314516) + + Add banshee build-dep + + Drop monodevelop build-dep; upstream uses mautil rather than mdtool now + + Bump required gnome-do version in Build-Dep & Depends. + + Suggest Banshee + * debian/copyright: + + Refresh for new upstream version; new plugins added. + * debian/rules: + + Rework clean target to simply delete files generated by autoreconf, + rather than trying to preserve them. + + Remove XDG_CONFIG_DIR hack needed for mdtool + * debian/patches/01_firefox_iceweasel_rename: + + Refresh for new upsteam changes. + + Extend to also make the Firefox bookmark plugin index iceweasel bookmarks + + [ Iain Lane ] + * Tag pkg-cli-apps SVN revision into Jaunty, to get in before Feature + Freeze. Should be a sync after the next Debian upload. + * debian/control: Add ${misc:Depends} build-dep + * debian/rules: Do not fail if configure is missing (e.g. clean twice in a + row) + + -- Christopher James Halse Rogers Thu, 05 Feb 2009 16:58:51 +1100 + +gnome-do-plugins (0.6.0.1+dfsg-1) experimental; urgency=low + + [ Christopher James Halse Rogers ] + * New upstream version + * debian/control + + Refresh build-depends + + Don't Suggest amarok, the plugin is no longer built + + Bump standards-version, adding a README.Source + + Add conflicts for old Ubuntu packages. Makes my Ubuntu job easier, + and apparently some Debian users care too (closes: #486609) + + Mono 2.0 transition: + - B-D-I on mono-devel (>= 2.0) rather than mono-gmcs + * debian/rules + + Remove --disable-banshee and --disable-amarok from the configure flags. + These plugins are no longer built upstream. + + Expand get-orig-source to strip the binary DLLs from the source tarball + + Run autoreconf after patching to not build plugins dependent on the + shipped binary libs. + + Make a copy the original Makefile.in & configure before patching and + copy back on clean. + + Export a temporary XDG_CONFIG_HOME. The build uses mdtool, which wants + to write to $XDG_CONFIG_HOME. + + Mono 2.0 transition: + - Call dh build with MCS=/usr/bin/csc + * debian/patches/00_dfsg_autofoo + + Remove the plugins that depend on the shipped binaries from the build + * debian/patches/01_firefox_iceweasel_rename + + Refresh for new version + * debian/patches/02_ssh_respect_exec_arg + + Respect the terminal's "exec" arg set in gconf. Patch by + Philipp A. Hartmann. The rest of the patch is superseded by the new + upstream version. (closes: #49777) + * debian/patches/03_buildsystem_respect_mcs + + Remove hardcoded gmcs compiler from *.am; replace with $(MCS) + * debian/watch + + Update for new upstream location, add version mangle for dfsg + * debian/copyright + + Refresh for new upstream version + + Update to latest CopyrightFormat proposal + + [ David Paleino ] + * Fixing get-orig-source target (and download-tarball) to be more + reliable, and make them work with svn-buildpackage out-of-the-box. + + -- Christopher James Halse Rogers Sat, 29 Nov 2008 18:06:37 +1100 + +gnome-do-plugins (0.4.0-1) unstable; urgency=low + + * Initial Debian package (closes: #480673) + + -- Colin Turner Sun, 11 May 2008 15:08:58 +1000 + --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/patches/01_firefox_iceweasel_rename.dpatch +++ gnome-do-plugins-0.8.1.3+dfsg/debian/patches/01_firefox_iceweasel_rename.dpatch @@ -0,0 +1,97 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## firefox_iceweasel_rename.dpatch by +## +## DP: The OpenSearch plugin searches for firefox search plugins, +## DP: but of course, on a Debian system this is to be found under +## DP: iceweasel, not firefox. +## DP: +## DP: This patch also makes the Firefox bookmarks plugin index +## DP: Iceweasel bookmarks. + +@DPATCH@ +diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/Firefox/src/BookmarkItemSource.cs gnome-do-plugins-0.8.0.2+dfsg/Firefox/src/BookmarkItemSource.cs +--- gnome-do-plugins-0.8.0.2+dfsg~/Firefox/src/BookmarkItemSource.cs 2009-02-05 11:09:32.000000000 +1100 ++++ gnome-do-plugins-0.8.0.2+dfsg/Firefox/src/BookmarkItemSource.cs 2009-02-14 16:07:30.311657330 +1100 +@@ -94,7 +94,12 @@ + + home = Environment.GetFolderPath (Environment.SpecialFolder.Personal); + profile = null; +- path = Path.Combine (home, ".mozilla/firefox/profiles.ini"); ++ path = Path.Combine (home, ".mozilla"); ++ if (Directory.Exists (Path.Combine (path, "firefox"))) { ++ path = Path.Combine (path, "firefox/profiles.ini"); ++ } else if (Directory.Exists (Path.Combine (path, "iceweasel"))) { ++ path = Path.Combine (path, "iceweasel/profiles.ini"); ++ } + using (StreamReader r = File.OpenText (path)) { + while (null != (line = r.ReadLine ())) { + if (line.StartsWith (BeginDefaultProfile)) break; +diff -urNad gnome-do-plugins-0.8.0.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs gnome-do-plugins-0.8.0.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs +--- gnome-do-plugins-0.8.0.2+dfsg~/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2009-02-05 11:09:31.000000000 +1100 ++++ gnome-do-plugins-0.8.0.2+dfsg/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2009-02-14 16:18:21.656805145 +1100 +@@ -37,6 +37,9 @@ + /// + public class FirefoxOpenSearchDirectoryProvider + { ++ private static string firefoxPath = "/usr/bin/firefox"; ++ private static string iceweaselPath = "/usr/bin/iceweasel"; ++ + private List openSearchPluginDirectories; + + /// +@@ -82,11 +85,17 @@ + // for installing in different directories. We could certainly shell + // out and call which or something... + string beginLibDir = "LIBDIR="; +- string binFile = "/usr/bin/firefox"; ++ string binFile = ""; + string line, libDir; + + libDir = null; + ++ if (File.Exists (firefoxPath)) { ++ binFile = firefoxPath; ++ } else if (File.Exists (iceweaselPath)) { ++ binFile = iceweaselPath; ++ } ++ + using (StreamReader r = File.OpenText (binFile)) { + while (null != (line = r.ReadLine ())) { + if (line.StartsWith (beginLibDir)) { +@@ -111,6 +120,18 @@ + return null; + } + ++ private string UserBrowserPath { ++ get { ++ string mozillaPath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mozilla"); ++ if (Directory.Exists (Path.Combine (mozillaPath, "firefox"))) { ++ mozillaPath = Path.Combine (mozillaPath, "firefox"); ++ } else if (Directory.Exists (Path.Combine (mozillaPath, "iceweasel"))) { ++ mozillaPath = Path.Combine (mozillaPath, "iceweasel"); ++ } ++ return mozillaPath; ++ } ++ } ++ + /// + /// Retrieves the profile plugin directory, which is where the + /// user installed OpenSearch plugins are located. +@@ -128,7 +149,7 @@ + + profile = null; + +- profilePath = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mozilla/firefox/profiles.ini"); ++ profilePath = Path.Combine (UserBrowserPath, "profiles.ini"); + using (StreamReader r = File.OpenText (profilePath)) { + while (null != (line = r.ReadLine ())) { + if (line.StartsWith (beginDefaultProfile)) break; +@@ -141,7 +162,7 @@ + } + + if(profile != null) { +- string path = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), ".mozilla/firefox"); ++ string path = UserBrowserPath; + path = Path.Combine (path, profile); + path = Path.Combine (path, "searchplugins"); + --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/patches/00list +++ gnome-do-plugins-0.8.1.3+dfsg/debian/patches/00list @@ -0,0 +1,4 @@ +01_firefox_iceweasel_rename +04_fix_pidgin_dbus_ints.dpatch +10_fix_rhythmbox_file.dpatch +20_use_csc.dpatch --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/patches/04_fix_pidgin_dbus_ints.dpatch +++ gnome-do-plugins-0.8.1.3+dfsg/debian/patches/04_fix_pidgin_dbus_ints.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_fix_pidgin_dbus_ints.dpatch by Iain Lane +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/Pidgin/src/PidginAccountActions.cs gnome-do-plugins-0.8.1.3+dfsg/Pidgin/src/PidginAccountActions.cs +--- gnome-do-plugins-0.8.1.3+dfsg~/Pidgin/src/PidginAccountActions.cs 2009-03-17 17:56:56.000000000 +0000 ++++ gnome-do-plugins-0.8.1.3+dfsg/Pidgin/src/PidginAccountActions.cs 2009-03-17 20:04:22.000000000 +0000 +@@ -114,7 +114,12 @@ + + try { + prpl = Pidgin.GetPurpleObject (); +- prpl.PurpleAccountSetEnabled (account.Id, "gtk-gaim", 0); ++ try { ++ prpl.PurpleAccountSetEnabled (account.Id, "gtk-gaim", (int) 0); ++ } ++ catch { ++ prpl.PurpleAccountSetEnabled (account.Id, "gtk-gaim", (uint) 0); ++ } + } catch (Exception e) { + Log.Error ("Could not disable Pidgin account: {0}", e.Message); + Log.Debug (e.StackTrace); --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/patches/10_fix_rhythmbox_file.dpatch +++ gnome-do-plugins-0.8.1.3+dfsg/debian/patches/10_fix_rhythmbox_file.dpatch @@ -0,0 +1,27 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_fix_rhythmbox_file.dpatch by Iain Lane +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Make Rhythmbox plugin functional by checking new (XDG) location for database + +@DPATCH@ +diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/Rhythmbox/src/Rhythmbox.cs gnome-do-plugins-0.8.1.3+dfsg/Rhythmbox/src/Rhythmbox.cs +--- gnome-do-plugins-0.8.1.3+dfsg~/Rhythmbox/src/Rhythmbox.cs 2009-03-17 17:56:56.000000000 +0000 ++++ gnome-do-plugins-0.8.1.3+dfsg/Rhythmbox/src/Rhythmbox.cs 2009-03-18 15:29:25.000000000 +0000 +@@ -43,8 +43,15 @@ + + static Rhythmbox () + { ++ string xdgDbFile; + string home = Environment.GetFolderPath (Environment.SpecialFolder.Personal); +- MusicLibraryFile = Path.Combine (home, ".gnome2/rhythmbox/rhythmdb.xml"); ++ ++ // this is for version compatibility, the new version of RB uses XDG dirs ++ xdgDbFile = Path.Combine (ReadXdgUserDir ("XDG_DATA_HOME", ".local/share"), "rhythmbox/rhythmdb.xml"); ++ MusicLibraryFile = File.Exists (xdgDbFile) ++ ? xdgDbFile ++ : Path.Combine (home, ".gnome2/rhythmbox/rhythmdb.xml"); ++ + CoverArtDirectory = Path.Combine (ReadXdgUserDir ("XDG_CACHE_HOME", ".cache"), "rhythmbox/covers"); + + clear_songs_timer = new Timer (state => --- gnome-do-plugins-0.8.1.3+dfsg.orig/debian/patches/20_use_csc.dpatch +++ gnome-do-plugins-0.8.1.3+dfsg/debian/patches/20_use_csc.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_use_csc.dpatch by Iain Lane +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/libgoogle-data-mono-1.4.0.2/Makefile gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/libgoogle-data-mono-1.4.0.2/Makefile +--- gnome-do-plugins-0.8.1.3+dfsg~/BundledLibraries/libgoogle-data-mono-1.4.0.2/Makefile 2009-03-17 17:56:56.000000000 +0000 ++++ gnome-do-plugins-0.8.1.3+dfsg/BundledLibraries/libgoogle-data-mono-1.4.0.2/Makefile 2009-03-18 15:43:10.000000000 +0000 +@@ -1,5 +1,5 @@ + CSC1 ?= mcs +-CSC ?= gmcs ++CSC ?= /usr/bin/csc + + DEFINES=/d:TRACE +