r1594 - in /experimental/evolution/debian: changelog control patches/03_fix-face-plugin-linking.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Mon Apr 26 20:14:21 2010
New Revision: 1594

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1594
Log:
upload

Added:
    experimental/evolution/debian/patches/03_fix-face-plugin-linking.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/control

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1594&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Mon Apr 26 20:14:21 2010
@@ -1,3 +1,13 @@
+evolution (2.30.1.1-1) experimental; urgency=low
+
+  * New upstream bugfix release.
+  * debian/patches:
+    - 03_fix-face-plugin-linking, fix ftbfs with face plugin.
+  * debian/control:
+    - bump (build-)deps to gtkhtml/eds 2.30.1.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 26 Apr 2010 21:12:22 +0200
+
 evolution (2.30.0.1-1) experimental; urgency=low
 
   * New upstream release.

Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1594&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Mon Apr 26 20:14:21 2010
@@ -28,28 +28,28 @@
                gtk-doc-tools (>= 0.6),
                libatk1.0-dev,
                libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.30),
-               libgtkhtml-editor-dev (>= 3.30),
+               libgtkhtml3.14-dev (>= 3.30.1),
+               libgtkhtml-editor-dev (>= 3.30.1),
                libkrb5-dev,
                libnss3-dev,
                psmisc,
                libglib2.0-dev (>= 2.22.0),
-               evolution-data-server-dev (>= 2.30),
+               evolution-data-server-dev (>= 2.30.1),
                evolution-data-server-dev (<< 2.31),
                libgtk2.0-dev (>= 2.18.0),
                libgnomecanvas2-dev,
                libxml2-dev,
                libgconf2-dev,
-               libcamel1.2-dev (>= 2.30),
-               libedataserver1.2-dev (>= 2.30),
-               libegroupwise1.2-dev (>= 2.30),
-               libedataserverui1.2-dev (>= 2.30),
-               libebackend1.2-dev (>= 2.30),
-               libgdata1.2-dev (>= 2.30),
-               libgdata-google1.2-dev (>= 2.30),
+               libcamel1.2-dev (>= 2.30.1),
+               libedataserver1.2-dev (>= 2.30.1),
+               libegroupwise1.2-dev (>= 2.30.1),
+               libedataserverui1.2-dev (>= 2.30.1),
+               libebackend1.2-dev (>= 2.30.1),
+               libgdata1.2-dev (>= 2.30.1),
+               libgdata-google1.2-dev (>= 2.30.1),
                libgnome2-dev,
-               libecal1.2-dev (>= 2.30),
-               libebook1.2-dev (>= 2.30),
+               libecal1.2-dev (>= 2.30.1),
+               libebook1.2-dev (>= 2.30.1),
                libdbus-glib-1-dev,
                libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libnotify-dev (>= 0.3.0),
@@ -77,7 +77,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 2.30),
+         evolution-data-server (>= 2.30.1),
          evolution-data-server (<< 2.31),
          gnome-icon-theme (>= 2.19.92),
          dbus

Added: experimental/evolution/debian/patches/03_fix-face-plugin-linking.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/03_fix-face-plugin-linking.patch?rev=1594&op=file
==============================================================================
--- experimental/evolution/debian/patches/03_fix-face-plugin-linking.patch (added)
+++ experimental/evolution/debian/patches/03_fix-face-plugin-linking.patch Mon Apr 26 20:14:21 2010
@@ -1,0 +1,18 @@
+commit 92d3fcc8540110960d95639d4a55f70cf0e079e0
+Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
+Date:   Mon Apr 26 16:44:58 2010 +0200
+
+    Fix linking of face plugin
+
+diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am
+index 240dc3a..c358f8d 100644
+--- a/plugins/face/Makefile.am
++++ b/plugins/face/Makefile.am
+@@ -21,6 +21,7 @@ liborg_gnome_face_la_SOURCES = face.c
+ 
+ liborg_gnome_face_la_LIBADD = 			\
+ 	$(top_builddir)/e-util/libeutil.la 			\
++	$(top_builddir)/composer/libcomposer.la 		\
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
+ 	$(top_builddir)/mail/libevolution-mail.la 		\
+ 	$(EVOLUTION_MAIL_LIBS)					\