be57900bac
stage); renaming from evolution-2.5.2-fix-conduits.patch to
evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the
memo conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to
evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build
(#175160)
- switch the build-time dep for the audio-inline plugin from
gstreamer-devel to gstreamer08-devel to better reflect the test in the
tarball's configure.in
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
--- evolution-2.5.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2004-12-02 22:39:53.000000000 -0500
|
|
+++ evolution-2.5.4/addressbook/conduit/Makefile.am 2006-01-11 00:21:25.000000000 -0500
|
|
@@ -28,7 +28,7 @@
|
|
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
|
|
$< > $@
|
|
|
|
-conduitdir = $(datadir)/gnome-pilot/conduits/
|
|
+conduitdir = $(libdir)/gnome-pilot/conduits/
|
|
conduit_DATA = e-address-$(BASE_VERSION).conduit
|
|
|
|
BUILT_SOURCES = $(conduit_DATA)
|
|
--- evolution-2.5.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2005-06-26 20:43:06.000000000 -0400
|
|
+++ evolution-2.5.4/calendar/conduits/calendar/Makefile.am 2006-01-11 00:21:25.000000000 -0500
|
|
@@ -24,7 +24,7 @@
|
|
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
|
|
$< > $@
|
|
|
|
-conduitdir = $(datadir)/gnome-pilot/conduits/
|
|
+conduitdir = $(libdir)/gnome-pilot/conduits/
|
|
conduit_DATA = e-calendar-$(BASE_VERSION).conduit
|
|
|
|
BUILT_SOURCES = $(conduit_DATA)
|
|
--- evolution-2.5.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2005-06-26 20:43:07.000000000 -0400
|
|
+++ evolution-2.5.4/calendar/conduits/todo/Makefile.am 2006-01-11 00:21:25.000000000 -0500
|
|
@@ -24,7 +24,7 @@
|
|
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
|
|
$< > $@
|
|
|
|
-conduitdir = $(datadir)/gnome-pilot/conduits/
|
|
+conduitdir = $(libdir)/gnome-pilot/conduits/
|
|
conduit_DATA = e-todo-$(BASE_VERSION).conduit
|
|
|
|
BUILT_SOURCES = $(conduit_DATA)
|
|
--- evolution-2.5.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2006-01-11 00:22:26.000000000 -0500
|
|
+++ evolution-2.5.4/calendar/conduits/memo/Makefile.am 2006-01-11 00:22:39.000000000 -0500
|
|
@@ -24,7 +24,7 @@
|
|
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
|
|
$< > $@
|
|
|
|
-conduitdir = $(datadir)/gnome-pilot/conduits/
|
|
+conduitdir = $(libdir)/gnome-pilot/conduits/
|
|
conduit_DATA = e-memo-$(BASE_VERSION).conduit
|
|
|
|
BUILT_SOURCES = $(conduit_DATA)
|