5 files changed, 506 insertions, 117 deletions

diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index f9ea6ac0f726..d8a588588572 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -3,37 +3,61 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/conduit/Makefile,v 1.3 2006/10/11 20:26:26 ahze Exp $
+#    $MCom: ports/deskutils/conduit/Makefile,v 1.7 2008/03/18 14:53:42 ahze Exp $
 
 PORTNAME=	conduit
-PORTVERSION=	0.2.0
-PORTREVISION=	3
+PORTVERSION=	0.3.9
 CATEGORIES=	deskutils
-MASTER_SITES=	http://files.conduit-project.org/releases/
+MASTER_SITES=	GNOME
 
-MAINTAINER=	ahze@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Synchronization application for GNOME
 
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
+		${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \
+		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \
+		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
+		${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject \
+		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
+LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
 		${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree \
 		${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23 \
-		xmlproc_parse:${PORTSDIR}/textproc/py-xml
+		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
+		${PYTHON_SITELIBDIR}/vobject/__init__.py:${PORTSDIR}/deskutils/py-vobject \
+		firefox:${PORTSDIR}/www/firefox \
+		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
 
-NO_WRKSUBDIR=	yes
 USE_PYTHON=	2.4+
-MAKE_ENV=	DESTDIR=""
-USE_GNOME=	pygnome2
-DESKTOP_ENTRIES=	"Conduit" "${COMMENT}" "conduit-icon.png" \
-			"${PORTNAME}" "GNOME;Application;Office;" true
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
+INSTALLS_ICONS=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+USE_GNOME=	pygnome2 gnomeprefix
+OPTIONS=	NAUTILUS "Enable Nautilus Plugin" On \
+		EOG "Enable Eye-Of-Gnome Plugin" On
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|; \
-		s|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR:S/${LOCALBASE}/${PREFIX}/}|' \
-		${WRKSRC}/Makefile
+.if defined(WITH_NAUTILUS)
+USE_GNOME+=	nautilus2
+CONFIGURE_ARGS+=	--enable-nautilus-extension
+.endif
 
-pre-install:
-	${MKDIR} ${PREFIX}/share/applications
+.if defined(WITH_EOG)
+BUILD_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
+RUN_DEPENDS+=	eog:${PORTSDIR}/graphics/eog
+CONFIGURE_ARGS+=	--enable-eog-plugin
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/data/Makefile.in
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \
+		-e 's|/usr/bin/python|${LOCALBASE}/bin/python|' \
+		-e 's|/usr/lib/firefox*|${LOCALBASE}/lib/firefox|'
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/conduit/distinfo b/deskutils/conduit/distinfo
index f0440d95048e..f0b202122914 100644
--- a/deskutils/conduit/distinfo
+++ b/deskutils/conduit/distinfo
@@ -1,3 +1,3 @@
-MD5 (conduit-0.2.0.tar.gz) = 4f27b6ae1c416da186e58cf27175f598
-SHA256 (conduit-0.2.0.tar.gz) = 01b74297d701858fd800161facea5682f6e03b7bc7320140c8e236c98a8587ce
-SIZE (conduit-0.2.0.tar.gz) = 211110
+MD5 (conduit-0.3.9.tar.gz) = b04cd4b39ad0a689bff020ba23dd69b7
+SHA256 (conduit-0.3.9.tar.gz) = 04e6b207a73c140b09a96a32e81d470a46b414cc9f6022a2d4a4c0f8c59fb104
+SIZE (conduit-0.3.9.tar.gz) = 893253
diff --git a/deskutils/conduit/files/patch-Makefile b/deskutils/conduit/files/patch-Makefile
deleted file mode 100644
index d042246883a7..000000000000
--- a/deskutils/conduit/files/patch-Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
---- Makefile.orig	Wed Sep 20 05:08:31 2006
-+++ Makefile	Tue Oct 10 21:01:22 2006
-@@ -2,13 +2,13 @@
- VERSION=`cat conduit/__init__.py | grep 'APPVERSION=\"' | sed -e 's/APPVERSION=//' -e 's/\"//g'`
- 
- #Install prefix, can be overridden by setting DESTDIR
--PREFIX=/usr
-+PREFIX=%%PREFIX%%
- CWD=`pwd`
- 
- #Python version for installation into python dir
- PYTHON_VERSION=2.4
- #PYTHON_VERSION=`python -V 2>&1 | sed -e "s/Python //" | cut --bytes=1-3`
--PYTHON_PATH=$(DESTDIR)$(PREFIX)/lib/python$(PYTHON_VERSION)/site-packages
-+PYTHON_PATH=%%PYTHON_SITELIBDIR%%
- 
- #Source Files
- SRC=conduit/*.py conduit/dataproviders/*.py conduit/datatypes/*.py
-@@ -40,8 +40,8 @@
- 	mkdir -p $(DESTDIR)$(PREFIX)/share/conduit/dataproviders
- 	mkdir -p $(PYTHON_PATH)/conduit
- 	mkdir -p $(PYTHON_PATH)/conduit/datatypes
--	mkdir -p ~/.conduit
--	mkdir -p ~/.conduit/modules
-+	mkdir -p .conduit
-+	mkdir -p .conduit/modules
- 	@for i in `ls contrib`; do \
- 		( mkdir -p $(DESTDIR)$(PREFIX)/share/conduit/contrib/$$i ) \
- 	done
-@@ -52,14 +52,14 @@
- 	install -m 644 conduit/data/conduit-icon.png $(DESTDIR)$(PREFIX)/share/pixmaps
- 	install -m 644 conduit/data/conduit.glade $(DESTDIR)$(PREFIX)/share/conduit/data
- 	install -m 644 conduit/dataproviders/*.py $(DESTDIR)$(PREFIX)/share/conduit/dataproviders
--	install -m 644 conduit.desktop $(DESTDIR)$(PREFIX)/share/applications/
-+#	install -m 644 conduit.desktop $(DESTDIR)$(PREFIX)/share/applications/
- 	install -m 644 conduit/*.py $(PYTHON_PATH)/conduit
- 	install -m 644 conduit/datatypes/*.py $(PYTHON_PATH)/conduit/datatypes
- 	install -m 755 conduit/start_conduit.py $(DESTDIR)$(PREFIX)/bin/conduit
- 	@for i in `ls contrib`; do \
- 		( install -m 644 contrib/$$i/*.py $(DESTDIR)$(PREFIX)/share/conduit/contrib/$$i ) \
- 	done
--	ln -sf $(CWD)/doc/ExampleModule.py ~/.conduit/modules/MoinModule.py
-+	ln -sf $(CWD)/doc/ExampleModule.py .conduit/modules/MoinModule.py
- 
- clean: clean-bin
- 	-rm dist-stamp
-@@ -101,4 +101,4 @@
- 	rm -r $(DESTDIR)$(PREFIX)/share/applications/conduit.desktop
- 	rm -r $(PYTHON_PATH)/conduit
- 	rm -r $(DESTDIR)$(PREFIX)/bin/conduit
--	rm ~/.conduit/modules/MoinModule.py
-+	rm .conduit/modules/MoinModule.py
diff --git a/deskutils/conduit/files/patch-configure b/deskutils/conduit/files/patch-configure
new file mode 100644
index 000000000000..c7c260c8802f
--- /dev/null
+++ b/deskutils/conduit/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig	2008-03-18 09:06:41.000000000 -0400
++++ configure	2008-03-18 10:48:08.000000000 -0400
+@@ -6447,24 +6447,8 @@
+ v=`echo 0.9.0 | sed -e "s/\./,/g"`
+ { echo "$as_me:$LINENO: checking for 0.9.0 of goocanvas" >&5
+ echo $ECHO_N "checking for 0.9.0 of goocanvas... $ECHO_C" >&6; }
+-prog="
+-import goocanvas
+-ver = goocanvas.pygoocanvas_version
+-
+-if type(ver) == str:
+-	ver = ver.split('.')
+-	ver = map(int,ver)
+-	ver = tuple(ver)
+-elif type(ver) == tuple:
+-	pass
+-else:
+-	raise Exception
+-
+-if ver >= ($v):
+-	print 'yes'
+-"
+-out=`$PYTHON -c "$prog"`
+-if test "x$out" == xyes; then
++out=yes
++if test "x$out" = xyes; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+   else
+@@ -6496,7 +6480,7 @@
+ 	print 'yes'
+ "
+ out=`$PYTHON -c "$prog"`
+-if test "x$out" == xyes; then
++if test "x$out" = xyes; then
+   { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+   else
diff --git a/deskutils/conduit/pkg-plist b/deskutils/conduit/pkg-plist
index bf5c39d8f88b..810dce4ae2c4 100644
--- a/deskutils/conduit/pkg-plist
+++ b/deskutils/conduit/pkg-plist
@@ -1,64 +1,443 @@
 bin/conduit
-%%PYTHON_SITELIBDIR%%/conduit/Canvas.py
+bin/conduit-client
+bin/conduit.real
+lib/conduit/modules/AudioVideoConverterModule.py
+lib/conduit/modules/AudioVideoConverterModule.pyc
+lib/conduit/modules/AudioVideoConverterModule.pyo
+lib/conduit/modules/BackpackModule/BackpackModule.py
+lib/conduit/modules/BackpackModule/BackpackModule.pyc
+lib/conduit/modules/BackpackModule/BackpackModule.pyo
+lib/conduit/modules/BackpackModule/backpack/backpack.py
+lib/conduit/modules/BackpackModule/backpack/backpack.pyc
+lib/conduit/modules/BackpackModule/backpack/backpack.pyo
+lib/conduit/modules/BackpackModule/config.glade
+lib/conduit/modules/BansheeModule/BansheeModule.py
+lib/conduit/modules/BansheeModule/BansheeModule.pyc
+lib/conduit/modules/BansheeModule/BansheeModule.pyo
+lib/conduit/modules/BansheeModule/config.glade
+lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI/boxdotnet.py
+lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI/boxdotnet.pyc
+lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI/boxdotnet.pyo
+lib/conduit/modules/BoxDotNetModule/BoxDotNetModule.py
+lib/conduit/modules/BoxDotNetModule/BoxDotNetModule.pyc
+lib/conduit/modules/BoxDotNetModule/BoxDotNetModule.pyo
+lib/conduit/modules/BoxDotNetModule/config.glade
+lib/conduit/modules/ConverterModule.py
+lib/conduit/modules/ConverterModule.pyc
+lib/conduit/modules/ConverterModule.pyo
+lib/conduit/modules/EvolutionModule/EvolutionModule.py
+lib/conduit/modules/EvolutionModule/EvolutionModule.pyc
+lib/conduit/modules/EvolutionModule/EvolutionModule.pyo
+lib/conduit/modules/EvolutionModule/config.glade
+lib/conduit/modules/FacebookModule/FacebookModule.py
+lib/conduit/modules/FacebookModule/FacebookModule.pyc
+lib/conduit/modules/FacebookModule/FacebookModule.pyo
+lib/conduit/modules/FacebookModule/pyfacebook/__init__.py
+lib/conduit/modules/FacebookModule/pyfacebook/__init__.pyc
+lib/conduit/modules/FacebookModule/pyfacebook/__init__.pyo
+lib/conduit/modules/FeedModule/FeedModule.py
+lib/conduit/modules/FeedModule/FeedModule.pyc
+lib/conduit/modules/FeedModule/FeedModule.pyo
+lib/conduit/modules/FeedModule/config.glade
+lib/conduit/modules/FileModule/FileConfiguration.py
+lib/conduit/modules/FileModule/FileConfiguration.pyc
+lib/conduit/modules/FileModule/FileConfiguration.pyo
+lib/conduit/modules/FileModule/FileModule.py
+lib/conduit/modules/FileModule/FileModule.pyc
+lib/conduit/modules/FileModule/FileModule.pyo
+lib/conduit/modules/FileModule/config.glade
+lib/conduit/modules/FlickrModule/FlickrModule.py
+lib/conduit/modules/FlickrModule/FlickrModule.pyc
+lib/conduit/modules/FlickrModule/FlickrModule.pyo
+lib/conduit/modules/FlickrModule/config.glade
+lib/conduit/modules/FlickrModule/flickrapi/__init__.py
+lib/conduit/modules/FlickrModule/flickrapi/__init__.pyc
+lib/conduit/modules/FlickrModule/flickrapi/__init__.pyo
+lib/conduit/modules/FlickrModule/flickrapi/multipart.py
+lib/conduit/modules/FlickrModule/flickrapi/multipart.pyc
+lib/conduit/modules/FlickrModule/flickrapi/multipart.pyo
+lib/conduit/modules/FlickrModule/flickrapi/reportinghttp.py
+lib/conduit/modules/FlickrModule/flickrapi/reportinghttp.pyc
+lib/conduit/modules/FlickrModule/flickrapi/reportinghttp.pyo
+lib/conduit/modules/FlickrModule/flickrapi/tokencache.py
+lib/conduit/modules/FlickrModule/flickrapi/tokencache.pyc
+lib/conduit/modules/FlickrModule/flickrapi/tokencache.pyo
+lib/conduit/modules/FlickrModule/flickrapi/xmlnode.py
+lib/conduit/modules/FlickrModule/flickrapi/xmlnode.pyc
+lib/conduit/modules/FlickrModule/flickrapi/xmlnode.pyo
+lib/conduit/modules/FspotModule/FspotModule.py
+lib/conduit/modules/FspotModule/FspotModule.pyc
+lib/conduit/modules/FspotModule/FspotModule.pyo
+lib/conduit/modules/FspotModule/config.glade
+lib/conduit/modules/GConfModule/GConfModule.py
+lib/conduit/modules/GConfModule/GConfModule.pyc
+lib/conduit/modules/GConfModule/GConfModule.pyo
+lib/conduit/modules/GmailModule/GmailModule.py
+lib/conduit/modules/GmailModule/GmailModule.pyc
+lib/conduit/modules/GmailModule/GmailModule.pyo
+lib/conduit/modules/GmailModule/config.glade
+lib/conduit/modules/GmailModule/libgmail/gmail_transport.py
+lib/conduit/modules/GmailModule/libgmail/gmail_transport.pyc
+lib/conduit/modules/GmailModule/libgmail/gmail_transport.pyo
+lib/conduit/modules/GmailModule/libgmail/lgconstants.py
+lib/conduit/modules/GmailModule/libgmail/lgconstants.pyc
+lib/conduit/modules/GmailModule/libgmail/lgconstants.pyo
+lib/conduit/modules/GmailModule/libgmail/libgmail.py
+lib/conduit/modules/GmailModule/libgmail/libgmail.pyc
+lib/conduit/modules/GmailModule/libgmail/libgmail.pyo
+lib/conduit/modules/GoogleModule/GoogleModule.py
+lib/conduit/modules/GoogleModule/GoogleModule.pyc
+lib/conduit/modules/GoogleModule/GoogleModule.pyo
+lib/conduit/modules/GoogleModule/atom/__init__.py
+lib/conduit/modules/GoogleModule/atom/__init__.pyc
+lib/conduit/modules/GoogleModule/atom/__init__.pyo
+lib/conduit/modules/GoogleModule/atom/service.py
+lib/conduit/modules/GoogleModule/atom/service.pyc
+lib/conduit/modules/GoogleModule/atom/service.pyo
+lib/conduit/modules/GoogleModule/calendar-config.glade
+lib/conduit/modules/GoogleModule/gdata/__init__.py
+lib/conduit/modules/GoogleModule/gdata/__init__.pyc
+lib/conduit/modules/GoogleModule/gdata/__init__.pyo
+lib/conduit/modules/GoogleModule/gdata/auth.py
+lib/conduit/modules/GoogleModule/gdata/auth.pyc
+lib/conduit/modules/GoogleModule/gdata/auth.pyo
+lib/conduit/modules/GoogleModule/gdata/calendar/__init__.py
+lib/conduit/modules/GoogleModule/gdata/calendar/__init__.pyc
+lib/conduit/modules/GoogleModule/gdata/calendar/__init__.pyo
+lib/conduit/modules/GoogleModule/gdata/calendar/service.py
+lib/conduit/modules/GoogleModule/gdata/calendar/service.pyc
+lib/conduit/modules/GoogleModule/gdata/calendar/service.pyo
+lib/conduit/modules/GoogleModule/gdata/exif/__init__.py
+lib/conduit/modules/GoogleModule/gdata/exif/__init__.pyc
+lib/conduit/modules/GoogleModule/gdata/exif/__init__.pyo
+lib/conduit/modules/GoogleModule/gdata/geo/__init__.py
+lib/conduit/modules/GoogleModule/gdata/geo/__init__.pyc
+lib/conduit/modules/GoogleModule/gdata/geo/__init__.pyo
+lib/conduit/modules/GoogleModule/gdata/media/__init__.py
+lib/conduit/modules/GoogleModule/gdata/media/__init__.pyc
+lib/conduit/modules/GoogleModule/gdata/media/__init__.pyo
+lib/conduit/modules/GoogleModule/gdata/photos/__init__.py
+lib/conduit/modules/GoogleModule/gdata/photos/__init__.pyc
+lib/conduit/modules/GoogleModule/gdata/photos/__init__.pyo
+lib/conduit/modules/GoogleModule/gdata/photos/service.py
+lib/conduit/modules/GoogleModule/gdata/photos/service.pyc
+lib/conduit/modules/GoogleModule/gdata/photos/service.pyo
+lib/conduit/modules/GoogleModule/gdata/service.py
+lib/conduit/modules/GoogleModule/gdata/service.pyc
+lib/conduit/modules/GoogleModule/gdata/service.pyo
+lib/conduit/modules/GoogleModule/picasa-config.glade
+lib/conduit/modules/GoogleModule/youtube-config.glade
+lib/conduit/modules/N800Module/N800Module.py
+lib/conduit/modules/N800Module/N800Module.pyc
+lib/conduit/modules/N800Module/N800Module.pyo
+lib/conduit/modules/NetworkModule/Client.py
+lib/conduit/modules/NetworkModule/Client.pyc
+lib/conduit/modules/NetworkModule/Client.pyo
+lib/conduit/modules/NetworkModule/NetworkModule.py
+lib/conduit/modules/NetworkModule/NetworkModule.pyc
+lib/conduit/modules/NetworkModule/NetworkModule.pyo
+lib/conduit/modules/NetworkModule/Peers.py
+lib/conduit/modules/NetworkModule/Peers.pyc
+lib/conduit/modules/NetworkModule/Peers.pyo
+lib/conduit/modules/NetworkModule/Server.py
+lib/conduit/modules/NetworkModule/Server.pyc
+lib/conduit/modules/NetworkModule/Server.pyo
+lib/conduit/modules/NetworkModule/XMLRPCUtils.py
+lib/conduit/modules/NetworkModule/XMLRPCUtils.pyc
+lib/conduit/modules/NetworkModule/XMLRPCUtils.pyo
+lib/conduit/modules/NetworkModule/__init__.py
+lib/conduit/modules/NetworkModule/__init__.pyc
+lib/conduit/modules/NetworkModule/__init__.pyo
+lib/conduit/modules/PhotoConverterModule.py
+lib/conduit/modules/PhotoConverterModule.pyc
+lib/conduit/modules/PhotoConverterModule.pyo
+lib/conduit/modules/RhythmboxModule/RhythmboxModule.py
+lib/conduit/modules/RhythmboxModule/RhythmboxModule.pyc
+lib/conduit/modules/RhythmboxModule/RhythmboxModule.pyo
+lib/conduit/modules/RhythmboxModule/config.glade
+lib/conduit/modules/ShutterflyModule/ShutterflyModule.py
+lib/conduit/modules/ShutterflyModule/ShutterflyModule.pyc
+lib/conduit/modules/ShutterflyModule/ShutterflyModule.pyo
+lib/conduit/modules/ShutterflyModule/shutterfly.glade
+lib/conduit/modules/ShutterflyModule/shutterfly/shutterfly.py
+lib/conduit/modules/ShutterflyModule/shutterfly/shutterfly.pyc
+lib/conduit/modules/ShutterflyModule/shutterfly/shutterfly.pyo
+lib/conduit/modules/SmugMugModule/SmugMugAPI/smugmug.py
+lib/conduit/modules/SmugMugModule/SmugMugAPI/smugmug.pyc
+lib/conduit/modules/SmugMugModule/SmugMugAPI/smugmug.pyo
+lib/conduit/modules/SmugMugModule/SmugMugModule.py
+lib/conduit/modules/SmugMugModule/SmugMugModule.pyc
+lib/conduit/modules/SmugMugModule/SmugMugModule.pyo
+lib/conduit/modules/SmugMugModule/config.glade
+lib/conduit/modules/TomboyModule.py
+lib/conduit/modules/TomboyModule.pyc
+lib/conduit/modules/TomboyModule.pyo
+lib/conduit/modules/__init__.py
+lib/conduit/modules/__init__.pyc
+lib/conduit/modules/__init__.pyo
+lib/conduit/modules/iPodModule.py
+lib/conduit/modules/iPodModule.pyc
+lib/conduit/modules/iPodModule.pyo
 %%PYTHON_SITELIBDIR%%/conduit/Conduit.py
-%%PYTHON_SITELIBDIR%%/conduit/DataProvider.py
+%%PYTHON_SITELIBDIR%%/conduit/Conduit.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Conduit.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Conflict.py
+%%PYTHON_SITELIBDIR%%/conduit/Conflict.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Conflict.pyo
+%%PYTHON_SITELIBDIR%%/conduit/DBus.py
+%%PYTHON_SITELIBDIR%%/conduit/DBus.pyc
+%%PYTHON_SITELIBDIR%%/conduit/DBus.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Database.py
+%%PYTHON_SITELIBDIR%%/conduit/Database.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Database.pyo
+%%PYTHON_SITELIBDIR%%/conduit/DeltaProvider.py
+%%PYTHON_SITELIBDIR%%/conduit/DeltaProvider.pyc
+%%PYTHON_SITELIBDIR%%/conduit/DeltaProvider.pyo
 %%PYTHON_SITELIBDIR%%/conduit/Exceptions.py
-%%PYTHON_SITELIBDIR%%/conduit/MainWindow.py
+%%PYTHON_SITELIBDIR%%/conduit/Exceptions.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Exceptions.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Globals.py
+%%PYTHON_SITELIBDIR%%/conduit/Globals.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Globals.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Logging.py
+%%PYTHON_SITELIBDIR%%/conduit/Logging.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Logging.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Main.py
+%%PYTHON_SITELIBDIR%%/conduit/Main.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Main.pyo
+%%PYTHON_SITELIBDIR%%/conduit/MappingDB.py
+%%PYTHON_SITELIBDIR%%/conduit/MappingDB.pyc
+%%PYTHON_SITELIBDIR%%/conduit/MappingDB.pyo
 %%PYTHON_SITELIBDIR%%/conduit/Module.py
+%%PYTHON_SITELIBDIR%%/conduit/Module.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Module.pyo
+%%PYTHON_SITELIBDIR%%/conduit/ModuleWrapper.py
+%%PYTHON_SITELIBDIR%%/conduit/ModuleWrapper.pyc
+%%PYTHON_SITELIBDIR%%/conduit/ModuleWrapper.pyo
 %%PYTHON_SITELIBDIR%%/conduit/Settings.py
+%%PYTHON_SITELIBDIR%%/conduit/Settings.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Settings.pyo
+%%PYTHON_SITELIBDIR%%/conduit/SyncSet.py
+%%PYTHON_SITELIBDIR%%/conduit/SyncSet.pyc
+%%PYTHON_SITELIBDIR%%/conduit/SyncSet.pyo
 %%PYTHON_SITELIBDIR%%/conduit/Synchronization.py
+%%PYTHON_SITELIBDIR%%/conduit/Synchronization.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Synchronization.pyo
 %%PYTHON_SITELIBDIR%%/conduit/TypeConverter.py
+%%PYTHON_SITELIBDIR%%/conduit/TypeConverter.pyc
+%%PYTHON_SITELIBDIR%%/conduit/TypeConverter.pyo
 %%PYTHON_SITELIBDIR%%/conduit/Utils.py
+%%PYTHON_SITELIBDIR%%/conduit/Utils.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Utils.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Vfs.py
+%%PYTHON_SITELIBDIR%%/conduit/Vfs.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Vfs.pyo
+%%PYTHON_SITELIBDIR%%/conduit/Web.py
+%%PYTHON_SITELIBDIR%%/conduit/Web.pyc
+%%PYTHON_SITELIBDIR%%/conduit/Web.pyo
 %%PYTHON_SITELIBDIR%%/conduit/__init__.py
+%%PYTHON_SITELIBDIR%%/conduit/__init__.pyc
+%%PYTHON_SITELIBDIR%%/conduit/__init__.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/AutoSync.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/AutoSync.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/AutoSync.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProvider.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProvider.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProvider.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProviderCategory.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProviderCategory.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/DataProviderCategory.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/File.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/File.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/File.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/HalFactory.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/HalFactory.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/HalFactory.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/Image.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/Image.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/Image.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/SimpleFactory.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/SimpleFactory.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/SimpleFactory.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/VolumeFactory.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/VolumeFactory.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/VolumeFactory.pyo
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/__init__.py
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/__init__.pyc
+%%PYTHON_SITELIBDIR%%/conduit/dataproviders/__init__.pyo
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Audio.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Audio.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Audio.pyo
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Contact.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Contact.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Contact.pyo
 %%PYTHON_SITELIBDIR%%/conduit/datatypes/DataType.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/DataType.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/DataType.pyo
 %%PYTHON_SITELIBDIR%%/conduit/datatypes/Email.py
-%%PYTHON_SITELIBDIR%%/conduit/datatypes/Feed.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Email.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Email.pyo
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Event.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Event.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Event.pyo
 %%PYTHON_SITELIBDIR%%/conduit/datatypes/File.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/File.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/File.pyo
 %%PYTHON_SITELIBDIR%%/conduit/datatypes/Note.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Note.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Note.pyo
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Photo.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Photo.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Photo.pyo
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Setting.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Setting.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Setting.pyo
 %%PYTHON_SITELIBDIR%%/conduit/datatypes/Text.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Text.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Text.pyo
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Video.py
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Video.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/Video.pyo
 %%PYTHON_SITELIBDIR%%/conduit/datatypes/__init__.py
-%%PYTHON_SITELIBDIR%%/conduit/start_conduit.py
-%%DATADIR%%/contrib/EXIF-15-FEB-04/EXIF.py
-%%DATADIR%%/contrib/FlickrAPI-8/flickrapi.py
-%%DATADIR%%/contrib/FlickrAPI-8/setup.py
-%%DATADIR%%/contrib/backpack-1.1/backpack.py
-%%DATADIR%%/contrib/backpack-1.1/bptest.py
-%%DATADIR%%/contrib/backpack-1.1/wapsupport.py
-%%DATADIR%%/contrib/httplib2/__init__.py
-%%DATADIR%%/contrib/libgmail-0.1.5/lgconstants.py
-%%DATADIR%%/contrib/libgmail-0.1.5/libgmail.py
-%%DATADIR%%/contrib/libgmail-0.1.5/setup.py
-%%DATADIR%%/contrib/python-opml-0.5/OPML.py
-%%DATADIR%%/data/backpack.png
-%%DATADIR%%/data/conduit-icon.png
-%%DATADIR%%/data/conduit-splash.png
-%%DATADIR%%/data/conduit.glade
-%%DATADIR%%/data/f-spot.png
-%%DATADIR%%/data/feed-icon.png
-%%DATADIR%%/data/liferea.png
-%%DATADIR%%/data/tomboy.png
-%%DATADIR%%/dataproviders/BackpackModule.py
-%%DATADIR%%/dataproviders/FeedModule.py
-%%DATADIR%%/dataproviders/FileModule.py
-%%DATADIR%%/dataproviders/FlickrModule.py
-%%DATADIR%%/dataproviders/FspotModule.py
-%%DATADIR%%/dataproviders/GmailModule.py
-%%DATADIR%%/dataproviders/LifereaModule.py
-%%DATADIR%%/dataproviders/NotesModule.py
-%%DATADIR%%/dataproviders/TestModule.py
-%%DATADIR%%/dataproviders/TextConverterModule.py
-%%DATADIR%%/dataproviders/__init__.py
-share/pixmaps/conduit-icon.png
-@dirrm %%DATADIR%%/dataproviders
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/contrib/python-opml-0.5
-@dirrm %%DATADIR%%/contrib/libgmail-0.1.5
-@dirrm %%DATADIR%%/contrib/httplib2
-@dirrm %%DATADIR%%/contrib/backpack-1.1
-@dirrm %%DATADIR%%/contrib/FlickrAPI-8
-@dirrm %%DATADIR%%/contrib/EXIF-15-FEB-04
-@dirrm %%DATADIR%%/contrib
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/__init__.pyc
+%%PYTHON_SITELIBDIR%%/conduit/datatypes/__init__.pyo
+%%PYTHON_SITELIBDIR%%/conduit/defs.py
+%%PYTHON_SITELIBDIR%%/conduit/defs.pyc
+%%PYTHON_SITELIBDIR%%/conduit/defs.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Canvas.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Canvas.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Canvas.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/ConflictResolver.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/ConflictResolver.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/ConflictResolver.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Database.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Database.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Database.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/SimpleConfigurator.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/SimpleConfigurator.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/SimpleConfigurator.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Tree.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Tree.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/Tree.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/UI.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/UI.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/UI.pyo
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/__init__.py
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/conduit/gtkui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/Canvas.py
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/Canvas.pyc
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/Canvas.pyo
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/List.py
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/List.pyc
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/List.pyo
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/UI.py
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/UI.pyc
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/UI.pyo
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.py
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/conduit/hildonui/__init__.pyo
+libdata/pkgconfig/conduit.pc
+share/applications/conduit.desktop
+%%DATADIR%%/backpack.png
+%%DATADIR%%/boxdotnet.png
+%%DATADIR%%/conduit-splash.png
+%%DATADIR%%/conduit.glade
+%%DATADIR%%/f-spot.png
+%%DATADIR%%/facebook.png
+%%DATADIR%%/feed.png
+%%DATADIR%%/flickr.png
+%%DATADIR%%/liferea.png
+%%DATADIR%%/picasa.png
+%%DATADIR%%/shutterfly.png
+%%DATADIR%%/smugmug.png
+%%DATADIR%%/tomboy.png
+%%DATADIR%%/youtube.png
+share/dbus-1/services/org.conduit.service
+share/gnome/autostart/conduit-autostart.desktop
+share/gnome/help/conduit/C/conduit.xml
+share/gnome/help/conduit/C/figures/conduit-dp.png
+share/gnome/help/conduit/C/figures/conduit-folder-configuration.png
+share/gnome/help/conduit/C/figures/conduit-gui-parts.png
+share/icons/hicolor/16x16/actions/conduit-conflict-ask.png
+share/icons/hicolor/16x16/actions/conduit-conflict-delete.png
+share/icons/hicolor/16x16/actions/conduit-conflict-left.png
+share/icons/hicolor/16x16/actions/conduit-conflict-right.png
+share/icons/hicolor/16x16/actions/conduit-conflict-skip.png
+share/icons/hicolor/16x16/apps/conduit-sink.png
+share/icons/hicolor/16x16/apps/conduit-source.png
+share/icons/hicolor/16x16/apps/conduit-twoway.png
+share/icons/hicolor/16x16/apps/conduit.png
+share/icons/hicolor/16x16/status/conduit-progress-1.png
+share/icons/hicolor/16x16/status/conduit-progress-2.png
+share/icons/hicolor/16x16/status/conduit-progress-3.png
+share/icons/hicolor/16x16/status/conduit-progress-4.png
+share/icons/hicolor/16x16/status/conduit-progress-5.png
+share/icons/hicolor/16x16/status/conduit-progress-6.png
+share/icons/hicolor/16x16/status/conduit-progress-7.png
+share/icons/hicolor/16x16/status/conduit-progress-8.png
+share/icons/hicolor/16x16/status/conduit-sink.png
+share/icons/hicolor/16x16/status/conduit-source.png
+share/icons/hicolor/16x16/status/conduit-twoway.png
+share/icons/hicolor/22x22/apps/conduit.png
+share/icons/hicolor/24x24/apps/conduit.png
+share/icons/hicolor/26x26/apps/conduit.png
+share/icons/hicolor/32x32/apps/conduit.png
+share/icons/hicolor/48x48/apps/conduit.png
+share/icons/hicolor/scalable/apps/conduit.svg
+share/locale/ar/LC_MESSAGES/conduit.mo
+share/locale/ca/LC_MESSAGES/conduit.mo
+share/locale/en_GB/LC_MESSAGES/conduit.mo
+share/locale/es/LC_MESSAGES/conduit.mo
+share/locale/fr/LC_MESSAGES/conduit.mo
+share/locale/it/LC_MESSAGES/conduit.mo
+share/locale/nb/LC_MESSAGES/conduit.mo
+share/locale/pt/LC_MESSAGES/conduit.mo
+share/locale/pt_BR/LC_MESSAGES/conduit.mo
+share/locale/ru/LC_MESSAGES/conduit.mo
+share/locale/sv/LC_MESSAGES/conduit.mo
+share/omf/conduit/conduit-C.omf
+@dirrm share/omf/conduit
+@dirrm share/gnome/help/conduit/C/figures
+@dirrm share/gnome/help/conduit/C
+@dirrm share/gnome/help/conduit
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/conduit/hildonui
+@dirrm %%PYTHON_SITELIBDIR%%/conduit/gtkui
 @dirrm %%PYTHON_SITELIBDIR%%/conduit/datatypes
+@dirrm %%PYTHON_SITELIBDIR%%/conduit/dataproviders
 @dirrm %%PYTHON_SITELIBDIR%%/conduit
+@dirrm lib/conduit/modules/SmugMugModule/SmugMugAPI
+@dirrm lib/conduit/modules/SmugMugModule
+@dirrm lib/conduit/modules/ShutterflyModule/shutterfly
+@dirrm lib/conduit/modules/ShutterflyModule
+@dirrm lib/conduit/modules/RhythmboxModule
+@dirrm lib/conduit/modules/NetworkModule
+@dirrm lib/conduit/modules/N800Module
+@dirrm lib/conduit/modules/GoogleModule/gdata/photos
+@dirrm lib/conduit/modules/GoogleModule/gdata/media
+@dirrm lib/conduit/modules/GoogleModule/gdata/geo
+@dirrm lib/conduit/modules/GoogleModule/gdata/exif
+@dirrm lib/conduit/modules/GoogleModule/gdata/calendar
+@dirrm lib/conduit/modules/GoogleModule/gdata
+@dirrm lib/conduit/modules/GoogleModule/atom
+@dirrm lib/conduit/modules/GoogleModule
+@dirrm lib/conduit/modules/GmailModule/libgmail
+@dirrm lib/conduit/modules/GmailModule
+@dirrm lib/conduit/modules/GConfModule
+@dirrm lib/conduit/modules/FspotModule
+@dirrm lib/conduit/modules/FlickrModule/flickrapi
+@dirrm lib/conduit/modules/FlickrModule
+@dirrm lib/conduit/modules/FileModule
+@dirrm lib/conduit/modules/FeedModule
+@dirrm lib/conduit/modules/FacebookModule/pyfacebook
+@dirrm lib/conduit/modules/FacebookModule
+@dirrm lib/conduit/modules/EvolutionModule
+@dirrm lib/conduit/modules/BoxDotNetModule/BoxDotNetAPI
+@dirrm lib/conduit/modules/BoxDotNetModule
+@dirrm lib/conduit/modules/BansheeModule
+@dirrm lib/conduit/modules/BackpackModule/backpack
+@dirrm lib/conduit/modules/BackpackModule
+@dirrm lib/conduit/modules
+@dirrm lib/conduit