--- conduit-0.3.16.orig/debian/install +++ conduit-0.3.16/debian/install @@ -0,0 +1 @@ +usr/ --- conduit-0.3.16.orig/debian/compat +++ conduit-0.3.16/debian/compat @@ -0,0 +1 @@ +5 --- conduit-0.3.16.orig/debian/rules +++ conduit-0.3.16/debian/rules @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +PYVERS=$(shell pyversions -vs) + +configure: configure-stamp +configure-stamp: patch + dh_testdir + + ./configure $(confflags) --enable-maintainer-mode \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info --disable-scrollkeeper + + touch $@ + +build: build-stamp + +build-stamp: configure-stamp + $(MAKE) + + touch $@ + +clean:: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) clean + + rm -rf debian/patched + rm -f po/*.gmo + + dh_clean + +install: build-stamp install-arch install-indep + +install-indep: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs -a + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + mv -f $(CURDIR)/debian/tmp/usr/bin/conduit.real $(CURDIR)/debian/tmp/usr/bin/conduit + +install-arch: + +binary-indep: build install + dh_testdir + dh_testroot + dh_install --sourcedir=debian/tmp + dh_installchangelogs -i NEWS + dh_installdocs -i + dh_scrollkeeper -i + dh_icons -i + dh_compress -i + dh_fixperms -i + dh_pysupport -i /usr/lib/conduit/modules + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- conduit-0.3.16.orig/debian/control +++ conduit-0.3.16/debian/control @@ -0,0 +1,26 @@ +Source: conduit +Section: devel +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Jose Carlos Garcia Sogo +Build-Depends: debhelper (>= 5.0.51~), python-support (>= 0.5.3), python-all-dev, dpatch, python-vobject, libdbus-1-dev, python-pygoocanvas (>= 0.9), python-gtk2-dev, intltool, gnome-doc-utils, python-dbus (>= 0.80.0), python-webkitgtk-dev, python-dateutil +Standards-Version: 3.8.0 +Vcs-Git: git://git.debian.org/git/users/jsogo/conduit.git + +Package: conduit +Architecture: all +Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, python-gtk2, python-pygoocanvas (>= 0.9), python-dbus, python-vobject, python-gnome2 (>= 2.22.0), python-glade2, python-gnome2-desktop (>= 2.22.0-1), python (>= 2.5) | python-pysqlite2, scrollkeeper, python-webkitgtk, python-dbus (>= 0.80.0), python-feedparser, python-gobject (>= 2.15.3), python-dateutil, python-gst0.10 +Recommends: python-simplejson, python-gpod +Provides: ${python:Provides} +Description: synchronization tool for GNOME + A syncronization tool for GNOME which allows the user to take their + emails, files, bookmarks, and any other type of personal information + and synchronize that data with another computer, an online service, or + even another electronic device. + . + Conduit manages the synchronization and conversion of data into other + formats. For example, conduit allows you to; + * Synchronize your tomboy notes to a file on a remote computer + * Synchronize your emails to your mobile phone + * Synchronize your bookmarks to delicious, gmail, or even your own webserver + * and many more.. --- conduit-0.3.16.orig/debian/copyright +++ conduit-0.3.16/debian/copyright @@ -0,0 +1,178 @@ +This packages was debianized by Jose Carlos Garcia Sogo +on Tue, 19 Feb 2007 14:13:22 +0100. + +It was downloaded from http://www.conduit-project.org + +Upstream Author: John Stowers + +Copyright: + For everything not noted below: + Copyright (C) 2006-2008 John Stowers + + For conduit/modules/FlickrModule/FlickrAPI + Copyright (C) 2007 Brian "Beej Jorgensen" Hall + + For conduit/modules/BackPack/backpack-1.1 + Copyright (c) 2006 Dustin Sallings + + For conduit/modules/SmugMugModule/SmugMugAPI + Copyright (C) 2004 John C. Ruttenberg + Copyright (C) 2007 Thomas Van Machelen + + For conduit/modules/ShutterflyModule/shutterfly + Copyright (C) 2006 manatlan manatlan[at]gmail(dot)com + Copyright (C) 2007 thomas.vanmachelen@gmail.com + Copyright (C) 2007 jasl8r@gmail.com + + For conduit/modules/BoxDotNetModule/BoxDotNetAPI + Copyright (c) 2007 Thomas Van Machelen + Copyright (c) 2007 John Stowers + + For conduit/modules/FacebookModule/pyfacebook + Copyright (c) 2008, Samuel Cormier-Iijima + + For conduit/modules/GoogleModule/gdata + Copyright (C) 2006 Google Inc. + +License: + +For everything not noted below: + + 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 package; 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 General +Public License can be found in `/usr/share/common-licenses/GPL'. + +For conduit/modules/FlickrModule/FlickrAPI + 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. + + Certain previous versions of this API were granted to the public + domain. You're free to use those as you please. + + Beej Jorgensen, Maintainer, 19-Jan-2007 + +For conduit/modules/BackPack/backpack-1.1 + 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. + +For conduit/modules/SmugMugModule/SmugMugAPI + 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; version 2 only. + + 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. + +For conduit/modules/FacebookModule/pyfacebook + Licensed under the BSD License + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of the nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/BSD'. + +For conduit/modules/BoxDotNetModule/BoxDotNetAPI + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For conduit/modules/GoogleModule/gdata + 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 + + http://www.apache.org/licenses/LICENSE-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. + + +The Debian packaging is (C) 2007-2008, Jose Carlos Garcia Sogo and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- conduit-0.3.16.orig/debian/changelog +++ conduit-0.3.16/debian/changelog @@ -0,0 +1,281 @@ +conduit (0.3.16-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #392884). + - New Configuration System + - Support Firefox3 Bookmarks + - Support Google Bookmarks + - Support Nautilus Bookmarks + - Add dataprovider for changing desktop wallpaper + - Autostart capability can now be controlled from the preferences UI + - Fix crash when syncing remote folder (LP: #204332) + - Fix sync with USB drive (LP: #301380) + - Use translations (LP: #333178) + * debian/patches/ + - 01_conduit.desktop.dpatch: Removed, Encoding filed is not used anymore + in desktop file. + - 03_gio.dpatch: Remove, GIO is now the default. + - use_webkit.dpatch: Remove, merged upstream. + - 05-display-help.dpatch: Remove, merged upstream. + - 07-python-2.6-network.dpatch: Remove, merged upstream. + - 00-remove-local-gdata.dpath: Add, use python-gdata package instead of the + version shipped with conduit. + * debian/control: + - Bump python-dbus build-depends and depends to (>= 0.80.0). + - Add python-dateutil as build-depends and depends. + - Add python-gst0.10 as Depends. + - Replace python-pysqlite2 Depends by python (>= 2.5) | python-pysqlite2 . + - Remove Suggests on mencoder and ffmpeg, conduit depends on gstreamer now. + - Add depends on python-gdata >= 1.0.10, for 00-remove-local-gdata.dpath. + + -- Julien Lavergne Sat, 27 Jun 2009 20:47:15 +0200 + +conduit (0.3.15-1ubuntu3) jaunty; urgency=low + + * debian/patches/07-python-2.6-network.dpatch + - From upstream: fix high CPU usage (LP: #362643) + + -- Julien Lavergne Fri, 17 Apr 2009 14:47:54 +0200 + +conduit (0.3.15-1ubuntu2) jaunty; urgency=low + + * New bugfix revision (LP: #334087) + * debian/patches/05-display-help.dpatch + - Display properly the help contents (LP: #332907). + * debian/patches/06-non-ASCII-folder-canvas.dpatch + - Show correct folder name with non-ASCII characters (LP: #306236). + + -- Julien Lavergne Tue, 24 Feb 2009 23:06:17 +0100 + +conduit (0.3.15-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #314847). Remaining Ubuntu changes: + * Switch to GIO. Add 03_gio.dpatch to set this and add a dependency + on python-gobject (>= 2.15.3) so that it is available. + * install conduit.real to /usr/bin/conduit + * debian/control: change build dependency from python-webkit-dev to + python-webkitgtk-dev and dependency from python-webkit to python-webkitgtk + + -- Fabrice Coutadeur Tue, 23 Dec 2008 04:32:45 +0100 + +conduit (0.3.15-1) unstable; urgency=low + + * New Upstream Version + * Use webkit instead of gtkmozembed, as recommended upstream (Closes: #490973) + + -- Jose Carlos Garcia Sogo Tue, 09 Dec 2008 00:13:55 +0100 + +conduit (0.3.14-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #302723), remaining changes: + * Switch to webkitgtk. Add 02_webkitgtk.dpatch to set this and add + a dependency on python-webkitgtk so that it is available. + * Switch to GIO. Add 03_gio.dpatch to set this and add a dependency + on python-gobject (>= 2.15.3) so that it is available. + * install conduit.real to /usr/bin/conduit + * added Depend on python-feedparser this was added upstream + in version 0.3.13.1-1 but never made it into ubuntu + + -- Manny Vindiola Thu, 27 Nov 2008 15:20:14 -0500 + +conduit (0.3.14-1) unstable; urgency=low + + * New Upstream Version + + Picasa provider no longer fails (Closes: #493569) + + Problems when adding folders fixed some versions ago (Closes: #452009) + + -- Jose Carlos Garcia Sogo Thu, 04 Sep 2008 23:34:06 +0200 + +conduit (0.3.14-0ubuntu1) intrepid; urgency=low + + * New Upstream Release (LP: #269011) + - Merge improved iPod support by Alexandre Rosenfeld. This was implemented as + part of GSOC08 and features + - Improved audio/video transcoding using GStreamer + - Support Webkit web browser + - Support GIO + - Numerous bugfixes + - Translations: + * Updated fi: Timo Jyrinki + * Updated ar: Djihed Afifi + * Updated pl: Tomasz Dominikowski + * Updated es: Jorge Gonzalez + - Help Manual Translations: + * Updated fr: Claude Paroz + * Updated de: Christian Kirbach + * debian/control: + - added Depend on python-webkitgtk + - added Depend on python-gobject + * debian/rules: + - install conduit.real to /usr/bin/conduit + * debian/patches: + - added 02_webkitgtk.dpatch to use webkitgtk as default + - added 03_gio.dpatch to use GIO instead of GnomeVfs + + -- Andreas Moog Thu, 11 Sep 2008 16:49:26 +0200 + +conduit (0.3.13.1-1) unstable; urgency=low + + * New Upstream Version + * Add python-feedparser as a new binary dependency + + -- Jose Carlos Garcia Sogo Thu, 21 Aug 2008 23:59:55 +0200 + +conduit (0.3.13.1-0ubuntu1) intrepid; urgency=low + + * New Upstream Release (LP :#257707) + * Resolved dependency issue by replacing python-mozembed + with pyton-gnome2-extras (LP: #255441) + + -- Michael Casadevall Wed, 13 Aug 2008 15:08:16 -0400 + +conduit (0.3.12-3) unstable; urgency=low + + * Brown paper bag release, or "Freeze the freeze release" + * Fix typo and Ubuntu-only dependency (Closes: #492767) + + -- Jose Carlos Garcia Sogo Mon, 28 Jul 2008 21:39:28 +0200 + +conduit (0.3.12-2) unstable; urgency=low + + * Add python-glade2 and python-gconf as dependencies (Closes: #492330) + + -- Jose Carlos Garcia Sogo Sun, 27 Jul 2008 11:28:30 +0200 + +conduit (0.3.12-1) unstable; urgency=low + + * New upstream version + + Fix SyntaxError problem during configure problem (Closes: #487074) + * We need python-goocanvas > 0.9. Make it explicit (Closes: #490172) + * Push Standard-Versions: no changes needed. + + -- Jose Carlos Garcia Sogo Thu, 24 Jul 2008 23:04:09 +0200 + +conduit (0.3.11.2-1) unstable; urgency=low + + * New upstream version. + * Drop dependency on python-gnome2-extras, and depend only in + python-gtkmozembed (Closes: #485294) + * As a temporary workaround, do not compile SmugMugModule, as it being + licensed under GPLv2 only is not compatible with gdata being licensed + under Apache License v2.0 (Closes: #485683) + + -- Jose Carlos Garcia Sogo Tue, 10 Jun 2008 23:35:25 +0200 + +conduit (0.3.10-1) unstable; urgency=low + + * New upstream version + + Honor F-Spot tag selection when syncing (Closes: #473900) + * Transition to python 2.5 as default version (Closes: #479695) + + -- Jose Carlos Garcia Sogo Sat, 10 May 2008 12:09:22 +0200 + +conduit (0.3.9-2) unstable; urgency=low + + * ACK previous NMU, thanks Sandro (Closes: #473936, #442526) + * We need to depend as well to python-dbus. + * Depend on python-gnome2 (Closes: #474370) + * Depend on python-gnome2-desktop >= 2.22.0-1, as it includes now + python-evolution module, and drop python-evolution + + -- Jose Carlos Garcia Sogo Sun, 06 Apr 2008 01:53:11 +0200 + +conduit (0.3.9-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/control + - added python-dbus build-dep (Closes: #473936) + * debian/rules + - removed bin files left under po directory (Closes: #442526) + + -- Sandro Tosi Fri, 04 Apr 2008 20:12:07 +0200 + +conduit (0.3.9-1) unstable; urgency=low + + * New Upstream Version + + Fixes problem with tags in F-Spot (Closes: #444954) + * Make watch file point to GNOME ftp. (Closes: #468920) + * Remove python-xml dependency (Closes: #468583) + * Lintian happiness: Bump debhelper dependency to >= 5.0.51~ as + we're using dh_icons. + + -- Jose Carlos Garcia Sogo Sun, 30 Mar 2008 00:43:47 +0100 + +conduit (0.3.8-1) unstable; urgency=low + + * New Upstream Version (Closes: #466077) + * debian/control: suggest mencoder and ffmpeg for AV converters, and + recommend python-gpod for iPod support. + * debian/patches: + + conduit.desktop: update, some of the changes already included upstream + + external-libgmail: disabled. Conduit needs SVN version of google module + * debian/control: + + remove python-gdata and python-libgmail dependencies, as internal copies + are being used + + -- Jose Carlos Garcia Sogo Sat, 01 Mar 2008 23:21:47 +0100 + +conduit (0.3.6-2) unstable; urgency=low + + * Add python-gnome2-extras to Depends for gtkmozembed libs (Closes: #462960) + + -- Jose Carlos Garcia Sogo Thu, 07 Feb 2008 22:39:58 +0100 + +conduit (0.3.6-1) unstable; urgency=low + + * New Upstream Version (Closes: #461078) + * debian/control: + + Fix Vcs field. It was wrongly using Vcs-Svn + + Add python-gdata dependency (Closes: #457845) + + Recommend python-simplejson, as can be used by facebook module. + * Add debian watch file. (Closes: #459220) + * Fix building and registering of documentation (Closes: #457861, #458653) + * debian/patches: + + 01_conduit.desktop: Make .desktop file HIG compliant (Closes: #448155) + + 00list: update to include above patch + * debian/copyright: update with licenses from new modules + + -- Jose Carlos Garcia Sogo Fri, 25 Jan 2008 00:59:29 +0100 + +conduit (0.3.4-1) unstable; urgency=low + + * New uptream version (Closes: #445260) + + Google Email has an icon now. (Closes: #434982) + * Use official Vcs field, and point it to git.debian.org + * Bump Standards-Version. No changes needed. + * Do not try to rename start_conduit wrapper script, as it does not exist. + * debian/patches: + + 01_conduit.desktop, + + 02_conduit, + + 03_autostart, disabled; fixed upstream + + external-libgmail: upgraded + + -- Jose Carlos Garcia Sogo Mon, 24 Dec 2007 20:49:53 +0100 + +conduit (0.3.3-1) unstable; urgency=low + + * New upstream release + * Add python-pysqlite2 package to dependency list for F-Spot module (Closes: #434311) + * Fix cropped line in description. + * Fix autostart file to point to right conduit launch script. + + -- Jose Carlos Garcia Sogo Sun, 30 Sep 2007 12:47:42 +0200 + +conduit (0.3.2-1) unstable; urgency=low + + * New upstream release. + * Depend on python-evolution (Closes: #432875) + * Depend on python-xml (Closes: #433339) + * Fix desktop file patch to point to right conduit launch script (Closes: #433344) + * Update 02_conduit patch + + -- Jose Carlos Garcia Sogo Sun, 22 Jul 2007 21:13:59 +0200 + +conduit (0.3.1-1) unstable; urgency=low + + * Initial release (Closes: #411646) + + There were other two packages yet uploaded, but rejected at NEW queue. + + List copyright and license for every bit in debian/copyright file. In + this version, BackPack API has been relicensed. + + -- Jose Carlos Garcia Sogo Sun, 10 Jun 2007 11:06:37 +0200 + --- conduit-0.3.16.orig/debian/pyversions +++ conduit-0.3.16/debian/pyversions @@ -0,0 +1 @@ +2.5- --- conduit-0.3.16.orig/debian/watch +++ conduit-0.3.16/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/conduit/([\d\.]+)/conduit-(.*)\.tar\.gz debian uupdate --- conduit-0.3.16.orig/debian/patches/06-non-ASCII-folder-canvas.dpatch +++ conduit-0.3.16/debian/patches/06-non-ASCII-folder-canvas.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06-non-ASCII-folder-canvas.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Upstream bug : http://bugzilla.gnome.org/show_bug.cgi?id=573014 +## DP: Ubuntu bug : https://bugs.launchpad.net/ubuntu/+source/conduit/+bug/306236 + +@DPATCH@ +diff -urNad conduit-fix~/conduit/modules/FileModule/FileModule.py conduit-fix/conduit/modules/FileModule/FileModule.py +--- conduit-fix~/conduit/modules/FileModule/FileModule.py 2009-02-24 22:56:27.000000000 +0100 ++++ conduit-fix/conduit/modules/FileModule/FileModule.py 2009-02-24 23:03:47.000000000 +0100 +@@ -116,7 +116,7 @@ + return self.folder + + def get_name(self): +- return Vfs.uri_get_filename(self.folder) ++ return Vfs.uri_unescape(Vfs.uri_get_filename(self.folder)) + + def _monitor_folder(self): + self._monitor.add(self.folder, self._monitor.MONITOR_DIRECTORY) --- conduit-0.3.16.orig/debian/patches/00list +++ conduit-0.3.16/debian/patches/00list @@ -0,0 +1,3 @@ +disableSmugMugModule.dpatch +06-non-ASCII-folder-canvas.dpatch +00-remove-local-gdata.dpath --- conduit-0.3.16.orig/debian/patches/disableSmugMugModule.dpatch +++ conduit-0.3.16/debian/patches/disableSmugMugModule.dpatch @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## disableSmugMugModule.dpatch by Jose Carlos Garcia Sogo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad conduit.git~/conduit/modules/Makefile.am conduit.git/conduit/modules/Makefile.am +--- conduit.git~/conduit/modules/Makefile.am 2008-06-10 22:00:37.000000000 +0200 ++++ conduit.git/conduit/modules/Makefile.am 2008-06-10 23:29:28.000000000 +0200 +@@ -8,7 +8,6 @@ + FlickrModule \ + FspotModule \ + iPodModule \ +- SmugMugModule \ + EvolutionModule \ + GoogleModule \ + ShutterflyModule \ +diff -urNad conduit.git~/conduit/modules/Makefile.in conduit.git/conduit/modules/Makefile.in +--- conduit.git~/conduit/modules/Makefile.in 2008-06-10 22:00:37.000000000 +0200 ++++ conduit.git/conduit/modules/Makefile.in 2008-06-10 23:29:38.000000000 +0200 +@@ -226,7 +226,6 @@ + FlickrModule \ + FspotModule \ + iPodModule \ +- SmugMugModule \ + EvolutionModule \ + GoogleModule \ + ShutterflyModule \ --- conduit-0.3.16.orig/debian/patches/external-libgmail.dpatch +++ conduit-0.3.16/debian/patches/external-libgmail.dpatch @@ -0,0 +1,15 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## external-libgmail.dpatch by Jose Carlos Garcia Sogo +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad conduit.git~/conduit/modules/GmailModule/Makefile.am conduit.git/conduit/modules/GmailModule/Makefile.am +--- conduit.git~/conduit/modules/GmailModule/Makefile.am 2008-02-24 23:14:53.000000000 +0100 ++++ conduit.git/conduit/modules/GmailModule/Makefile.am 2008-02-24 23:24:27.000000000 +0100 +@@ -1,4 +1,3 @@ +-SUBDIRS = libgmail + + conduit_handlersdir = $(libdir)/conduit/modules/GmailModule + conduit_handlers_PYTHON = GmailModule.py --- conduit-0.3.16.orig/debian/patches/00-remove-local-gdata.dpath +++ conduit-0.3.16/debian/patches/00-remove-local-gdata.dpath @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00-remove-local-gdata.dpath.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use packaged version of gdata and atom instead of local files. + +@DPATCH@ +diff -urNad conduit-0.3.16~/conduit/modules/GoogleModule/GoogleModule.py conduit-0.3.16/conduit/modules/GoogleModule/GoogleModule.py +--- conduit-0.3.16~/conduit/modules/GoogleModule/GoogleModule.py 2009-05-20 08:30:07.000000000 +0200 ++++ conduit-0.3.16/conduit/modules/GoogleModule/GoogleModule.py 2009-06-27 17:59:42.000000000 +0200 +@@ -26,7 +26,7 @@ + + #Distributors, if you ship python gdata >= 1.0.10 then remove this line + #and the appropriate directories +-Utils.dataprovider_add_dir_to_path(__file__) ++#Utils.dataprovider_add_dir_to_path(__file__) + try: + import atom.service + import gdata.service