Merge lp:~rodrigo-moya/ubuntu/maverick/tomboy/fix-dllmap into lp:~ubuntu-desktop/tomboy/ubuntu

[Rodrigo Moya]

Remove explicit dependency on libsyndaemon-1.0, and replace it with correct dllmap'ing

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-02 14:02:11 +0000
+++ debian/changelog	2010-09-08 11:15:52 +0000
@@ -1,3 +1,12 @@
+tomboy (1.3.2-1ubuntu4) maverick; urgency=low
+
+  * debian/patches/06_use_ubuntu_sso.patch:
+    - Add .config file to do the correct ddlmap'ing
+  * debian/control:
+    - Remove explicit dependency on libsyncdaemon-1.0-1
+
+ -- Rodrigo Moya <[e-mail]>  Wed, 08 Sep 2010 12:03:27 +0200
+
 tomboy (1.3.2-1ubuntu3) maverick; urgency=low
 
   * debian/control:

=== modified file 'debian/control'
--- debian/control	2010-09-02 14:02:11 +0000
+++ debian/control	2010-09-08 11:15:52 +0000
@@ -39,8 +39,7 @@
 Architecture: any
 Depends: ${cli:Depends}, 
          ${misc:Depends},
-         ${shlibs:Depends},
-         libsyncdaemon-1.0-1
+         ${shlibs:Depends}
 Suggests: evolution,
           tasque
 Description: desktop note taking program using Wiki style links

=== modified file 'debian/patches/06_use_ubuntu_sso.patch'
--- debian/patches/06_use_ubuntu_sso.patch	2010-08-18 11:29:38 +0000
+++ debian/patches/06_use_ubuntu_sso.patch	2010-09-08 11:15:52 +0000
@@ -1,5 +1,5 @@
 diff --git a/Tomboy/Addins/WebSyncService/Makefile.am b/Tomboy/Addins/WebSyncService/Makefile.am
-index d50eadb..2699865 100644
+index d50eadb..8abc3d4 100644
 --- a/Tomboy/Addins/WebSyncService/Makefile.am
 +++ b/Tomboy/Addins/WebSyncService/Makefile.am
 @@ -27,6 +27,8 @@ CSFILES = \
@@ -11,6 +11,16 @@
  	$(srcdir)/Tests/*.cs            	\
  	$(srcdir)/Api/*.cs                  \
  	$(srcdir)/Api/Tests/*.cs            \
+@@ -47,7 +49,8 @@ $(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH)
+ addinsdir = $(pkglibdir)/addins
+ addins_DATA = 			\
+ 	$(TARGET)		\
+-	$(TARGET).mdb
++	$(TARGET).mdb		\
++	WebSyncServiceAddin.dll.config
+ 
+ EXTRA_DIST =            	\
+ 	$(CSFILES) \
 diff --git a/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs b/Tomboy/Addins/WebSyncService/U1SyncPreferencesWidget.cs
 new file mode 100644
 index 0000000..0c88ec1
@@ -556,3 +566,14 @@
 +		<SyncServiceAddin type="Tomboy.WebSync.U1SyncServiceAddin" />
 +	</Extension>
  </Addin>
+diff --git a/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.dll.config b/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.dll.config
+new file mode 100644
+index 0000000..91fc201
+--- /dev/null
++++ b/Tomboy/Addins/WebSyncService/WebSyncServiceAddin.dll.config
+@@ -0,0 +1,5 @@
++<configuration>
++  <dllmap dll="gobject-2.0" target="libgobject-2.0.so.0"/>
++  <dllmap dll="syncdaemon-1.0" target="libsyncdaemon-1.0.so.1"/>
++  <dllmap dll="proxy" target="libproxy.so.0"/>
++</configuration>