← Back to branch summary

~ubuntu-branches/ubuntu/saucy/empathy/saucy-updates

« back to all changes in this revision

Viewing changes to debian/patches/46_uoa_link.patch

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2013-05-31 10:44:31 UTC
  • mfrom: (1.1.111) (6.6.55 experimental)
  • Revision ID: package-import@ubuntu.com-20130531104431-w0ec8ntcojx76y61
Tags: 3.8.3-0ubuntu1
* Merge with Debian, remaining changes:
  - debian/patches/00_linker-fixes.patch
  - debian/patches/10_use_notify_osd_icons.patch
  - debian/patches/23_idomessagedialog_for_voip_and_ft.patch
  - debian/patches/34_start_raised_execpt_in_session.patch
  - debian/patches/38_default_to_facebook_for_im.patch
  - debian/patches/39_default_to_freenode_for_irc.patch
  - debian/patches/41_unity_launcher_progress.patch
  - debian/patches/42_shell_running.patch
  - debian/patches/43_quicklists.patch
  - debian/patches/47_git_activate_with_platform_data.patch: Patches kept,
    see newly completed patch headers for descriptions.
  - debian/*: Turn on UOA and split out account plugins into
    account-plugins-* packages.
  - Remove Universe Build-Deps for geocode and cheese and disable these
    features.
  - debian/indicators/empathy: Install indicator integration point.
* New upstream release 3.8.3
* debian/patches/include-empathy-keyring.h: Add, fix implicit declaration of
  empathy_keyring_set_account_password_finish and co by including the right
  header.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/46_uoa_link.patch
1
 
=== modified file 'ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am'
2
 
--- old/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am   2012-09-10 16:37:48 +0000
3
 
+++ new/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am   2012-09-10 16:51:06 +0000
4
 
@@ -27,7 +27,9 @@
5
 
        empathy-accounts-plugin-widget.h
6
 
 
7
 
 libempathy_uoa_account_plugin_la_LIBADD = \
8
 
-       $(UOA_LIBS)
9
 
+       $(UOA_LIBS) \
10
 
+       $(top_builddir)/libempathy/libempathy.la \
11
 
+       $(top_builddir)/libempathy-gtk/libempathy-gtk.la
12
 
 
13
 
 plugin_LTLIBRARIES = \
14
 
        libaim.la\
15
 
@@ -51,6 +53,7 @@
16
 
        empathy-accounts-plugin-aim.h
17
 
 libaim_la_LDFLAGS = -module -avoid-version
18
 
 libaim_la_LIBADD = \
19
 
+       $(UOA_LIBS) \
20
 
        libempathy-uoa-account-plugin.la \
21
 
        $(top_builddir)/libempathy/libempathy.la \
22
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
23
 
@@ -61,6 +64,7 @@
24
 
        empathy-accounts-plugin-gadugadu.h
25
 
 libgadugadu_la_LDFLAGS = -module -avoid-version
26
 
 libgadugadu_la_LIBADD = \
27
 
+       $(UOA_LIBS) \
28
 
        libempathy-uoa-account-plugin.la \
29
 
        $(top_builddir)/libempathy/libempathy.la \
30
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
31
 
@@ -71,6 +75,7 @@
32
 
        empathy-accounts-plugin-groupwise.h
33
 
 libgroupwise_la_LDFLAGS = -module -avoid-version
34
 
 libgroupwise_la_LIBADD = \
35
 
+       $(UOA_LIBS) \
36
 
        libempathy-uoa-account-plugin.la \
37
 
        $(top_builddir)/libempathy/libempathy.la \
38
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
39
 
@@ -81,6 +86,7 @@
40
 
        empathy-accounts-plugin-icq.h
41
 
 libicq_la_LDFLAGS = -module -avoid-version
42
 
 libicq_la_LIBADD = \
43
 
+       $(UOA_LIBS) \
44
 
        libempathy-uoa-account-plugin.la \
45
 
        $(top_builddir)/libempathy/libempathy.la \
46
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
47
 
@@ -91,6 +97,7 @@
48
 
        empathy-accounts-plugin-irc.h
49
 
 libirc_la_LDFLAGS = -module -avoid-version
50
 
 libirc_la_LIBADD = \
51
 
+       $(UOA_LIBS) \
52
 
        libempathy-uoa-account-plugin.la \
53
 
        $(top_builddir)/libempathy/libempathy.la \
54
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
55
 
@@ -101,6 +108,7 @@
56
 
        empathy-accounts-plugin-jabber.h
57
 
 libjabber_la_LDFLAGS = -module -avoid-version
58
 
 libjabber_la_LIBADD = \
59
 
+       $(UOA_LIBS) \
60
 
        libempathy-uoa-account-plugin.la \
61
 
        $(top_builddir)/libempathy/libempathy.la \
62
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
63
 
@@ -111,6 +119,7 @@
64
 
        empathy-accounts-plugin-mxit.h
65
 
 libmxit_la_LDFLAGS = -module -avoid-version
66
 
 libmxit_la_LIBADD = \
67
 
+       $(UOA_LIBS) \
68
 
        libempathy-uoa-account-plugin.la \
69
 
        $(top_builddir)/libempathy/libempathy.la \
70
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
71
 
@@ -121,6 +130,7 @@
72
 
        empathy-accounts-plugin-myspace.h
73
 
 libmyspace_la_LDFLAGS = -module -avoid-version
74
 
 libmyspace_la_LIBADD = \
75
 
+       $(UOA_LIBS) \
76
 
        libempathy-uoa-account-plugin.la \
77
 
        $(top_builddir)/libempathy/libempathy.la \
78
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
79
 
@@ -131,6 +141,7 @@
80
 
        empathy-accounts-plugin-sip.h
81
 
 libsip_la_LDFLAGS = -module -avoid-version
82
 
 libsip_la_LIBADD = \
83
 
+       $(UOA_LIBS) \
84
 
        libempathy-uoa-account-plugin.la \
85
 
        $(top_builddir)/libempathy/libempathy.la \
86
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
87
 
@@ -141,6 +152,7 @@
88
 
        empathy-accounts-plugin-local-xmpp.h
89
 
 liblocal_xmpp_la_LDFLAGS = -module -avoid-version
90
 
 liblocal_xmpp_la_LIBADD = \
91
 
+       $(UOA_LIBS) \
92
 
        libempathy-uoa-account-plugin.la \
93
 
        $(top_builddir)/libempathy/libempathy.la \
94
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
95
 
@@ -151,6 +163,7 @@
96
 
        empathy-accounts-plugin-sametime.h
97
 
 libsametime_la_LDFLAGS = -module -avoid-version
98
 
 libsametime_la_LIBADD = \
99
 
+       $(UOA_LIBS) \
100
 
        libempathy-uoa-account-plugin.la \
101
 
        $(top_builddir)/libempathy/libempathy.la \
102
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
103
 
@@ -161,6 +174,7 @@
104
 
        empathy-accounts-plugin-yahoojp.h
105
 
 libyahoojp_la_LDFLAGS = -module -avoid-version
106
 
 libyahoojp_la_LIBADD = \
107
 
+       $(UOA_LIBS) \
108
 
        libempathy-uoa-account-plugin.la \
109
 
        $(top_builddir)/libempathy/libempathy.la \
110
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
111
 
@@ -171,6 +185,7 @@
112
 
        empathy-accounts-plugin-yahoo.h
113
 
 libyahoo_la_LDFLAGS = -module -avoid-version
114
 
 libyahoo_la_LIBADD = \
115
 
+       $(UOA_LIBS) \
116
 
        libempathy-uoa-account-plugin.la \
117
 
        $(top_builddir)/libempathy/libempathy.la \
118
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
119
 
@@ -181,6 +196,7 @@
120
 
        empathy-accounts-plugin-zephyr.h
121
 
 libzephyr_la_LDFLAGS = -module -avoid-version
122
 
 libzephyr_la_LIBADD = \
123
 
+       $(UOA_LIBS) \
124
 
        libempathy-uoa-account-plugin.la \
125
 
        $(top_builddir)/libempathy/libempathy.la \
126
 
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la
127