← Back to branch summary

~ubuntu-branches/ubuntu/lucid/tomboy/lucid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/52_external-dbus-sharp.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-11-16 21:24:14 UTC
  • mfrom: (1.1.7 upstream) (3 etch)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20061116212414-i9mqu3nnn90ulo7m
Tags: 0.5.0-0ubuntu1
* New upstream release
* debian/patches/52_applet-crash.patch:
  + Dropped, merged upstream
* debian/control,
  debian/patches/52_external-dbus-sharp.patch:
  + Build depend on libdbus-1-cil and build against it instead of the
    bundled version
* debian/rules:
  + Install DBus service file into the correct directory
* debian/patches/53_tomboy-tray-icon.patch:
  + Correctly set the icon for the trayicon

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/52_external-dbus-sharp.patch
 
1
--- Tomboy/Makefile.am.old      2006-11-16 21:36:09.500232108 +0100
 
2
+++ Tomboy/Makefile.am  2006-11-16 21:36:41.894078127 +0100
 
3
@@ -9,7 +9,6 @@
 
4
 if ENABLE_DBUS
 
5
 DBUS_CSFLAGS = -define:ENABLE_DBUS
 
6
 DBUS_CSFILES =                                 \
 
7
-       $(srcdir)/dbus-sharp/*.cs       \
 
8
        $(srcdir)/RemoteControl.cs      \
 
9
        $(srcdir)/RemoteControlProxy.cs
 
10
 endif
 
11
@@ -55,7 +54,8 @@
 
12
 
 
13
 ASSEMBLIES =           \
 
14
        $(TOMBOY_LIBS)  \
 
15
-       -r:Mono.Posix
 
16
+       -r:Mono.Posix   \
 
17
+       `pkg-config --libs dbus-sharp`
 
18
 
 
19
 RESOURCES =                                                                            \
 
20
        -resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml      \
 
21
--- Tomboy/Makefile.in.old      2006-11-16 21:36:13.480458930 +0100
 
22
+++ Tomboy/Makefile.in  2006-11-16 21:37:03.703320967 +0100
 
23
@@ -267,7 +267,6 @@
 
24
 WRAPPER = tomboy
 
25
 @ENABLE_DBUS_TRUE@DBUS_CSFLAGS = -define:ENABLE_DBUS
 
26
 @ENABLE_DBUS_TRUE@DBUS_CSFILES = \
 
27
-@ENABLE_DBUS_TRUE@     $(srcdir)/dbus-sharp/*.cs       \
 
28
 @ENABLE_DBUS_TRUE@     $(srcdir)/RemoteControl.cs      \
 
29
 @ENABLE_DBUS_TRUE@     $(srcdir)/RemoteControlProxy.cs
 
30
 
 
31
@@ -308,7 +307,8 @@
 
32
 #      $(srcdir)/Search.cs
 
33
 ASSEMBLIES = \
 
34
        $(TOMBOY_LIBS)  \
 
35
-       -r:Mono.Posix
 
36
+       -r:Mono.Posix   \
 
37
+       `pkg-config --libs dbus-sharp`
 
38
 
 
39
 RESOURCES = \
 
40
        -resource:$(top_srcdir)/data/GNOME_TomboyApplet.xml,GNOME_TomboyApplet.xml      \