API tools faq
paste
Advertisement
darkxst

evolution 3.7.91

darkxst
Mar 11th, 2013
79
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 41.77 KB | None | 0 0
raw download clone embed print report
  1. --- evolution-3.6.2/debian/changelog    2013-02-28 02:05:56.000000000 +1100
  2. +++ evolution-3.7.91/debian/changelog   2013-03-11 16:39:53.000000000 +1100
  3. @@ -1,3 +1,13 @@
  4. +evolution (3.7.91-0ubuntu1~raring1) UNRELEASED; urgency=low
  5. +
  6. +  * New upstream release
  7. +  * debian/patches:
  8. +    - disable-webkit-plugins.patch, refreshed.
  9. +  * debian/control: bump build dependencies
  10. +    - evolution-data-server, libglib, libwebkitgtk
  11. +
  12. + -- Tim Lunn <tim@feathertop.org>  Mon, 11 Mar 2013 09:57:35 +1100
  13. +
  14.  evolution (3.6.2-0ubuntu3) raring; urgency=low
  15.  
  16.    * debian/control.in:
  17. --- evolution-3.6.2/debian/control  2013-02-28 02:05:56.000000000 +1100
  18. +++ evolution-3.7.91/debian/control 2013-03-11 15:42:08.000000000 +1100
  19. @@ -20,22 +20,22 @@
  20.                 dh-autoreconf,
  21.                 dpkg-dev (>= 1.16.1),
  22.                 libgeoclue-dev (>= 0.12),
  23. -               libglib2.0-dev (>= 2.32),
  24. +               libglib2.0-dev (>= 2.34),
  25.                 libgtk-3-dev (>= 3.4.0),
  26.                 libgail-3-dev (>= 3.0.2),
  27. -               libebook1.2-dev (>= 3.6.0),
  28. -               libecal1.2-dev (>= 3.6.0),
  29. -               libedataserver1.2-dev (>= 3.6.0),
  30. -               libedataserverui-3.0-dev (>= 3.6.0),
  31. -               libebackend1.2-dev (>= 3.6.0),
  32. -               libcamel1.2-dev (>= 3.6.0),
  33. -               evolution-data-server-dev (>= 3.6.0),
  34. +               evolution-data-server-dev,
  35. +               libebook1.2-dev (>= 3.7.91),
  36. +               libecal1.2-dev (>= 3.7.91),
  37. +               libedataserver1.2-dev (>= 3.7.91),
  38. +               libebackend1.2-dev (>= 3.7.91),
  39. +               libcamel1.2-dev (>= 3.7.91),
  40. +               evolution-data-server-dev (>= 3.7.91),
  41.                 libgtkhtml-4.0-dev (>= 4.6.0),
  42.                 libgtkhtml-editor-4.0-dev,
  43. -               libwebkitgtk-3.0-dev (>= 1.8.0),
  44. +               libwebkitgtk-3.0-dev (>= 1.10.0),
  45.                 libgnome-desktop-3-dev (>= 2.91.3),
  46.                 gnome-icon-theme (>= 2.30.2.1),
  47. -               libsoup-gnome2.4-dev (>= 2.38.1),
  48. +               libsoup-gnome2.4-dev (>= 2.40.3),
  49.                 libxml2-dev (>= 2.7.3),
  50.                 shared-mime-info (>= 0.22),
  51.                 libnotify-dev (>= 0.7),
  52. @@ -70,15 +70,17 @@
  53.                 gsettings-desktop-schemas-dev (>= 2.91.92),
  54.                 libgoa-1.0-dev (>= 3.2),
  55.                 libclutter-gtk-1.0-dev (>= 0.90),
  56. -               libclutter-1.0-dev (>= 1.0.0)
  57. +               libclutter-1.0-dev (>= 1.0.0),
  58. +               bogofilter,
  59. +               spamassassin,
  60. +               highlight
  61.  
  62.  Package: evolution
  63.  Architecture: any
  64.  Depends: ${shlibs:Depends},
  65.           ${misc:Depends},
  66.           evolution-common (= ${source:Version}),
  67. -         evolution-data-server (>= 3.6),
  68. -         evolution-data-server (<< 3.8),
  69. +         evolution-data-server (>= 3.7),
  70.           gnome-icon-theme-full (>= 2.30.2.1),
  71.           dbus,
  72.           psmisc
  73. @@ -156,8 +158,8 @@
  74.           libebackend1.2-dev,
  75.           libgtk-3-dev,
  76.           libgnome-desktop-3-dev,
  77. -         libedataserverui-3.0-dev,
  78. -         libwebkitgtk-3.0-dev (>= 1.8.0),
  79. +         evolution-data-server-dev,
  80. +         libwebkitgtk-3.0-dev (>= 1.10.0),
  81.  # evolution-utils
  82.           libedataserver1.2-dev
  83.  Description: development library files for Evolution
  84. --- evolution-3.6.2/debian/evolution.install    2013-02-28 02:05:56.000000000 +1100
  85. +++ evolution-3.7.91/debian/evolution.install   2013-03-11 16:09:14.000000000 +1100
  86. @@ -1,10 +1,10 @@
  87.  debian/evolution.xpm usr/share/pixmaps/
  88.  etc/xdg
  89.  usr/bin
  90. -usr/lib/evolution/*/plugins/*-itip-formatter.so
  91. +usr/lib/evolution/*/plugins/*-itip-formatter.so*
  92.  usr/lib/evolution/*/plugins/*-itip-formatter.eplug
  93. -usr/lib/evolution/*/plugins/*-mark-all-read.so
  94. +usr/lib/evolution/*/plugins/*-mark-all-read.so*
  95.  usr/lib/evolution/*/plugins/*-mark-all-read.eplug
  96. -usr/lib/evolution/*/plugins/*-publish-calendar.so
  97. +usr/lib/evolution/*/plugins/*-publish-calendar.so*
  98.  usr/lib/evolution/*/plugins/*-publish-calendar.eplug
  99.  usr/share/applications
  100. --- evolution-3.6.2/debian/evolution-plugins-experimental.install   2013-02-28 02:05:56.000000000 +1100
  101. +++ evolution-3.7.91/debian/evolution-plugins-experimental.install  2013-03-11 16:08:54.000000000 +1100
  102. @@ -1,2 +1,2 @@
  103. -usr/lib/evolution/*/plugins/*-external-editor.so
  104. +usr/lib/evolution/*/plugins/*-external-editor.so*
  105.  usr/lib/evolution/*/plugins/*-external-editor.eplug
  106. --- evolution-3.6.2/debian/evolution-plugins.install    2013-02-28 02:05:56.000000000 +1100
  107. +++ evolution-3.7.91/debian/evolution-plugins.install   2013-03-11 16:08:45.000000000 +1100
  108. @@ -1,20 +1,20 @@
  109. -usr/lib/evolution/*/plugins/*-save-calendar.so
  110. +usr/lib/evolution/*/plugins/*-save-calendar.so*
  111.  usr/lib/evolution/*/plugins/*-save-calendar.eplug
  112. -usr/lib/evolution/*/plugins/*-mail-to-task.so
  113. +usr/lib/evolution/*/plugins/*-mail-to-task.so*
  114.  usr/lib/evolution/*/plugins/*-mail-to-task.eplug
  115. -usr/lib/evolution/*/plugins/*-mailing-list-actions.so
  116. +usr/lib/evolution/*/plugins/*-mailing-list-actions.so*
  117.  usr/lib/evolution/*/plugins/*-mailing-list-actions.eplug
  118. -usr/lib/evolution/*/plugins/*-prefer-plain.so
  119. +usr/lib/evolution/*/plugins/*-prefer-plain.so*
  120.  usr/lib/evolution/*/plugins/*-prefer-plain.eplug
  121. -usr/lib/evolution/*/plugins/*-mail-notification.so
  122. +usr/lib/evolution/*/plugins/*-mail-notification.so*
  123.  usr/lib/evolution/*/plugins/*-mail-notification.eplug
  124. -usr/lib/evolution/*/plugins/*-email-custom-header.so
  125. +usr/lib/evolution/*/plugins/*-email-custom-header.so*
  126.  usr/lib/evolution/*/plugins/*-email-custom-header.eplug
  127. -usr/lib/evolution/*/plugins/*-face.so
  128. +usr/lib/evolution/*/plugins/*-face.so*
  129.  usr/lib/evolution/*/plugins/*-face.eplug
  130. -usr/lib/evolution/*/plugins/*-templates.so
  131. +usr/lib/evolution/*/plugins/*-templates.so*
  132.  usr/lib/evolution/*/plugins/*-templates.eplug
  133. -usr/lib/evolution/*/plugins/*-dbx-import.so
  134. +usr/lib/evolution/*/plugins/*-dbx-import.so*
  135.  usr/lib/evolution/*/plugins/*-dbx-import.eplug
  136. -usr/lib/evolution/*/plugins/*-pst-import.so
  137. +usr/lib/evolution/*/plugins/*-pst-import.so*
  138.  usr/lib/evolution/*/plugins/*-pst-import.eplug
  139. --- evolution-3.6.2/debian/libevolution.install 2013-02-28 02:05:56.000000000 +1100
  140. +++ evolution-3.7.91/debian/libevolution.install    2013-03-11 15:44:20.000000000 +1100
  141. @@ -1,6 +1,6 @@
  142.  usr/lib/evolution/*/*.so.*
  143.  usr/lib/evolution/*/csv2vcard
  144. -usr/lib/evolution/*/modules/*.so
  145. +usr/lib/evolution/*/modules/*.so*
  146.  usr/lib/evolution/*/evolution-addressbook-export
  147.  usr/lib/evolution/*/evolution-backup
  148.  usr/lib/evolution/*/evolution-alarm-notify
  149. --- evolution-3.6.2/debian/patches/04_delay_alarm_notifier.patch    2013-02-28 02:05:56.000000000 +1100
  150. +++ evolution-3.7.91/debian/patches/04_delay_alarm_notifier.patch   2013-03-11 09:58:48.000000000 +1100
  151. @@ -2,19 +2,15 @@
  152.  Author: Martin Pitt <martin.pitt@ubuntu.com>
  153.  Forwarded: Not yet, depends on https://bugzilla.gnome.org/show_bug.cgi?id=608402
  154.  
  155. -Index: evolution-3.2.0/data/evolution-alarm-notify.desktop.in
  156. -===================================================================
  157. ---- evolution-3.2.0.orig/data/evolution-alarm-notify.desktop.in    2011-09-24 16:37:39.000000000 -0400
  158. -+++ evolution-3.2.0/data/evolution-alarm-notify.desktop.in 2011-09-27 09:48:51.844023949 -0400
  159. +--- a/data/evolution-alarm-notify.desktop.in
  160. ++++ b/data/evolution-alarm-notify.desktop.in
  161.  @@ -13,3 +13,4 @@
  162.   X-GNOME-Bugzilla-Product=evolution
  163.   X-GNOME-Bugzilla-Component=calendar
  164. - X-GNOME-Bugzilla-Version=3.6.x
  165. + X-GNOME-Bugzilla-Version=3.8.x
  166.  +X-GNOME-Autostart-Delay=30
  167. -Index: evolution-3.2.0/data/evolution-alarm-notify.desktop.in.in
  168. -===================================================================
  169. ---- evolution-3.2.0.orig/data/evolution-alarm-notify.desktop.in.in 2011-09-27 09:49:10.504024009 -0400
  170. -+++ evolution-3.2.0/data/evolution-alarm-notify.desktop.in.in  2011-09-27 09:49:17.344024031 -0400
  171. +--- a/data/evolution-alarm-notify.desktop.in.in
  172. ++++ b/data/evolution-alarm-notify.desktop.in.in
  173.  @@ -13,3 +13,4 @@
  174.   X-GNOME-Bugzilla-Product=evolution
  175.   X-GNOME-Bugzilla-Component=calendar
  176. --- evolution-3.6.2/debian/patches/10_desktop_shortcuts.patch   2013-02-28 02:05:56.000000000 +1100
  177. +++ evolution-3.7.91/debian/patches/10_desktop_shortcuts.patch  2013-03-11 10:17:44.000000000 +1100
  178. @@ -1,11 +1,9 @@
  179.  === modified file 'data/evolution.desktop.in.in'
  180. -Index: evolution-3.6.2/data/evolution.desktop.in.in
  181. -===================================================================
  182. ---- evolution-3.6.2.orig/data/evolution.desktop.in.in  2012-10-29 01:01:58.000000000 +1300
  183. -+++ evolution-3.6.2/data/evolution.desktop.in.in   2012-11-15 11:44:16.551766159 +1300
  184. -@@ -16,3 +16,19 @@
  185. - X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
  186. - X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory
  187. +--- a/data/evolution.desktop.in.in
  188. ++++ b/data/evolution.desktop.in.in
  189. +@@ -17,3 +17,19 @@
  190. + X-GNOME-Bugzilla-OtherBinaries=evolution-addressbook-factory;evolution-calendar-factory;evolution-source-registry;evolution-user-prompter
  191. + X-GNOME-UsesNotifications=true
  192.   MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
  193.  +X-Ayatana-Desktop-Shortcuts=Compose;Contacts;Calendar
  194.  +
  195. --- evolution-3.6.2/debian/patches/10_revert_libevolution_avoid-version.patch   2013-02-28 02:05:56.000000000 +1100
  196. +++ evolution-3.7.91/debian/patches/10_revert_libevolution_avoid-version.patch  2013-03-11 10:27:33.000000000 +1100
  197. @@ -34,24 +34,9 @@
  198.   widgets/text/Makefile.am                        |    2 +-
  199.   27 files changed, 28 insertions(+), 27 deletions(-)
  200.  
  201. -Index: evolution-3.6.2/a11y/Makefile.am
  202. -===================================================================
  203. ---- evolution-3.6.2.orig/a11y/Makefile.am  2012-09-17 03:05:49.000000000 +1200
  204. -+++ evolution-3.6.2/a11y/Makefile.am   2012-11-15 11:44:18.071766107 +1300
  205. -@@ -14,7 +14,7 @@
  206. -   gal-a11y-util.h         \
  207. -   gal-a11y-factory.h
  208. -
  209. --libevolution_a11y_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  210. -+libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED)
  211. -
  212. - libevolution_a11y_la_LIBADD =         \
  213. -   $(top_builddir)/e-util/libeutil.la  \
  214. -Index: evolution-3.6.2/addressbook/gui/contact-editor/Makefile.am
  215. -===================================================================
  216. ---- evolution-3.6.2.orig/addressbook/gui/contact-editor/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  217. -+++ evolution-3.6.2/addressbook/gui/contact-editor/Makefile.am 2012-11-15 11:44:18.071766107 +1300
  218. -@@ -24,7 +24,7 @@
  219. +--- a/addressbook/gui/contact-editor/Makefile.am
  220. ++++ b/addressbook/gui/contact-editor/Makefile.am
  221. +@@ -23,7 +23,7 @@
  222.     e-contact-quick-add.c           \
  223.     e-contact-quick-add.h
  224.  
  225. @@ -60,10 +45,8 @@
  226.  
  227.   libecontacteditor_la_LIBADD =                     \
  228.     $(top_builddir)/e-util/libeutil.la              \
  229. -Index: evolution-3.6.2/addressbook/gui/contact-list-editor/Makefile.am
  230. -===================================================================
  231. ---- evolution-3.6.2.orig/addressbook/gui/contact-list-editor/Makefile.am   2012-09-17 03:05:49.000000000 +1200
  232. -+++ evolution-3.6.2/addressbook/gui/contact-list-editor/Makefile.am    2012-11-15 11:44:18.071766107 +1300
  233. +--- a/addressbook/gui/contact-list-editor/Makefile.am
  234. ++++ b/addressbook/gui/contact-list-editor/Makefile.am
  235.  @@ -19,7 +19,7 @@
  236.     e-contact-list-model.c          \
  237.     e-contact-list-model.h
  238. @@ -73,10 +56,8 @@
  239.  
  240.   libecontactlisteditor_la_LIBADD =             \
  241.     $(top_builddir)/addressbook/util/libeabutil.la      \
  242. -Index: evolution-3.6.2/addressbook/importers/Makefile.am
  243. -===================================================================
  244. ---- evolution-3.6.2.orig/addressbook/importers/Makefile.am 2012-09-17 03:05:49.000000000 +1200
  245. -+++ evolution-3.6.2/addressbook/importers/Makefile.am  2012-11-15 11:44:18.071766107 +1300
  246. +--- a/addressbook/importers/Makefile.am
  247. ++++ b/addressbook/importers/Makefile.am
  248.  @@ -18,7 +18,7 @@
  249.     evolution-csv-importer.c            \
  250.     evolution-addressbook-importers.h
  251. @@ -86,11 +67,9 @@
  252.  
  253.   libevolution_addressbook_importers_la_LIBADD = \
  254.     $(top_builddir)/e-util/libeutil.la              \
  255. -Index: evolution-3.6.2/addressbook/util/Makefile.am
  256. -===================================================================
  257. ---- evolution-3.6.2.orig/addressbook/util/Makefile.am  2012-09-17 03:05:49.000000000 +1200
  258. -+++ evolution-3.6.2/addressbook/util/Makefile.am   2012-11-15 11:44:18.071766107 +1300
  259. -@@ -18,7 +18,7 @@
  260. +--- a/addressbook/util/Makefile.am
  261. ++++ b/addressbook/util/Makefile.am
  262. +@@ -19,7 +19,7 @@
  263.     eab-book-util.c                 \
  264.     eab-book-util.h
  265.  
  266. @@ -98,12 +77,10 @@
  267.  +libeabutil_la_LDFLAGS = $(NO_UNDEFINED)
  268.  
  269.   libeabutil_la_LIBADD =                    \
  270. -   $(top_builddir)/widgets/misc/libemiscwidgets.la \
  271. -Index: evolution-3.6.2/calendar/gui/Makefile.am
  272. -===================================================================
  273. ---- evolution-3.6.2.orig/calendar/gui/Makefile.am  2012-09-17 03:05:49.000000000 +1200
  274. -+++ evolution-3.6.2/calendar/gui/Makefile.am   2012-11-15 11:44:18.071766107 +1300
  275. -@@ -220,7 +220,7 @@
  276. +   $(top_builddir)/e-util/libeutil.la      \
  277. +--- a/calendar/gui/Makefile.am
  278. ++++ b/calendar/gui/Makefile.am
  279. +@@ -212,7 +212,7 @@
  280.     $(GTKHTML_LIBS)                         \
  281.     $(LIBSOUP_LIBS)
  282.  
  283. @@ -112,11 +89,9 @@
  284.  
  285.   EXTRA_DIST =              \
  286.     $(ui_DATA)          \
  287. -Index: evolution-3.6.2/calendar/importers/Makefile.am
  288. -===================================================================
  289. ---- evolution-3.6.2.orig/calendar/importers/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  290. -+++ evolution-3.6.2/calendar/importers/Makefile.am 2012-11-15 11:44:18.071766107 +1300
  291. -@@ -16,7 +16,7 @@
  292. +--- a/calendar/importers/Makefile.am
  293. ++++ b/calendar/importers/Makefile.am
  294. +@@ -15,7 +15,7 @@
  295.     evolution-calendar-importer.h        \
  296.     icalendar-importer.c
  297.  
  298. @@ -125,11 +100,9 @@
  299.  
  300.   libevolution_calendar_importers_la_LIBADD =           \
  301.     $(top_builddir)/e-util/libeutil.la          \
  302. -Index: evolution-3.6.2/composer/Makefile.am
  303. -===================================================================
  304. ---- evolution-3.6.2.orig/composer/Makefile.am  2012-09-17 03:05:49.000000000 +1200
  305. -+++ evolution-3.6.2/composer/Makefile.am   2012-11-15 11:44:18.071766107 +1300
  306. -@@ -56,7 +56,7 @@
  307. +--- a/composer/Makefile.am
  308. ++++ b/composer/Makefile.am
  309. +@@ -52,7 +52,7 @@
  310.     e-composer-text-header.c        \
  311.     e-msg-composer.c
  312.  
  313. @@ -138,24 +111,20 @@
  314.  
  315.   libcomposer_la_LIBADD =                   \
  316.     $(top_builddir)/e-util/libeutil.la      \
  317. -Index: evolution-3.6.2/e-util/Makefile.am
  318. -===================================================================
  319. ---- evolution-3.6.2.orig/e-util/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  320. -+++ evolution-3.6.2/e-util/Makefile.am 2012-11-15 11:44:18.071766107 +1300
  321. -@@ -128,7 +128,7 @@
  322. -   e-util-private.h            \
  323. -   $(PLATFORM_SOURCES)
  324. +--- a/e-util/Makefile.am
  325. ++++ b/e-util/Makefile.am
  326. +@@ -583,7 +583,7 @@
  327. +   $(PLATFORM_SOURCES) \
  328. +   $(NULL)
  329.  
  330.  -libeutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  331.  +libeutil_la_LDFLAGS = $(NO_UNDEFINED)
  332.  
  333. - libeutil_la_LIBADD =          \
  334. -   $(top_builddir)/libevolution-utils/libevolution-utils.la    \
  335. -Index: evolution-3.6.2/em-format/Makefile.am
  336. -===================================================================
  337. ---- evolution-3.6.2.orig/em-format/Makefile.am 2012-09-17 03:05:49.000000000 +1200
  338. -+++ evolution-3.6.2/em-format/Makefile.am  2012-11-15 11:44:18.071766107 +1300
  339. -@@ -98,7 +98,7 @@
  340. + libeutil_la_LIBADD =  \
  341. +   $(top_builddir)/libgnomecanvas/libgnomecanvas.la \
  342. +--- a/em-format/Makefile.am
  343. ++++ b/em-format/Makefile.am
  344. +@@ -94,7 +94,7 @@
  345.     e-mail-stripsig-filter.c            \
  346.     $(SMIME_EXTENSIONS)
  347.  
  348. @@ -164,24 +133,9 @@
  349.  
  350.  
  351.   if ENABLE_SMIME
  352. -Index: evolution-3.6.2/filter/Makefile.am
  353. -===================================================================
  354. ---- evolution-3.6.2.orig/filter/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  355. -+++ evolution-3.6.2/filter/Makefile.am 2012-11-15 11:44:18.071766107 +1300
  356. -@@ -53,7 +53,7 @@
  357. -   e-rule-editor.c             \
  358. -   e-rule-editor.h
  359. -
  360. --libfilter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  361. -+libfilter_la_LDFLAGS = $(NO_UNDEFINED)
  362. -
  363. - libfilter_la_LIBADD =                 \
  364. -   $(top_builddir)/libevolution-utils/libevolution-utils.la    \
  365. -Index: evolution-3.6.2/mail/Makefile.am
  366. -===================================================================
  367. ---- evolution-3.6.2.orig/mail/Makefile.am  2012-09-17 03:05:49.000000000 +1200
  368. -+++ evolution-3.6.2/mail/Makefile.am   2012-11-15 11:44:18.071766107 +1300
  369. -@@ -219,7 +219,7 @@
  370. +--- a/mail/Makefile.am
  371. ++++ b/mail/Makefile.am
  372. +@@ -206,7 +206,7 @@
  373.     $(LIBSOUP_LIBS)                 \
  374.     -lresolv
  375.  
  376. @@ -190,11 +144,9 @@
  377.  
  378.   libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
  379.  
  380. -Index: evolution-3.6.2/mail/importers/Makefile.am
  381. -===================================================================
  382. ---- evolution-3.6.2.orig/mail/importers/Makefile.am    2012-09-17 03:05:50.000000000 +1200
  383. -+++ evolution-3.6.2/mail/importers/Makefile.am 2012-11-15 11:44:18.071766107 +1300
  384. -@@ -19,7 +19,7 @@
  385. +--- a/mail/importers/Makefile.am
  386. ++++ b/mail/importers/Makefile.am
  387. +@@ -18,7 +18,7 @@
  388.     pine-importer.c             \
  389.     evolution-mbox-importer.c
  390.  
  391. @@ -203,11 +155,9 @@
  392.  
  393.   libevolution_mail_importers_la_LIBADD =               \
  394.     $(top_builddir)/e-util/libeutil.la          \
  395. -Index: evolution-3.6.2/shell/Makefile.am
  396. -===================================================================
  397. ---- evolution-3.6.2.orig/shell/Makefile.am 2012-10-14 08:48:44.000000000 +1300
  398. -+++ evolution-3.6.2/shell/Makefile.am  2012-11-15 11:44:18.075766106 +1300
  399. -@@ -88,7 +88,7 @@
  400. +--- a/shell/Makefile.am
  401. ++++ b/shell/Makefile.am
  402. +@@ -84,7 +84,7 @@
  403.     evo-version.h               \
  404.     es-event.c
  405.  
  406. @@ -216,26 +166,10 @@
  407.  
  408.   libeshell_la_LIBADD =                 \
  409.     $(top_builddir)/e-util/libeutil.la      \
  410. -Index: evolution-3.6.2/smclient/Makefile.am
  411. -===================================================================
  412. ---- evolution-3.6.2.orig/smclient/Makefile.am  2012-09-17 03:05:53.000000000 +1200
  413. -+++ evolution-3.6.2/smclient/Makefile.am   2012-11-15 11:44:18.075766106 +1300
  414. -@@ -22,7 +22,8 @@
  415. -   $(EGG_SMCLIENT_LIBS) \
  416. -   $(platform_libs)
  417. -
  418. --libeggsmclient_la_LDFLAGS = -avoid-version $(platform_ldflags)
  419. -+libeggsmclient_la_LDFLAGS = \
  420. -+  $(platform_ldflags)
  421. -
  422. - libeggsmclient_la_SOURCES = \
  423. -   eggsmclient.c \
  424. -Index: evolution-3.6.2/smime/gui/Makefile.am
  425. -===================================================================
  426. ---- evolution-3.6.2.orig/smime/gui/Makefile.am 2012-09-17 03:05:53.000000000 +1200
  427. -+++ evolution-3.6.2/smime/gui/Makefile.am  2012-11-15 11:44:18.075766106 +1300
  428. -@@ -46,7 +46,7 @@
  429. -   $(GNOME_PLATFORM_LIBS)              \
  430. +--- a/smime/gui/Makefile.am
  431. ++++ b/smime/gui/Makefile.am
  432. +@@ -44,7 +44,7 @@
  433. +   $(GTKHTML_LIBS)                 \
  434.     $(CERT_UI_LIBS)
  435.  
  436.  -libevolution_smime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  437. @@ -243,132 +177,548 @@
  438.  
  439.   ui_DATA = smime-ui.ui
  440.  
  441. -Index: evolution-3.6.2/smime/lib/Makefile.am
  442. -===================================================================
  443. ---- evolution-3.6.2.orig/smime/lib/Makefile.am 2012-09-17 03:05:53.000000000 +1200
  444. -+++ evolution-3.6.2/smime/lib/Makefile.am  2012-11-15 11:44:18.075766106 +1300
  445. -@@ -35,6 +35,6 @@
  446. -   $(GNOME_PLATFORM_LIBS)          \
  447. +--- a/smime/lib/Makefile.am
  448. ++++ b/smime/lib/Makefile.am
  449. +@@ -36,6 +36,6 @@
  450. +   $(GTKHTML_LIBS)             \
  451.     $(CERT_UI_LIBS)
  452.  
  453.  -libessmime_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  454.  +libessmime_la_LDFLAGS = $(NO_UNDEFINED)
  455.  
  456.   -include $(top_srcdir)/git.mk
  457. -Index: evolution-3.6.2/widgets/e-timezone-dialog/Makefile.am
  458. -===================================================================
  459. ---- evolution-3.6.2.orig/widgets/e-timezone-dialog/Makefile.am 2012-09-17 03:05:53.000000000 +1200
  460. -+++ evolution-3.6.2/widgets/e-timezone-dialog/Makefile.am  2012-11-15 11:44:18.075766106 +1300
  461. -@@ -13,7 +13,7 @@
  462. -   e-timezone-dialog.c \
  463. -   e-timezone-dialog.h
  464. +--- a/libemail-engine/Makefile.am
  465. ++++ b/libemail-engine/Makefile.am
  466. +@@ -76,7 +76,7 @@
  467. +   $(GTKHTML_LIBS) \
  468. +   $(NULL)
  469.  
  470. --libetimezonedialog_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  471. -+libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED)
  472. +-libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  473. ++libemail_engine_la_LDFLAGS = $(NO_UNDEFINED)
  474.  
  475. - libetimezonedialog_la_LIBADD =                \
  476. -   $(top_builddir)/widgets/misc/libemiscwidgets.la \
  477. -Index: evolution-3.6.2/widgets/menus/Makefile.am
  478. -===================================================================
  479. ---- evolution-3.6.2.orig/widgets/menus/Makefile.am 2012-09-17 03:05:53.000000000 +1200
  480. -+++ evolution-3.6.2/widgets/menus/Makefile.am  2012-11-15 11:44:18.075766106 +1300
  481. -@@ -40,7 +40,7 @@
  482. -   gal-view-new-dialog.h           \
  483. -   gal-view.h
  484. + pkgconfigdir = $(libdir)/pkgconfig
  485. + pkgconfig_DATA = libemail-engine.pc
  486. +--- a/libgnomecanvas/Makefile.am
  487. ++++ b/libgnomecanvas/Makefile.am
  488. +@@ -53,7 +53,7 @@
  489. +   $(GNOME_PLATFORM_LIBS) \
  490. +   $(MATH_LIB)
  491.  
  492. --libmenus_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  493. -+libmenus_la_LDFLAGS = $(NO_UNDEFINED)
  494. +-libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  495. ++libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
  496.  
  497. - libmenus_la_LIBADD =                  \
  498. -   $(top_builddir)/e-util/libeutil.la      \
  499. -Index: evolution-3.6.2/widgets/misc/Makefile.am
  500. -===================================================================
  501. ---- evolution-3.6.2.orig/widgets/misc/Makefile.am  2012-09-17 03:05:53.000000000 +1200
  502. -+++ evolution-3.6.2/widgets/misc/Makefile.am   2012-11-15 11:44:18.075766106 +1300
  503. -@@ -171,7 +171,7 @@
  504. -   ea-cell-table.c             \
  505. -   ea-widgets.c
  506. + BUILT_SOURCES = $(MARSHAL_GENERATED)
  507.  
  508. --libemiscwidgets_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  509. -+libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
  510. +--- a/modules/text-highlight/Makefile.am
  511. ++++ b/modules/text-highlight/Makefile.am
  512. +@@ -30,6 +30,6 @@
  513. +   $(GTKHTML_LIBS)
  514. +
  515. + module_text_highlight_la_LDFLAGS =                    \
  516. +-  -avoid-version -module $(NO_UNDEFINED)
  517. ++  -module $(NO_UNDEFINED)
  518.  
  519. - libemiscwidgets_la_LIBADD =                   \
  520. -   $(top_builddir)/e-util/libeutil.la          \
  521. -Index: evolution-3.6.2/widgets/table/Makefile.am
  522. -===================================================================
  523. ---- evolution-3.6.2.orig/widgets/table/Makefile.am 2012-09-17 03:05:53.000000000 +1200
  524. -+++ evolution-3.6.2/widgets/table/Makefile.am  2012-11-15 11:44:18.075766106 +1300
  525. -@@ -164,7 +164,7 @@
  526. -   gal-a11y-e-tree.h           \
  527. -   gal-a11y-e-tree-factory.h
  528. -
  529. --libetable_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  530. -+libetable_la_LDFLAGS = $(NO_UNDEFINED)
  531. -
  532. - libetable_la_LIBADD =                     \
  533. -   $(top_builddir)/a11y/libevolution-a11y.la       \
  534. -Index: evolution-3.6.2/widgets/text/Makefile.am
  535. -===================================================================
  536. ---- evolution-3.6.2.orig/widgets/text/Makefile.am  2012-09-17 03:05:54.000000000 +1200
  537. -+++ evolution-3.6.2/widgets/text/Makefile.am   2012-11-15 11:44:18.075766106 +1300
  538. -@@ -28,7 +28,7 @@
  539. -   gal-a11y-e-text-factory.h       \
  540. -   gal-a11y-e-text.h
  541. -
  542. --libetext_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  543. -+libetext_la_LDFLAGS = $(NO_UNDEFINED)
  544. -
  545. - libetext_la_LIBADD =                      \
  546. -   $(top_builddir)/a11y/libevolution-a11y.la       \
  547. -Index: evolution-3.6.2/libemail-engine/Makefile.am
  548. -===================================================================
  549. ---- evolution-3.6.2.orig/libemail-engine/Makefile.am   2012-09-17 03:05:49.000000000 +1200
  550. -+++ evolution-3.6.2/libemail-engine/Makefile.am    2012-11-15 11:44:18.075766106 +1300
  551. -@@ -66,7 +66,7 @@
  552. -   $(GNOME_PLATFORM_LIBS) \
  553. + -include $(top_srcdir)/git.mk
  554. +--- a/modules/composer-autosave/Makefile.am
  555. ++++ b/modules/composer-autosave/Makefile.am
  556. +@@ -24,6 +24,6 @@
  557. +   $(GTKHTML_LIBS)
  558. +
  559. + module_composer_autosave_la_LDFLAGS = \
  560. +-  -module -avoid-version $(NO_UNDEFINED)
  561. ++  -module $(NO_UNDEFINED)
  562. +
  563. + -include $(top_srcdir)/git.mk
  564. +--- a/modules/book-config-webdav/Makefile.am
  565. ++++ b/modules/book-config-webdav/Makefile.am
  566. +@@ -18,6 +18,6 @@
  567. +   $(GTKHTML_LIBS)
  568. +
  569. + module_book_config_webdav_la_LDFLAGS = \
  570. +-  -module -avoid-version $(NO_UNDEFINED)
  571. ++  -module $(NO_UNDEFINED)
  572. +
  573. + -include $(top_srcdir)/git.mk
  574. +--- a/modules/book-config-ldap/Makefile.am
  575. ++++ b/modules/book-config-ldap/Makefile.am
  576. +@@ -22,6 +22,6 @@
  577. +   $(LDAP_LIBS)
  578. +
  579. + module_book_config_ldap_la_LDFLAGS = \
  580. +-  -module -avoid-version $(NO_UNDEFINED)
  581. ++  -module $(NO_UNDEFINED)
  582. +
  583. + -include $(top_srcdir)/git.mk
  584. +--- a/modules/spamassassin/Makefile.am
  585. ++++ b/modules/spamassassin/Makefile.am
  586. +@@ -21,6 +21,6 @@
  587. +   $(GTKHTML_LIBS)
  588. +
  589. + module_spamassassin_la_LDFLAGS = \
  590. +-  -module -avoid-version $(NO_UNDEFINED)
  591. ++  -module $(NO_UNDEFINED)
  592. +
  593. + -include $(top_srcdir)/git.mk
  594. +--- a/modules/addressbook/Makefile.am
  595. ++++ b/modules/addressbook/Makefile.am
  596. +@@ -71,7 +71,7 @@
  597. +
  598. +
  599. + module_addressbook_la_LDFLAGS = \
  600. +-  -module -avoid-version $(NO_UNDEFINED)
  601. ++  -module $(NO_UNDEFINED)
  602. +
  603. + EXTRA_DIST =          \
  604. +   openldap-extract.h
  605. +--- a/modules/plugin-manager/Makefile.am
  606. ++++ b/modules/plugin-manager/Makefile.am
  607. +@@ -19,6 +19,6 @@
  608. +   $(GTKHTML_LIBS)
  609. +
  610. + module_plugin_manager_la_LDFLAGS = \
  611. +-  -module -avoid-version $(NO_UNDEFINED)
  612. ++  -module $(NO_UNDEFINED)
  613. +
  614. + -include $(top_srcdir)/git.mk
  615. +--- a/modules/cal-config-contacts/Makefile.am
  616. ++++ b/modules/cal-config-contacts/Makefile.am
  617. +@@ -22,6 +22,6 @@
  618. +   $(GTKHTML_LIBS)
  619. +
  620. + module_cal_config_contacts_la_LDFLAGS = \
  621. +-  -module -avoid-version $(NO_UNDEFINED)
  622. ++  -module $(NO_UNDEFINED)
  623. +
  624. + -include $(top_srcdir)/git.mk
  625. +--- a/modules/settings/Makefile.am
  626. ++++ b/modules/settings/Makefile.am
  627. +@@ -55,6 +55,6 @@
  628.     $(NULL)
  629.  
  630. --libemail_engine_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  631. -+libemail_engine_la_LDFLAGS = $(NO_UNDEFINED)
  632. + module_settings_la_LDFLAGS = \
  633. +-  -avoid-version -module $(NO_UNDEFINED)
  634. ++  -module $(NO_UNDEFINED)
  635.  
  636. - pkgconfigdir = $(libdir)/pkgconfig
  637. - pkgconfig_DATA = libemail-engine.pc
  638. -Index: evolution-3.6.2/libemail-utils/Makefile.am
  639. -===================================================================
  640. ---- evolution-3.6.2.orig/libemail-utils/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  641. -+++ evolution-3.6.2/libemail-utils/Makefile.am 2012-11-15 11:44:18.075766106 +1300
  642. -@@ -27,7 +27,7 @@
  643. -   mail-mt.c \
  644. + -include $(top_srcdir)/git.mk
  645. +--- a/modules/online-accounts/Makefile.am
  646. ++++ b/modules/online-accounts/Makefile.am
  647. +@@ -29,6 +29,6 @@
  648.     $(NULL)
  649.  
  650. --libemail_utils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  651. -+libemail_utils_la_LDFLAGS = $(NO_UNDEFINED)
  652. + module_online_accounts_la_LDFLAGS = \
  653. +-  -module -avoid-version $(NO_UNDEFINED)
  654. ++  -module $(NO_UNDEFINED)
  655.  
  656. - libemail_utils_la_LIBADD = \
  657. -   $(top_builddir)/filter/libfilter.la \
  658. -Index: evolution-3.6.2/libevolution-utils/Makefile.am
  659. -===================================================================
  660. ---- evolution-3.6.2.orig/libevolution-utils/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  661. -+++ evolution-3.6.2/libevolution-utils/Makefile.am 2012-11-15 11:44:18.075766106 +1300
  662. -@@ -30,7 +30,7 @@
  663. -   evolution-util.c \
  664. + -include $(top_srcdir)/git.mk
  665. +--- a/modules/cal-config-caldav/Makefile.am
  666. ++++ b/modules/cal-config-caldav/Makefile.am
  667. +@@ -24,6 +24,6 @@
  668. +   $(LIBSOUP_LIBS)
  669. +
  670. + module_cal_config_caldav_la_LDFLAGS = \
  671. +-  -module -avoid-version $(NO_UNDEFINED)
  672. ++  -module $(NO_UNDEFINED)
  673. +
  674. + -include $(top_srcdir)/git.mk
  675. +--- a/modules/calendar/Makefile.am
  676. ++++ b/modules/calendar/Makefile.am
  677. +@@ -81,7 +81,7 @@
  678. +   $(GTKHTML_LIBS)
  679. +
  680. + module_calendar_la_LDFLAGS = \
  681. +-  -module -avoid-version $(NO_UNDEFINED)
  682. ++  -module $(NO_UNDEFINED)
  683. +
  684. + ui_DATA = e-calendar-preferences.ui
  685. +
  686. +--- a/modules/mailto-handler/Makefile.am
  687. ++++ b/modules/mailto-handler/Makefile.am
  688. +@@ -19,6 +19,6 @@
  689. +   $(GTKHTML_LIBS)
  690. +
  691. + module_mailto_handler_la_LDFLAGS = \
  692. +-  -module -avoid-version $(NO_UNDEFINED)
  693. ++  -module $(NO_UNDEFINED)
  694. +
  695. + -include $(top_srcdir)/git.mk
  696. +--- a/modules/mail/Makefile.am
  697. ++++ b/modules/mail/Makefile.am
  698. +@@ -56,6 +56,6 @@
  699. +   $(GTKHTML_LIBS)
  700. +
  701. + module_mail_la_LDFLAGS = \
  702. +-  -avoid-version -module $(NO_UNDEFINED)
  703. ++  -module $(NO_UNDEFINED)
  704. +
  705. + -include $(top_srcdir)/git.mk
  706. +--- a/modules/cal-config-google/Makefile.am
  707. ++++ b/modules/cal-config-google/Makefile.am
  708. +@@ -26,6 +26,6 @@
  709. +   $(GDATA_LIBS)
  710. +
  711. + module_cal_config_google_la_LDFLAGS = \
  712. +-  -module -avoid-version $(NO_UNDEFINED)
  713. ++  -module $(NO_UNDEFINED)
  714. +
  715. + -include $(top_srcdir)/git.mk
  716. +--- a/modules/tnef-attachment/Makefile.am
  717. ++++ b/modules/tnef-attachment/Makefile.am
  718. +@@ -30,6 +30,6 @@
  719. +   -lytnef
  720. +
  721. + module_tnef_attachment_la_LDFLAGS =           \
  722. +-  -avoid-version -module $(NO_UNDEFINED)
  723. ++  -module $(NO_UNDEFINED)
  724. +
  725. + -include $(top_srcdir)/git.mk
  726. +--- a/modules/cal-config-local/Makefile.am
  727. ++++ b/modules/cal-config-local/Makefile.am
  728. +@@ -20,6 +20,6 @@
  729. +   $(GTKHTML_LIBS)
  730. +
  731. + module_cal_config_local_la_LDFLAGS = \
  732. +-  -module -avoid-version $(NO_UNDEFINED)
  733. ++  -module $(NO_UNDEFINED)
  734. +
  735. + -include $(top_srcdir)/git.mk
  736. +--- a/modules/book-config-google/Makefile.am
  737. ++++ b/modules/book-config-google/Makefile.am
  738. +@@ -18,6 +18,6 @@
  739. +   $(GTKHTML_LIBS)
  740. +
  741. + module_book_config_google_la_LDFLAGS = \
  742. +-  -module -avoid-version $(NO_UNDEFINED)
  743. ++  -module $(NO_UNDEFINED)
  744. +
  745. + -include $(top_srcdir)/git.mk
  746. +--- a/modules/prefer-plain/Makefile.am
  747. ++++ b/modules/prefer-plain/Makefile.am
  748. +@@ -28,6 +28,6 @@
  749. +   $(GTKHTML_LIBS)
  750. +
  751. + module_prefer_plain_la_LDFLAGS =              \
  752. +-  -avoid-version -module $(NO_UNDEFINED)
  753. ++  -module $(NO_UNDEFINED)
  754. +
  755. + -include $(top_srcdir)/git.mk
  756. +--- a/modules/prefer-plain/plugin/Makefile.am
  757. ++++ b/modules/prefer-plain/plugin/Makefile.am
  758. +@@ -14,7 +14,7 @@
  759. + liborg_gnome_prefer_plain_la_SOURCES =        \
  760. +   config-ui.c
  761. +
  762. +-liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  763. ++liborg_gnome_prefer_plain_la_LDFLAGS = -module $(NO_UNDEFINED)
  764. +
  765. + liborg_gnome_prefer_plain_la_LIBADD =             \
  766. +   $(EVOLUTION_DATA_SERVER_LIBS)               \
  767. +--- a/modules/plugin-lib/Makefile.am
  768. ++++ b/modules/plugin-lib/Makefile.am
  769. +@@ -21,6 +21,6 @@
  770. +   $(GTKHTML_LIBS)
  771. +
  772. + module_plugin_lib_la_LDFLAGS = \
  773. +-  -module -avoid-version $(NO_UNDEFINED)
  774. ++  -module $(NO_UNDEFINED)
  775. +
  776. + -include $(top_srcdir)/git.mk
  777. +--- a/modules/bogofilter/Makefile.am
  778. ++++ b/modules/bogofilter/Makefile.am
  779. +@@ -19,6 +19,6 @@
  780. +   $(GNOME_PLATFORM_LIBS)
  781. +
  782. + module_bogofilter_la_LDFLAGS = \
  783. +-  -module -avoid-version $(NO_UNDEFINED)
  784. ++  -module $(NO_UNDEFINED)
  785. +
  786. + -include $(top_srcdir)/git.mk
  787. +--- a/modules/book-config-local/Makefile.am
  788. ++++ b/modules/book-config-local/Makefile.am
  789. +@@ -18,6 +18,6 @@
  790. +   $(GTKHTML_LIBS)
  791. +
  792. + module_book_config_local_la_LDFLAGS = \
  793. +-  -module -avoid-version $(NO_UNDEFINED)
  794. ++  -module $(NO_UNDEFINED)
  795. +
  796. + -include $(top_srcdir)/git.mk
  797. +--- a/modules/offline-alert/Makefile.am
  798. ++++ b/modules/offline-alert/Makefile.am
  799. +@@ -19,7 +19,7 @@
  800. +   $(GTKHTML_LIBS)
  801. +
  802. + module_offline_alert_la_LDFLAGS = \
  803. +-  -module -avoid-version $(NO_UNDEFINED)
  804. ++  -module $(NO_UNDEFINED)
  805. +
  806. + error_DATA = evolution-offline-alert.error
  807. + errordir = $(privdatadir)/errors
  808. +--- a/modules/vcard-inline/Makefile.am
  809. ++++ b/modules/vcard-inline/Makefile.am
  810. +@@ -29,6 +29,6 @@
  811. +   $(GTKHTML_LIBS)
  812. +
  813. + module_vcard_inline_la_LDFLAGS =              \
  814. +-  -avoid-version -module $(NO_UNDEFINED)
  815. ++  -module $(NO_UNDEFINED)
  816. +
  817. + -include $(top_srcdir)/git.mk
  818. +--- a/modules/cal-config-webcal/Makefile.am
  819. ++++ b/modules/cal-config-webcal/Makefile.am
  820. +@@ -18,6 +18,6 @@
  821. +   $(GTKHTML_LIBS)
  822. +
  823. + module_cal_config_webcal_la_LDFLAGS = \
  824. +-  -module -avoid-version $(NO_UNDEFINED)
  825. ++  -module $(NO_UNDEFINED)
  826. +
  827. + -include $(top_srcdir)/git.mk
  828. +--- a/modules/mail-config/Makefile.am
  829. ++++ b/modules/mail-config/Makefile.am
  830. +@@ -35,6 +35,6 @@
  831.     $(NULL)
  832.  
  833. --libevolution_utils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  834. -+libevolution_utils_la_LDFLAGS = $(NO_UNDEFINED)
  835. + module_mail_config_la_LDFLAGS = \
  836. +-  -module -avoid-version $(NO_UNDEFINED)
  837. ++  -module $(NO_UNDEFINED)
  838.  
  839. - libevolution_utils_la_LIBADD = \
  840. -   $(EVOLUTION_DATA_SERVER_LIBS) \
  841. -Index: evolution-3.6.2/libgnomecanvas/Makefile.am
  842. -===================================================================
  843. ---- evolution-3.6.2.orig/libgnomecanvas/Makefile.am    2012-09-17 03:05:49.000000000 +1200
  844. -+++ evolution-3.6.2/libgnomecanvas/Makefile.am 2012-11-15 11:44:18.075766106 +1300
  845. -@@ -53,7 +53,7 @@
  846. -   $(GNOME_PLATFORM_LIBS) \
  847. -   $(MATH_LIB)
  848. + -include $(top_srcdir)/git.mk
  849. +--- a/modules/startup-wizard/Makefile.am
  850. ++++ b/modules/startup-wizard/Makefile.am
  851. +@@ -34,6 +34,6 @@
  852. +   $(NULL)
  853.  
  854. --libgnomecanvas_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
  855. -+libgnomecanvas_la_LDFLAGS = $(NO_UNDEFINED)
  856. + module_startup_wizard_la_LDFLAGS = \
  857. +-  -module -avoid-version $(NO_UNDEFINED)
  858. ++  -module $(NO_UNDEFINED)
  859.  
  860. - BUILT_SOURCES = $(MARSHAL_GENERATED)
  861. + -include $(top_srcdir)/git.mk
  862. +--- a/modules/backup-restore/Makefile.am
  863. ++++ b/modules/backup-restore/Makefile.am
  864. +@@ -36,7 +36,7 @@
  865. +   $(NULL)
  866. +
  867. + module_backup_restore_la_LDFLAGS = \
  868. +-  -module -avoid-version $(NO_UNDEFINED)
  869. ++  -module $(NO_UNDEFINED)
  870. +
  871. + privlibexec_PROGRAMS = evolution-backup
  872. +
  873. +--- a/modules/itip-formatter/Makefile.am
  874. ++++ b/modules/itip-formatter/Makefile.am
  875. +@@ -39,7 +39,7 @@
  876. +   $(GTKHTML_LIBS)
  877. +
  878. + module_itip_formatter_la_LDFLAGS =                    \
  879. +-  -avoid-version -module $(NO_UNDEFINED)
  880. ++  -module $(NO_UNDEFINED)
  881. +
  882. + error_DATA = org-gnome-itip-formatter.error
  883. + errordir = $(privdatadir)/errors
  884. +--- a/modules/itip-formatter/plugin/Makefile.am
  885. ++++ b/modules/itip-formatter/plugin/Makefile.am
  886. +@@ -19,7 +19,7 @@
  887. +   ../e-source-conflict-search.c           \
  888. +   ../e-source-conflict-search.h
  889. +
  890. +-liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  891. ++liborg_gnome_itip_formatter_la_LDFLAGS = -module $(NO_UNDEFINED)
  892. +
  893. + liborg_gnome_itip_formatter_la_LIBADD =               \
  894. +   $(top_builddir)/e-util/libeutil.la          \
  895. +--- a/modules/mdn/Makefile.am
  896. ++++ b/modules/mdn/Makefile.am
  897. +@@ -21,7 +21,7 @@
  898. +   $(GTKHTML_LIBS)
  899. +
  900. + module_mdn_la_LDFLAGS = \
  901. +-  -module -avoid-version $(NO_UNDEFINED)
  902. ++  -module $(NO_UNDEFINED)
  903. +
  904. + error_DATA = evolution-mdn.error
  905. + errordir = $(privdatadir)/errors
  906. +--- a/modules/cal-config-weather/Makefile.am
  907. ++++ b/modules/cal-config-weather/Makefile.am
  908. +@@ -22,6 +22,6 @@
  909. +   $(GWEATHER_LIBS)
  910. +
  911. + module_cal_config_weather_la_LDFLAGS = \
  912. +-  -module -avoid-version $(NO_UNDEFINED)
  913. ++  -module $(NO_UNDEFINED)
  914. +
  915. + -include $(top_srcdir)/git.mk
  916. +--- a/modules/web-inspector/Makefile.am
  917. ++++ b/modules/web-inspector/Makefile.am
  918. +@@ -18,6 +18,6 @@
  919. +   $(GTKHTML_LIBS)
  920. +
  921. + module_web_inspector_la_LDFLAGS = \
  922. +-  -module -avoid-version $(NO_UNDEFINED)
  923. ++  -module $(NO_UNDEFINED)
  924. +
  925. + -include $(top_srcdir)/git.mk
  926. +--- a/plugins/templates/Makefile.am
  927. ++++ b/plugins/templates/Makefile.am
  928. +@@ -15,7 +15,7 @@
  929. +
  930. + liborg_gnome_templates_la_SOURCES = templates.c
  931. +
  932. +-liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  933. ++liborg_gnome_templates_la_LDFLAGS = -module $(NO_UNDEFINED)
  934. +
  935. + liborg_gnome_templates_la_LIBADD =    \
  936. +   $(top_builddir)/e-util/libeutil.la      \
  937. +--- a/plugins/bbdb/Makefile.am
  938. ++++ b/plugins/bbdb/Makefile.am
  939. +@@ -21,7 +21,7 @@
  940. +
  941. + liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c
  942. +
  943. +-liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  944. ++liborg_gnome_evolution_bbdb_la_LDFLAGS = -module $(NO_UNDEFINED)
  945.  
  946. + liborg_gnome_evolution_bbdb_la_LIBADD =       \
  947. +   $(top_builddir)/e-util/libeutil.la  \
  948. +--- a/plugins/dbx-import/Makefile.am
  949. ++++ b/plugins/dbx-import/Makefile.am
  950. +@@ -20,7 +20,7 @@
  951. +
  952. + liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c
  953. +
  954. +-liborg_gnome_dbx_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  955. ++liborg_gnome_dbx_import_la_LDFLAGS = -module $(NO_UNDEFINED)
  956. +
  957. + liborg_gnome_dbx_import_la_LIBADD =           \
  958. +   $(top_builddir)/mail/libevolution-mail.la   \
  959. +--- a/plugins/publish-calendar/Makefile.am
  960. ++++ b/plugins/publish-calendar/Makefile.am
  961. +@@ -30,7 +30,7 @@
  962. +   url-editor-dialog.c         \
  963. +   url-editor-dialog.h
  964. +
  965. +-liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  966. ++liborg_gnome_publish_calendar_la_LDFLAGS = -module $(NO_UNDEFINED)
  967. +
  968. + liborg_gnome_publish_calendar_la_LIBADD =         \
  969. +   $(top_builddir)/e-util/libeutil.la          \
  970. +--- a/plugins/attachment-reminder/Makefile.am
  971. ++++ b/plugins/attachment-reminder/Makefile.am
  972. +@@ -20,7 +20,7 @@
  973. +
  974. + liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c
  975. +
  976. +-liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  977. ++liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module $(NO_UNDEFINED)
  978. +
  979. + liborg_gnome_evolution_attachment_reminder_la_LIBADD =    \
  980. +   $(top_builddir)/composer/libcomposer.la     \
  981. +--- a/plugins/mark-all-read/Makefile.am
  982. ++++ b/plugins/mark-all-read/Makefile.am
  983. +@@ -13,7 +13,7 @@
  984. +
  985. + liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c  
  986. +
  987. +-liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  988. ++liborg_gnome_mark_all_read_la_LDFLAGS = -module $(NO_UNDEFINED)
  989. +
  990. + liborg_gnome_mark_all_read_la_LIBADD =            \
  991. +   $(top_builddir)/e-util/libeutil.la      \
  992. +--- a/plugins/face/Makefile.am
  993. ++++ b/plugins/face/Makefile.am
  994. +@@ -24,7 +24,7 @@
  995. +   $(GNOME_PLATFORM_LIBS)                  \
  996. +   $(GTKHTML_LIBS)
  997. +
  998. +-liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  999. ++liborg_gnome_face_la_LDFLAGS = -module $(NO_UNDEFINED)
  1000. +
  1001. + error_DATA = org-gnome-face.error
  1002. +
  1003. +--- a/plugins/mail-notification/Makefile.am
  1004. ++++ b/plugins/mail-notification/Makefile.am
  1005. +@@ -22,7 +22,7 @@
  1006. +
  1007. + liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
  1008. +
  1009. +-liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1010. ++liborg_gnome_mail_notification_la_LDFLAGS = -module $(NO_UNDEFINED)
  1011. +
  1012. + liborg_gnome_mail_notification_la_LIBADD =            \
  1013. +   $(top_builddir)/e-util/libeutil.la          \
  1014. +--- a/plugins/image-inline/Makefile.am
  1015. ++++ b/plugins/image-inline/Makefile.am
  1016. +@@ -13,7 +13,7 @@
  1017. +
  1018. + liborg_gnome_image_inline_la_SOURCES = image-inline.c
  1019. +
  1020. +-liborg_gnome_image_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1021. ++liborg_gnome_image_inline_la_LDFLAGS = -module $(NO_UNDEFINED)
  1022. +
  1023. + liborg_gnome_image_inline_la_LIBADD =         \
  1024. +   $(top_builddir)/mail/libevolution-mail.la   \
  1025. +--- a/plugins/mail-to-task/Makefile.am
  1026. ++++ b/plugins/mail-to-task/Makefile.am
  1027. +@@ -13,7 +13,7 @@
  1028. +
  1029. + liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c
  1030. +
  1031. +-liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1032. ++liborg_gnome_mail_to_task_la_LDFLAGS = -module $(NO_UNDEFINED)
  1033. +
  1034. + liborg_gnome_mail_to_task_la_LIBADD = \
  1035. +   $(top_builddir)/e-util/libeutil.la              \
  1036. +--- a/plugins/external-editor/Makefile.am
  1037. ++++ b/plugins/external-editor/Makefile.am
  1038. +@@ -34,7 +34,7 @@
  1039. +   external-editor.c
  1040. +
  1041. + liborg_gnome_external_editor_la_LDFLAGS = \
  1042. +-  -module -avoid-version $(NO_UNDEFINED)
  1043. ++  -module $(NO_UNDEFINED)
  1044. + liborg_gnome_external_editor_la_LIBADD =          \
  1045. +   $(top_builddir)/e-util/libeutil.la          \
  1046. +   $(top_builddir)/composer/libcomposer.la         \
  1047. +--- a/plugins/pst-import/Makefile.am
  1048. ++++ b/plugins/pst-import/Makefile.am
  1049. +@@ -22,7 +22,7 @@
  1050. +
  1051. + liborg_gnome_pst_import_la_SOURCES = pst-importer.c
  1052. +
  1053. +-liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1054. ++liborg_gnome_pst_import_la_LDFLAGS = -module $(NO_UNDEFINED)
  1055. +
  1056. + liborg_gnome_pst_import_la_LIBADD =               \
  1057. +   $(top_builddir)/shell/libeshell.la          \
  1058. +--- a/plugins/email-custom-header/Makefile.am
  1059. ++++ b/plugins/email-custom-header/Makefile.am
  1060. +@@ -26,7 +26,7 @@
  1061. +   $(GNOME_PLATFORM_LIBS)                  \
  1062. +   $(GTKHTML_LIBS)
  1063. +
  1064. +-liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1065. ++liborg_gnome_email_custom_header_la_LDFLAGS = -module $(NO_UNDEFINED)
  1066. +
  1067. + ui_DATA =                         \
  1068. +   org-gnome-email-custom-header.ui
  1069. +--- a/plugins/mailing-list-actions/Makefile.am
  1070. ++++ b/plugins/mailing-list-actions/Makefile.am
  1071. +@@ -13,7 +13,7 @@
  1072. +
  1073. + liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c
  1074. +
  1075. +-liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1076. ++liborg_gnome_mailing_list_actions_la_LDFLAGS = -module $(NO_UNDEFINED)
  1077. +
  1078. + liborg_gnome_mailing_list_actions_la_LIBADD =     \
  1079. +   $(top_builddir)/e-util/libeutil.la      \
  1080. +--- a/plugins/save-calendar/Makefile.am
  1081. ++++ b/plugins/save-calendar/Makefile.am
  1082. +@@ -18,7 +18,7 @@
  1083. +   rdf-format.c            \
  1084. +   format-handler.h
  1085. +
  1086. +-liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
  1087. ++liborg_gnome_save_calendar_la_LDFLAGS = -module $(NO_UNDEFINED)
  1088. + liborg_gnome_save_calendar_la_LIBADD =    \
  1089. +   $(top_builddir)/e-util/libeutil.la  \
  1090. +   $(top_builddir)/shell/libeshell.la  \
  1091. --- evolution-3.6.2/debian/patches/disable-webkit-plugins.patch 2013-02-28 02:05:56.000000000 +1100
  1092. +++ evolution-3.7.91/debian/patches/disable-webkit-plugins.patch    2013-03-11 10:15:48.000000000 +1100
  1093. @@ -19,11 +19,9 @@
  1094.   widgets/misc/e-web-view.c |   24 ++++++++++++++++++++++++
  1095.   1 file changed, 24 insertions(+)
  1096.  
  1097. -Index: evolution-3.6.2/widgets/misc/e-web-view.c
  1098. -===================================================================
  1099. ---- evolution-3.6.2.orig/widgets/misc/e-web-view.c 2012-11-11 13:13:47.000000000 +1300
  1100. -+++ evolution-3.6.2/widgets/misc/e-web-view.c  2012-11-15 11:44:59.963764656 +1300
  1101. -@@ -1712,6 +1712,8 @@
  1102. +--- a/e-util/e-web-view.c
  1103. ++++ b/e-util/e-web-view.c
  1104. +@@ -1684,6 +1684,8 @@
  1105.     GtkActionGroup *action_group;
  1106.     EPopupAction *popup_action;
  1107.     WebKitWebSettings *web_settings;
  1108. @@ -32,7 +30,7 @@
  1109.     GSettingsSchema *settings_schema;
  1110.     GSettings *settings;
  1111.     const gchar *domain = GETTEXT_PACKAGE;
  1112. -@@ -1758,6 +1760,28 @@
  1113. +@@ -1734,6 +1736,28 @@
  1114.     e_web_view_install_request_handler (web_view, E_TYPE_FILE_REQUEST);
  1115.     e_web_view_install_request_handler (web_view, E_TYPE_STOCK_REQUEST);
  1116.  
  1117. --- evolution-3.6.2/debian/rules    2013-02-28 02:05:56.000000000 +1100
  1118. +++ evolution-3.7.91/debian/rules   2013-03-11 14:12:16.000000000 +1100
  1119. @@ -9,7 +9,7 @@
  1120.  include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
  1121.  include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
  1122.  
  1123. -ELIBDIR := usr/lib/evolution/3.6
  1124. +ELIBDIR := usr/lib/evolution/3.8
  1125.  
  1126.  DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
  1127.  DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= $(DEB_GNOME_VERSION)), libevolution (<< $(DEB_GNOME_NEXTVERSION))' --noscripts -X $(ELIBDIR)/modules
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!